Merge commit 'refs/merge-requests/206' of git://gitorious.org/f-droid/fdroiddata into merge-requests/206

build/extlib/custom_rules.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="imported">
+ <target name="-post-compile">
+  <macrodef name="dex-helper">
+   <element name="external-libs" optional="yes"/>
+   <attribute name="nolocals" default="false"/>
+   <sequential>
+    <property name="out.dex.input.absolute.dir" value="${out.classes.absolute.dir}"/>
+    <path id="out.dex.jar.input.ref" path="${basedir}/libs/jcifs-1.3.17.jar"/>
+    <dex executable="${dx}" output="${intermediate.dex.file}" nolocals="@{nolocals}" verbose="${verbose}">
+     <path path="${out.dex.input.absolute.dir}"/>
+     <path refid="out.dex.jar.input.ref"/>
+     <external-libs/>
+    </dex>
+   </sequential>
+  </macrodef>
+ </target>
+</project>

build/extlib/ganymed-ssh/source.txt

@@ -0,0 +1 @@
+http://mvnrepository.com/artifact/ch.ethz.ganymed/ganymed-ssh2/

metadata/com.ghostsq.commander.samba.txt

@@ -1,9 +1,9 @@
 Category:System
 License:GPLv3
 Web Site:http://sites.google.com/site/ghostcommander1/
-Source Code:http://gc-samba.svn.sourceforge.net/viewvc/gc-samba
-Issue Tracker:http://sourceforge.net/projects/gc-samba/develop
-Donate:http://sourceforge.net/donate/index.php?group_id=311417
+Source Code:http://sourceforge.net/p/gc-samba/code/
+Issue Tracker:http://sourceforge.net/p/gc-samba/_list/tickets/
+Donate:http://sourceforge.net/p/ghostcommander/donate/
 
 Auto Name:Ghost Commander - Samba plugin
 Summary:Access files on the network
@@ -21,7 +21,7 @@ password. A passwordless Windows account might not work.
 # If you are building this yourself, config.py must be edited to sign this
 # with the same key as Ghost Commander
 Repo Type:git-svn
-Repo:http://gc-samba.svn.sourceforge.net/svnroot/gc-samba
+Repo:http://svn.code.sf.net/p/gc-samba/code/
 
 Build Version:1.21.3b1,47,!dexclassloader crash: see forum (at 102),init=rm -rf gen/ && \
 svn co -r407 https://ghostcommander.svn.sourceforge.net/svnroot/ghostcommander gc,\
@@ -31,11 +31,18 @@ sed -i 's/Utils.getCause( e )/e.getMessage()/' \
 src/com/ghostsq/commander/samba/SMBAdapter.java,build=\
 ant release -f gc/build.xml && cd libs/ && \
 cp -a ../gc/bin/classes/com . && zip -r -9 gc.jar com/ && rm -rf com/
+
 Build Version:1.21.3,50,!Build problems
 
+Build Version:1.30,51,106,srclibs=GhostCommander@390,\
+extlibs=jcifs/jcifs-1.3.17.jar;custom_rules.xml,\
+build=\
+  mv libs/custom_rules.xml . && ant debug -f $$GhostCommander$$/build.xml && \
+  jar c -C $$GhostCommander$$/bin/classes/ com > gc.jar && \
+  install -D gc.jar libs/gc.jar
+
 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:AndroidManifest
 Current Version:1.30
 Current Version Code:51
 

metadata/com.ghostsq.commander.sftp.txt

@@ -0,0 +1,40 @@
+Category:System
+License:GPLv3
+Web Site:http://sites.google.com/site/ghostcommander1/
+Source Code:http://sourceforge.net/p/gc-sftp/code/
+Issue Tracker:http://sourceforge.net/p/ghostcommander/_list/tickets/
+Donate:http://sourceforge.net/p/ghostcommander/donate/
+
+Auto Name:Ghost Commander - Samba plugin
+Summary:Access files on the network
+Description:
+A plug-in for [[com.ghostsq.commander]] to access to Windows network shared
+folders (also referenced as SMB, Samba, CIFS or even NetBios).
+Launch Ghost Commander and go to 'Menu > Location > Home > Windows share'.
+Alternatively, scroll along the toolbar until you arrive at 'Home'.
+Enter your server name and credentials (if any), then tap the 'Connect' button.
+Once connected, you should be able to see a list of Windows machines or
+Samba servers on the network. Tip: Better have the Windows account with
+password. A passwordless Windows account might not work.
+.
+
+# If you are building this yourself, config.py must be edited to sign this
+# with the same key as Ghost Commander
+Repo Type:git-svn
+Repo:http://svn.code.sf.net/p/gc-sftp/code/trunk
+
+# Few different forks of used SSH2 library exist, but https://code.google.com/p/ganymed-ssh-2/
+# (which is in turn referenced by number of sites) claims, that it is the most genuine one
+Build Version:1.10b1,11,26,srclibs=GhostCommander@390,\
+extlibs=ganymed-ssh/ganymed-ssh2-build210.jar;custom_rules.xml,\
+build=\
+  sed 's/jcifs-1.3.17/ganymed-ssh2-build210/' libs/custom_rules.xml > custom_rules.xml && \
+  ant debug -f $$GhostCommander$$/build.xml && \
+  jar c -C $$GhostCommander$$/bin/classes/ com > gc.jar && \
+  install -D gc.jar libs/gc.jar
+
+Auto Update Mode:None
+Update Check Mode:AndroidManifest
+Current Version:1.10b1
+Current Version Code:11
+

metadata/com.ghostsq.commander.txt

@@ -1,9 +1,9 @@
 Category:System
 License:GPLv3
 Web Site:http://sites.google.com/site/ghostcommander1/
-Source Code:https://ghostcommander.svn.sourceforge.net/viewvc/ghostcommander
-Issue Tracker:http://sourceforge.net/tracker/?group_id=311417
-Donate:http://sourceforge.net/donate/index.php?group_id=311417
+Source Code:http://sourceforge.net/p/ghostcommander/code/
+Issue Tracker:http://sourceforge.net/projects/ghostcommander/support
+Donate:http://sourceforge.net/p/ghostcommander/donate/
 
 Auto Name:Ghost Commander
 Summary:Dual-panel file manager
@@ -15,7 +15,7 @@ files between its two panels.
 The file manager can also create or extract ZIP archives and transfer
 files to/from FTP servers.
 The SFTP/SMB network share functionalities need
-plugin apps that aren't yet in the f-droid.org repo.
+plugin apps, that can also be found in the repository.
 There is also a handy app manager featuring package names,
 installation dates, sharing apks (via long-press), manifests and
 access to activities and shortcuts.
@@ -24,8 +24,8 @@ Requires root: No, but if you allow it root you can remount filesystems,
 and mess around with the system files.
 .
 
-Repo Type:git-svn
-Repo:https://ghostcommander.svn.sourceforge.net/svnroot/ghostcommander
+Repo Type:srclib
+Repo:GhostCommander
 
 Build Version:1.35.1b5,97,141,\
 prebuild=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml
@@ -41,15 +41,11 @@ Build Version:1.40.2,164,314
 # DexClassLoader seems to be used for the samba/sftp plugins
 Build Version:1.43.3b1,210,407,\
 scanignore=build/com.ghostsq.commander/src/com/ghostsq/commander/adapters/CA.java
+Build Version:1.50.1,214,387,scanignore=src/com/ghostsq/commander/adapters/CA.java
+Build Version:1.51b2,219,390,scanignore=src/com/ghostsq/commander/adapters/CA.java
 
-# http://sourceforge.net/p/gc-ai1/code is supposed to build GC & plugins
-#  but some files are currently missing. see 
-#  https://f-droid.org/forums/topic/sftp-plugin-for-ghost-commander
 Auto Update Mode:None
 # also on gplay; apks on website
-Update Check Mode:None
-Current Version:1.50.1
-Current Version Code:214
-
-No Source Since: 1.50
-
+Update Check Mode:AndroidManifest
+Current Version:1.51b2
+Current Version Code:219

srclibs/GhostCommander.txt

@@ -0,0 +1,3 @@
+Repo Type:git-svn
+Repo:http://svn.code.sf.net/p/ghostcommander/code/
+Prepare:rm -rf gen/ && $$SDK$$/tools/android update project -p . -t android-17