Merge branch 'master' of gitorious.org:f-droid/fdroiddata

2013-10-29 15:34:32 +00:00 · 2013-10-29 15:34:32 +00:00 · 391246cda6
parent 4a4d07545c 45990dd310
commit 391246cda6
19 changed files with 165 additions and 93 deletions
--- a/metadata/org.mrpdaemon.android.encdroid.txt
+++ b/metadata/org.mrpdaemon.android.encdroid.txt
@ -13,14 +13,17 @@ No description available
 Repo Type:git
 Repo:https://github.com/mrpdaemon/encdroid.git

-Build Version:1.0,1,!only publish when provider that doesn't require API keys is available or we have an ssh or rsync app in the repository v1.0,\
-target=android-13,srclibs=EncfsJava@v0.1,extlibs=\
-dropbox-sdk/dropbox-android-sdk-1.5.1.jar;httpmime/httpmime-4.0.3.jar;json-simple/json_simple-1.1.jar,\
-prebuild=mvn package -f $$EncfsJava$$/pom.xml && cp $$EncfsJava$$/target/encfs-java-0.1.jar libs/
+Build:1.0,1
+    disable=only publish when provider that doesn't require API keys is available or we have an ssh or rsync app in the repository v1.0
+    commit=doesn't require API keys is available or we have an ssh or rsync app in the repository v1.0
+    target=android-13
+    extlibs=dropbox-sdk/dropbox-android-sdk-1.5.1.jar;httpmime/httpmime-4.0.3.jar;json-simple/json_simple-1.1.jar
+    srclibs=EncfsJava@v0.1
+    prebuild=mvn package -f $$EncfsJava$$/pom.xml && \
+        cp $$EncfsJava$$/target/encfs-java-0.1.jar libs/

 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.6
-Current Version Code:10
+Update Check Mode:Tags
+Current Version:1.7.1
+Current Version Code:13

--- a/metadata/org.nerdcircus.android.klaxon.txt
+++ b/metadata/org.nerdcircus.android.klaxon.txt
@ -19,8 +19,7 @@ Repo:http://klaxon.googlecode.com/svn/trunk/
 Build Version:0.27,27,144,target=android-14

 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.27
 Current Version Code:27

--- a/metadata/org.odk.collect.android.txt
+++ b/metadata/org.odk.collect.android.txt
@ -28,19 +28,34 @@ Repo Type:hg
 Repo:https://code.google.com/p/opendatakit.collect/

 #No API-8 on the build server
-Build Version:1.2.1,1015,6b017ddf90f2,prebuild=mkdir -p libs && mv lib/* libs/,\
-target=Google Inc.:Google APIs:10
-Build Version:1.2.1+,1020,v1.2.1 rev 1020,prebuild=mkdir -p libs && mv lib/* libs/,\
-target=Google Inc.:Google APIs:10,forceversion=yes
-Build Version:1.2.2,1023,v1.2.2 rev 1023,prebuild=mkdir -p libs && mv lib/* libs/,\
-target=Google Inc.:Google APIs:10
-Build Version:1.4,1033,!GMS at v1.4 rev 1033
+Build:1.2.1,1015
+    commit=6b017ddf90f2
+    target=Google Inc.:Google APIs:10
+    prebuild=mkdir -p libs && \
+        mv lib/* libs/
+
+Build:1.2.1+,1020
+    commit=v1.2.1 rev 1020
+    target=Google Inc.:Google APIs:10
+    forceversion=yes
+    prebuild=mkdir -p libs && \
+        mv lib/* libs/
+
+Build:1.2.2,1023
+    commit=v1.2.2 rev 1023
+    target=Google Inc.:Google APIs:10
+    prebuild=mkdir -p libs && \
+        mv lib/* libs/
+
+Build:1.4,1038
+    disable=Google Play Services
+    commit=v1.4 rev 1033

 Auto Update Mode:None
-#Device Variable: check downloads section instead
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:1.4
-Current Version Code:1033
+Current Version Code:1038

 # gplay services
 No Source Since:1.4
+
--- a/metadata/org.openintents.about.txt
+++ b/metadata/org.openintents.about.txt
@ -19,8 +19,7 @@ $$SDK$$/tools/android update project -p $$OI$$/distribution/DistributionLibrary
 rm -rf ../promotion ../icons ../AboutAppDemo default.properties

 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.1
 Current Version Code:8

--- a/metadata/org.openlp.android.txt
+++ b/metadata/org.openlp.android.txt
@ -2,7 +2,9 @@ Category:Office
 License:GPLv3
 Web Site:http://openlp.org
 Source Code:https://code.launchpad.net/~openlp-android/openlp/trunk
+Issue Tracker:

+Auto Name:OpenLP
 Summary:Remote for presentations
 Description:
 Remote control for the OpenLP worship presentation software.
@ -11,9 +13,14 @@ Remote control for the OpenLP worship presentation software.
 Repo Type:bzr
 Repo:lp:openlp/android

-Build Version:1.0,1,1.0
+Build:1.0,1
+    commit=1.0
+
+Build:1.1,7
+    commit=51
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.1
+Current Version Code:7

-# Tags
-Update Check Mode:None
-Current Version:1.0
-Current Version Code:1
--- a/metadata/org.paulmach.textedit.txt
+++ b/metadata/org.paulmach.textedit.txt
@ -22,8 +22,7 @@ Build Version:1.4.1,14,cddfa34997bf3da10586,target=android-8,patch=set1.4.1.patc
 Build Version:1.5,15,a46aec194ec385a0d543e80709821c16cf8aa198,target=android-8

 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.5
 Current Version Code:15

--- a/metadata/org.penghuang.tools.rotationlock.txt
+++ b/metadata/org.penghuang.tools.rotationlock.txt
@ -21,8 +21,7 @@ Build Version:1.5,6,08fce41fd3ce0e0686d5bded6841c21b9247c2e8,target=android-4,rm
 Build Version:1.6,7,6a7fef6f77e230d3c6ceda8b17771937f1588f41,rm=ant.properties

 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.6
 Current Version Code:7

--- a/metadata/org.peterbaldwin.client.android.tinyurl.txt
+++ b/metadata/org.peterbaldwin.client.android.tinyurl.txt
@ -18,8 +18,7 @@ Repo:http://android-tinyurl.googlecode.com/svn/trunk/
 Build Version:1.0.9,10,30,target=android-7,prebuild=rm -rf releases/

 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0.9
 Current Version Code:10

--- a/metadata/org.pyload.android.client.txt
+++ b/metadata/org.pyload.android.client.txt
@ -33,8 +33,7 @@ Build Version:0.3.3,16,45ec0fe5c7e001d7d29576e94ef78365793057f4
 Build Version:0.3.4,17,72b786555698ff3a1789bd0622b60f043110f9f3

 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:0.3.4
 Current Version Code:17

--- a/metadata/org.servalproject.txt
+++ b/metadata/org.servalproject.txt
@ -56,7 +56,6 @@ buildjni=no

 # Releases are in master branch, beta in development; run ant version to get version info
 Auto Update Mode:None
-#Update Check Mode:Market
 Update Check Mode:None
 Current Version:0.91
 Current Version Code:2120
--- a/metadata/org.tunesremote.txt
+++ b/metadata/org.tunesremote.txt
@ -17,8 +17,7 @@ Build Version:2.5.2,252,141
 Build Version:2.5.3,253,154

 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.5.3
 Current Version Code:253

--- a/metadata/org.wiktionary.txt
+++ b/metadata/org.wiktionary.txt
@ -14,11 +14,10 @@ Client for wiktionary.org, a dictionary run by the Wikimedia project.
 Repo Type:git
 Repo:https://github.com/wikimedia/WiktionaryMobile.git

-Build Version:1.0.1,1,62466913087ca6,submodules=yes
+Build Version:1.0.1,1,v1.0.1release,submodules=yes

 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:Tags
 Current Version:1.0.1
 Current Version Code:1

--- a/metadata/org.xbmc.android.remote.txt
+++ b/metadata/org.xbmc.android.remote.txt
@ -17,8 +17,7 @@ Build Version:0.8.8-beta1,808,39f0204a36f72cbb705fcc89685601f55105e733,encoding=
 Build Version:1.0.9,1009,7d6c1500720b927ed202608addaa1312cf2dcbe1,encoding=utf-8,prebuild=mv lib libs && mv lib-src/org/codehaus src/org/

 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0.9
 Current Version Code:1009

--- a/metadata/org.yuttadhammo.BodhiTimer.txt
+++ b/metadata/org.yuttadhammo.BodhiTimer.txt
@ -13,26 +13,58 @@ An elegant minimalist count-down timer
 Repo Type:git
 Repo:https://github.com/yuttadhammo/BodhiTimer

-Build Version:0.8,8,0c7691a490f5e8,target=android-11
-Build Version:0.9,9,!Source code not published,target=android-11
-#0.9 not in repo so this is probably ok
-Build Version:1.0,10,e46d24a00e
-Build Version:1.3,13,a3b9743
-Build Version:1.6,16,7a892b38866508206c0a7f2325bb2d43d05a1699
-Build Version:2.1,19,4b07f45bad322670c8f963f98231a01a2e181dc2
-Build Version:2.2,20,1c04460939f3dfa6123539c361c829f7774ad5ca
-Build Version:2.3,21,d32cf50fdf273bf3a9df77ecbca9102a2deae745
-Build Version:2.4,22,f5f8b00035ad701fec660aaa51f091a29207f0aa
-Build Version:2.5,23,270a0ede351ded1928b2b5164a79b3314cef1fd3
-Build Version:2.6.1,25,aa80932ee826eca8245811db4f38d52828615366
-Build Version:2.7.3,29,358a570f7a8b5929fe138a417f9f1fac4d4b3d42
-Build Version:2.8.6,39,adb2a2c34c0c8b8fec3ecbe6937fe57d1b3533c6,init=rm -rf bin/
-Build Version:3.0,45,5cb04b8a47c35f7cf59aeca8a4aebfa5fb43b1da
+Build:0.8,8
+    commit=0c7691a490f5e8
+    target=android-11
+
+Build:0.9,9
+    disable=!Source code not published
+    commit=unknown - see disabled
+    target=android-11
+
+Build:1.0,10
+    commit=e46d24a00e
+
+Build:1.3,13
+    commit=a3b9743
+
+Build:1.6,16
+    commit=7a892b38866508206c0a7f2325bb2d43d05a1699
+
+Build:2.1,19
+    commit=4b07f45bad322670c8f963f98231a01a2e181dc2
+
+Build:2.2,20
+    commit=1c04460939f3dfa6123539c361c829f7774ad5ca
+
+Build:2.3,21
+    commit=d32cf50fdf273bf3a9df77ecbca9102a2deae745
+
+Build:2.4,22
+    commit=f5f8b00035ad701fec660aaa51f091a29207f0aa
+
+Build:2.5,23
+    commit=270a0ede351ded1928b2b5164a79b3314cef1fd3
+
+Build:2.6.1,25
+    commit=aa80932ee826eca8245811db4f38d52828615366
+
+Build:2.7.3,29
+    commit=358a570f7a8b5929fe138a417f9f1fac4d4b3d42
+
+Build:2.8.6,39
+    commit=adb2a2c34c0c8b8fec3ecbe6937fe57d1b3533c6
+    init=rm -rf bin/
+
+Build:3.0,45
+    commit=5cb04b8a47c35f7cf59aeca8a4aebfa5fb43b1da
+
+Build:3.2.2,49
+    commit=a6bc4f6b808663a
+	prebuild=echo '-dontobfuscate' > proguard-project.txt

 Auto Update Mode:None
-# also on gplay; don't use tags: they would be unreliable
-Update Check Mode:None
-Current Version:3.0
-Current Version Code:45
+Update Check Mode:RepoManifest
+Current Version:3.2.2
+Current Version Code:49

-No Source Since:3.1
--- a/metadata/ro.ui.pttdroid.txt
+++ b/metadata/ro.ui.pttdroid.txt
@ -12,16 +12,20 @@ communication over the same local network (WiFi) and unicast for point-to-point
 works on GSM. Uses Speex (http://www.speex.org/) for voice encoding which can be adapted to the bandwidth.
 .

-Repo Type:git-svn
-Repo:http://pttdroid.googlecode.com/svn;trunk=trunk;tags=tags
+# Repo Type:git-svn
+# Repo:http://pttdroid.googlecode.com/svn;trunk=trunk;tags=tags
+Repo Type:svn
+Repo:http://pttdroid.googlecode.com/svn/trunk

-Build Version:1.1,2,1.1,buildjni=yes,prebuild=rm -rf libs/,target=android-7
-Build Version:1.2,3,62,buildjni=yes,subdir=pttdroid,prebuild=rm -rf libs/
+# Build Version:1.1,2,1.1,buildjni=yes,prebuild=rm -rf libs/,target=android-7
+Build:1.2,3
+    commit=62
+    subdir=pttdroid
+    prebuild=rm -rf libs/
+    buildjni=yes

 Auto Update Mode:None
-# Can't use Tags, since trunk uses subdir while tags doesn't
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.1
-Current Version Code:2
+Update Check Mode:RepoManifest
+Current Version:1.2
+Current Version Code:3

--- a/metadata/se.johanhil.clipboard.txt
+++ b/metadata/se.johanhil.clipboard.txt
@ -21,8 +21,7 @@ Repo:https://github.com/johanhil/copy-to-clipboard.git
 Build Version:1.0,2,c6c466770fb7215d957118216c2414ae69ca1bc8,target=android-4

 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:1.0
 Current Version Code:2

--- a/metadata/uk.ac.cam.cl.dtg.android.barcodebox.txt
+++ b/metadata/uk.ac.cam.cl.dtg.android.barcodebox.txt
@ -18,11 +18,14 @@ history of barcodes to CSV.
 Repo Type:git
 Repo:https://github.com/ucam-cl-dtg/barcodebox.git

-Build Version:1.1.1,3,a78f80f87298bb1cba0d80bc699ba2841be66e2a
+Build:1.1.1,3
+    commit=a78f80f87298bb1cba0d80bc699ba2841be66e2a
+
+Build:1.1.2,4
+    commit=e18c34b4fc035c

 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.1.1
-Current Version Code:3
+Update Check Mode:RepoManifest
+Current Version:1.1.2
+Current Version Code:4

--- a/metadata/uk.co.ashtonbrsc.android.intentintercept.txt
+++ b/metadata/uk.co.ashtonbrsc.android.intentintercept.txt
@ -23,8 +23,7 @@ Build Version:2.01,101,2a5e768b6e,submodules=yes,subdir=IntentIntercept,target=a
 .;../contrib/ActionBarSherlock/library;../contrib/android-switch-backport

 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
 Current Version:2.01
 Current Version Code:101

--- a/metadata/uk.org.cardboardbox.wonderdroid.txt
+++ b/metadata/uk.org.cardboardbox.wonderdroid.txt
@ -1,3 +1,4 @@
+AntiFeatures:Tracking
 Category:Games
 License:GPL
 Web Site:http://code.google.com/p/wonderdroid
@ -11,23 +12,42 @@ Bandai WonderSwan (Mono & Color) emulator. Full instructions are on the website.

 The Google Admob library has been replaced with an open-source library that
 does nothing.
+
+Tracking: Crash reports are sent silently without user interaction.
 .

 Repo Type:git
 Repo:https://code.google.com/p/wonderdroid/

-Build Version:1.8b2,36,b75f439e745,subdir=wonderdroid,buildjni=yes,srclibs=MobAdMob@2d5736,prebuild=\
-echo "android.library.reference.1=$$MobAdMob$$" >> project.properties && \
-echo "android.library=true" >> $$MobAdMob$$/project.properties && \
-rm -f libs/GoogleAdMobAdsSdk-6.0.1.jar
-Build Version:1.8c,37,1a14c45ffdeb,subdir=wonderdroid,buildjni=yes,srclibs=MobAdMob@2d5736,prebuild=\
-echo "android.library.reference.1=$$MobAdMob$$" >> project.properties && \
-echo "android.library=true" >> $$MobAdMob$$/project.properties && \
-rm -rf libs/GoogleAdMobAdsSdk-6.0.1.jar libs/*/
+Build:1.8b2,36
+    commit=b75f439e745
+    subdir=wonderdroid
+    srclibs=MobAdMob@2d5736
+    prebuild=echo "android.library.reference.1=$$MobAdMob$$" >> project.properties && \
+        echo "android.library=true" >> $$MobAdMob$$/project.properties && \
+        rm -f libs/GoogleAdMobAdsSdk-6.0.1.jar
+    buildjni=yes
+
+Build:1.8c,37
+    commit=1a14c45ffdeb
+    subdir=wonderdroid
+    srclibs=MobAdMob@2d5736
+    prebuild=echo "android.library.reference.1=$$MobAdMob$$" >> project.properties && \
+        echo "android.library=true" >> $$MobAdMob$$/project.properties && \
+        rm -rf libs/GoogleAdMobAdsSdk-6.0.1.jar libs/*/
+    buildjni=yes
+
+Build:1.9,39
+    commit=5d92956205f5
+    patch=jni.diff
+    subdir=wonderdroid
+    srclibs=MobAdMob@3bd7888
+    prebuild=echo "android.library.reference.1=$$MobAdMob$$" >> project.properties && \
+        rm -rf libs/GoogleAdMobAdsSdk-6.0.1.jar
+    buildjni=yes

 Auto Update Mode:None
-#Update Check Mode:Market
-Update Check Mode:None
-Current Version:1.8c
-Current Version Code:37
+Update Check Mode:RepoManifest
+Current Version:1.9
+Current Version Code:39