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

metadata/com.textuality.lifesaver2.txt

@@ -19,18 +19,19 @@ Repo Type:git-svn
 Repo:http://lifesaver.googlecode.com/svn/trunk
 
 Build:1.0,3
-    disable=deleting bin build
+    disable=still waiting for bin to be purged
     target=android-10
     prebuild=rm -rf src/com/textuality/lifesaver
 
 Build:2.2,6
 	commit=27
+    disable=completely broken app: see description
     target=android-10
 	srclibs=Aerc@064c6f23aa09
 	prebuild=echo 'android.library.reference.1=$$Aerc$$' >> project.properties
 
 Auto Update Mode:None
-Update Check Mode:RepoManifest
+Update Check Mode:Static
-Current Version:2.2
+Current Version:1.0
-Current Version Code:6
+Current Version Code:3
 

metadata/com.unleashyouradventure.swaccess.txt

@@ -14,7 +14,7 @@ Books can be loaded directly from Cool reader, FBReader or Pageturner.
 .
 
 Repo Type:git-svn
-Repo:http://smashwords-access-for-android.googlecode.com/svn/trunk/SmashwordsAccess
+Repo:http://smashwords-access-for-android.googlecode.com/svn/trunk
 
 Build:011 beta,11
     disable=authentication problem:fixed in next version

metadata/org.fdroid.superuser.txt

@@ -16,7 +16,6 @@ the existing su and Superuser app to install itself.
 However, if you know what you are doing you can use this apk
 as a su/Superuser substitute if you are gaining an initial root.
 Once the install is completed you can disable or remove the old app.
-It should work with both ARM, x86, MIPS.
 
 We don't provide a flashable zip that could be flashed
 in the event that something goes wrong. Assuming you have a
@@ -63,7 +62,7 @@ sed -i 's/#define REQUESTOR JAVA_PACKAGE_NAME/#define REQUESTOR \
 "org.fdroid.superuser"/g' jni/su/su.h,buildjni=yes
 Build Version:1.0.2.1,1021,!No source for assets/reboot - it's just an unidentified binary that gets executed - https://github.com/koush/Superuser/issues/184
 
-Build:1.0.2.8,1028
+Build:1.0.2.8,1027
     commit=74363eaa79
     subdir=Superuser
     srclibs=1:KoushWidgets@2cc45f3
@@ -75,5 +74,5 @@ Build:1.0.2.8,1028
 Auto Update Mode:None
 Update Check Mode:None
 Current Version:1.0.2.8
-Current Version Code:1028
+Current Version Code:1027
 

metadata/org.torproject.android.txt

@@ -34,7 +34,6 @@ is not granted.
 Repo Type:git
 Repo:git://git.torproject.org/orbot.git
 
-#Most recent binaries from https://dev.guardianproject.info/projects/orbot/files
 Build:0.2.3.23-rc-1.0.11-RC5-test2,51
     commit=ff38bf4e5
     submodules=yes
@@ -45,25 +44,18 @@ Build:0.2.3.23-rc-1.0.11-RC5-test2,51
         sed -i 's/ndk-build/\$(NDK_BASE)\/ndk-build/g' external/Makefile && \
         make -C external
 
-Build:12.0.1,57
-    disable=not a release; problems building libevent; iptables blobs https://dev.guardianproject.info/issues/1735
-    commit=unknown - see disabled
-    submodules=yes
-    update=.;external/ActionBarSherlock/actionbarsherlock
-    prebuild=sed -i 's/ndk-build/\$(NDK_BASE)\/ndk-build/g' external/Makefile && \
-        cd res/raw/ && \
-        rm iptables* obfsproxy privoxy tor.mp3
-    build=NDK_BASE=$$NDK$$ make -C external
-
-Build:12.0.5,61
-    disable=Binary blobs of unknown origin - https://dev.guardianproject.info/issues/1735
-
 Build:13.0.4a,69
+    disable= error: using '$(top_srcdir)' in TESTS is currently broken: '$(top_srcdir)/test/test.sh' parallel-tests: installing './test-driver' autoreconf: automake failed with exit status: 1 make: *** [libevent/Makefile] Error 1 make: Leaving directory `/home/vagrant/build/org.torproject.android/external'. Possible solution: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713626 or disable tests (?).
     commit=c3327d7ae8e368
     submodules=yes
     rm=libs/armeabi;libs/jtorctl.jar
     build=NDK_BASE=$$NDK$$ make -C external 
 
+Maintainer Notes:
+51 contains prebuilt iptables.
+69 should build on normal systems, but you may need to specify NDK_TOOLCHAIN_VERSION in external/Makefile
+.
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:13.0.4a

metadata/ru.valle.btc.txt

@@ -24,16 +24,14 @@ Build:1.7.0,170
     target=android-16
 
 Build:1.9.0,190
-    disable=broken apk
     commit=ec6970073cf2
-    init=zip -r native.zip libs/armeabi* libs/x86
     target=android-16
-    build=unzip native.zip
+    scanignore=libs/armeabi/libzbarjni.so;libs/armeabi/libiconv.so;libs/armeabi-v7a/libzbarjni.so;libs/armeabi-v7a/libiconv.so;libs/x86/libzbarjni.so;libs/x86/libiconv.so
 
 Build:2.0.1,201
-    disable=broken apk; rebuild later
     commit=143a5867858
     target=android-19
+    scanignore=libs/armeabi/libzbarjni.so;libs/armeabi/libiconv.so;libs/armeabi-v7a/libzbarjni.so;libs/armeabi-v7a/libiconv.so;libs/x86/libzbarjni.so;libs/x86/libiconv.so
 
 Maintainer Notes:
 zbar libraries are from official binaries on sourceforge. I tried to compile from

metadata/stericson.busybox.donate.txt

@@ -1,3 +1,4 @@
+Disabled:Publish stericson.busybox instead: it's more limited but safer (since it doesn't have the restore option) and likely to get updated more often. The source code for this version is held back for a time (for financial gain, no doubt).
 Categories:System
 License:Apache2
 Web Site:http://code.google.com/p/busybox-android
@@ -71,66 +72,8 @@ Build:10.3.1,162
            make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
            mv busybox-git.arm/busybox ../Pro/assets/busybox1.21.1.png 
 
-Build:10.7,180
-    commit=37
-    subdir=application/Busybox
-    disable=busybox builds but java app isn't functional; if building for multiple architectures, need to rename busybox binaries sensibly so they are made available in the UI
-    forceversion=yes
-    forcevercode=yes
-    gradle=pro
-    srclibs=RootTools@3.4;BusyboxConfigs-linusyang@63dc
-    prebuild=mkdir assets && \
-        cp -r $$RootTools$$/src/com/stericson/RootTools src/main/java/stericson/ && \
-        cp -r $$BusyboxConfigs-linusyang$$ ../BB && \
-        sed -i 's/darwin-x86_64/linux-x86/g;/android_ndk_config-w-patches/d;s/#CONFIG_FILE/CONFIG_FILE/' ../BB/Makefile
-    build=cd ../BB && \
-        export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
-        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
-        mv busybox-git.arm/busybox ../Busybox/assets/busybox.png 
-
-Build:10.7,200
-    commit=37
-    disable=using Tias repo:sed: invalid option -- 'D' -- 'z' after patching; if building for multiple architectures, need to rename busybox binaries sensibly so they are made available in the UI
-    forceversion=yes
-    forcevercode=yes
-    subdir=application/Busybox
-    gradle=pro
-    srclibs=RootTools@3.4;BusyboxConfigs@835af1
-    prebuild=mkdir assets && \
-        cp -r $$RootTools$$/src/com/stericson/RootTools src/main/java/stericson/ && \
-        cp -r $$BusyboxConfigs$$ ../BB && \
-        sed -i 's/i686-android-linux/i686-linux-android/g;/android_ndk_config-w-patches/d;s/#CONFIG_FILE/CONFIG_FILE/' ../BB/Makefile
-    build=cd ../BB && \
-        export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:$PATH && \
-        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
-        mv busybox-git.arm/busybox ../Busybox/assets/busybox-1.21.0-ARM.png && \
-        export PATH=$$NDK$$/toolchains/x86-4.4.3/prebuilt/linux-x86/bin:$PATH && \
-        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-x86" ARCH=x86 ANDROID_NDK=$$NDK$$ && \
-        mv busybox-git.x86/busybox ../Busybox/assets/busybox-1.21.0-x86.png && \
-        export PATH=$$NDK$$/toolchains/mipsel-linux-android-4.4.3/prebuilt/linux-x86/bin:$PATH && \
-        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-mips" ARCH=mips ANDROID_NDK=$$NDK$$ && \
-        mv busybox-git.mips/busybox ../Busybox/assets/busybox-1.21.0-MIPS.png
-
-Maintainer Notes:
-The Java app is hard to figure out as things keep moving around and there are 
-no commit descriptions.
-It's now using gradle but it's half baked at r40.
-
-Busybox x86 and MIPS don't build for me with linusyang setup with stericson and basic configs.
-The Tias setup won't patch properly; maybe it's my version of sed.
-
-Recommended toolchain is 4.4.3, but f-droid doesn't have that.
-
-For 10.3 I just ripped out the prebuilts; it seems to be OK but somebody should verify.
-This is all I had to go on: https://f-droid.org/forums/topic/busybox-installer/page/2/#post-10075,
-but the source code is so messed up and the blobs are still there :\
-
-Could consider use of standalone toolchains for compatibility with older NDKs:
-https://github.com/cernekee/openconnect/commit/9df6672d7c80ceef2ed41
-.
-
 Auto Update Mode:None
 Update Check Mode:None
-Current Version:10.3
+Current Version:10.3.1
 Current Version Code:162
 

metadata/stericson.busybox.txt

@@ -0,0 +1,78 @@
+Categories:System
+License:Apache2
+Web Site:
+Source Code:https://github.com/Stericson/busybox-free
+Issue Tracker:https://github.com/Stericson/busybox-free/issues
+
+Auto Name:BusyBox Free
+Name:Busybox Installer
+Summary:System tools installer
+Description:
+Interface to install one version only of BusyBox (1.21.1) and its symlinks.
+For now, the binary is only for ARM architecture as the others couldn't be built.
+
+BusyBox combines tiny versions of many common UNIX utilities into a single
+small executable. It provides replacements for most of the utilities you
+usually find in GNU fileutils, shellutils, etc. 
+Android comes with a very limited multi-tool called Toolbox
+and sometimes it is crippled even more, so a standard Busybox is often needed
+by root apps that need to do different jobs.
+If you run a custom ROM you probably have most of the applets
+that you would ever need, though this binary has a few more.
+
+The range of applets 
+[https://raw2.github.com/linusyang/android-busybox-ndk/master/android_ndk_stericson-like available]
+isn't identical to the upstream version.
+Therefore, the applet manager doesn't have information about all the installed applets.
+.
+
+Requires Root:Yes
+
+Repo Type:git
+Repo:https://github.com/Stericson/busybox-free
+
+Build:10.9,157
+    commit=6c3dbbee
+    init=sed -i 's@\(reference.1=\).*@\1view_pager_JW@' project.properties 
+    target=android-18
+    rm=assets/busybox1.21.1.png;assets/busybox1.22.1.png;assets/reboot.png;build;out;view_pager_JW/build;RootTools.jar
+    srclibs=RootTools@3.4;BusyboxConfigs-linusyang@63dc
+    extlibs=toolbox
+    prebuild=cp -r $$RootTools$$/src/com/ src/ && \
+        sed -i 's/"Busybox 1.22.1", //g' src/stericson/busybox/Constants.java && \
+        mv libs/toolbox assets/toolbox.png && \
+        cp -r $$BusyboxConfigs-linusyang$$ BB && \
+        sed -i 's/darwin-x86_64/linux-x86/g;s/4.4.3/4.6/;/android_ndk_config-w-patches/d;s/#CONFIG_FILE/CONFIG_FILE/' BB/Makefile
+    scanignore=assets/toolbox.png
+    build=cd BB && \
+        export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin:$PATH && \
+        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
+        mv busybox-git.arm/busybox ../assets/busybox1.21.1.png 
+
+Maintainer Notes:
+Toolchain 4.4.3 is recommended but buildserver doesn't have access to that.
+Toolbox.png can stay in the apk under system library exception, but it's taken
+from my CM10.1 install to minimze use of developer's prebuilts.
+
+Todo: Make MIPS and x86 binaries and adapt the Java code so that they are made available for 
+      installation. Apparently, future (stericson-)upstream versions will include MIPS and x86.
+
+    disable=using Tias repo:sed: invalid option -- 'D' -- 'z' after patching; need to rename busybox binaries sensibly so they are made available in the UI
+    prebuild=sed -i 's/i686-android-linux/i686-linux-android/g;/android_ndk_config-w-patches/d;s/#CONFIG_FILE/CONFIG_FILE/' BB/Makefile
+    build=cd BB && \
+        export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin:$PATH && \
+        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \
+        mv busybox-git.arm/busybox ../assets/busybox-1.21.0-ARM.png && \
+        export PATH=$$NDK$$/toolchains/x86-4.6/prebuilt/linux-x86/bin:$PATH && \
+        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-x86" ARCH=x86 ANDROID_NDK=$$NDK$$ && \
+        mv busybox-git.x86/busybox ../assets/busybox-1.21.0-x86.png && \
+        export PATH=$$NDK$$/toolchains/mipsel-linux-android-4.6/prebuilt/linux-x86/bin:$PATH && \
+        make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-mips" ARCH=mips ANDROID_NDK=$$NDK$$ && \
+        mv busybox-git.mips/busybox ../assets/busybox-1.21.0-MIPS.png
+.
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:10.9
+Current Version Code:157
+

metadata/template-minimal

@@ -1,43 +1,20 @@
-# F-Droid metadata template
+AntiFeatures:
-#
+Categories:
-# See http://f-droid.org/manual for more details
- 
-Categories: (comma-separated)
 License:
+Web Site:
+Source Code:
+Issue Tracker:
+Donate:
 
-Web Site: (web link)
+Summary:
-Source Code: (web link)
-Issue Tracker: (web link)
-
-Summary: (one sentence, no more than 30-40 chars)
 Description:
-Description of what the app does. It should be as objective as possible.
-
-A blank line means a line break, i.e. the end of a paragraph.
-
-Bulleted lists can be used:
-
-* Item 1
-* Item 2
-
-Links can be added like this:
-[https://github.com/org/project/raw/master/res/raw/changelog.xml Changelog]
-
-Links to other apps too: [[some.other.app]]
 .
 
-Repo Type: (git, git-svn, svn, hg or bzr)
+Repo Type:
-Repo: (repo url, don't use auth
+Repo:
 
-# One for each source build
+Build:
-# Build:<version>,<version code>
+    commit=
-#     commit=<tag/commit/rev>
-#     [...]
-#
-# For a complete list of flags, see the manual
 
-Auto Update Mode: (see the manual)
+Update Check Mode:
-Update Check Mode: (see the manual)
-Current Version: (current version name)
-Current Version Code: (current version code, i.e. number)
 

metadata/uk.co.busydoingnothing.prevo.txt

@@ -3,6 +3,9 @@ License:GPLv2
 Web Site:http://www.busydoingnothing.co.uk/prevo
 Source Code:http://git.busydoingnothing.co.uk/cgit/prevo-android.git
 Issue Tracker:
+Donate:http://www.busydoingnothing.co.uk/prevo
+FlattrID:26a0d6122bbaa8cce30800414d82c658
+Bitcoin:1B5z2nLuzgb4indsxngp1ojgdaVCM347Xa
 
 Summary:Esperanto dictionary
 Description:
@@ -16,6 +19,7 @@ Repo:git://git.busydoingnothing.co.uk/prevo-android.git
 
 Build:0.9,9
     commit=0.9
+    disable=needs intltoolize on build server, alternatively gnome-common and replace all configuration commands with autogen.sh
     target=android-14
     srclibs=Revo@ade7e27bf8;PrevoDB@c2de0f915c9c4
     build=cp -r $$Revo$$ . && \
@@ -31,6 +35,10 @@ Build:0.9,9
         make -j2 && \
         ./src/prevodb -i ../Revo -o ..
 
+Maintainer Notes:
+Don't really understand the patch, think the line is only used to generate non-essential files.
+.
+
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:0.9