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

2013-01-21 11:00:22 +00:00 · 2013-01-21 11:00:22 +00:00 · 3bd8b75e87
parent 36c562598f 7acc876f7e
commit 3bd8b75e87
18 changed files with 595 additions and 562 deletions
--- a/build/extlib/.gitignore
+++ b/build/extlib/.gitignore
@ -28,3 +28,7 @@ NoAnalytics/
 TintAddon/
 NumberPicker/
 Slider/
+BillingLibrary/
+ComicViewer/
+FilePicker/
+aFileChooser/
--- a/metadata/cgeo.geocaching.txt
+++ b/metadata/cgeo.geocaching.txt
@ -34,6 +34,12 @@ sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' privat
 sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \
 sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml

+Build Version:2013.01.10,20130110,!incorrect version code in source at tag market_20130110,subdir=main,forceversion=yes,target=Google Inc.:Google APIs:16,\
+prebuild=cp templates/private.properties . && cp templates/mapsapikey.xml res/values/ && \
+sed -i 's@\(maps.api.key=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \
+sed -i 's@\(maps.api.key.market=\).*@\1LhWN5eWaqRrP0ZgO3h7vevsAwtJJs80C-G9o7RA@' private.properties && \
+sed -i 's/\@maps.api.key\@/${maps.api.key}/g' res/values/mapsapikey.xml
+
 Auto Update Mode:None
 Update Check Mode:Market
 Current Version:2013.01.10
--- a/metadata/com.prey.txt
+++ b/metadata/com.prey.txt
@ -29,5 +29,5 @@ Build Version:0.5,34,8934cda82af81580a26cf4de233da15feaab1dfd,prebuild=echo "ask
 Auto Update Mode:None
 Update Check Mode:Market
 Current Version:0.5.6
-Current Version Code:37
+Current Version Code:38

--- a/metadata/com.showmehills.txt
+++ b/metadata/com.showmehills.txt
@ -44,6 +44,6 @@ echo "sdk.dir=$$SDK$$" >../ShowMeX/local.properties
 #sed -i 's/<uses-library android:name="com.google.android.maps" \/>/<uses-library android:name="com.google.android.maps" android:required="false" \/>/g' AndroidManifest.xml 
 Auto Update Mode:None
 Update Check Mode:Market
-Current Version:0.25
-Current Version Code:25
+Current Version:0.27
+Current Version Code:27

--- a/metadata/com.ubuntuone.android.files.txt
+++ b/metadata/com.ubuntuone.android.files.txt
@ -30,6 +30,6 @@ sed -i '87\,108d' build.xml && ant setup

 Auto Update Mode:None
 Update Check Mode:Market
-Current Version:1.2.5
-Current Version Code:414
+Current Version:1.2.6
+Current Version Code:434

--- a/metadata/dentex.youtube.downloader.txt
+++ b/metadata/dentex.youtube.downloader.txt
@ -23,6 +23,6 @@ rm=dentex.youtube.downloader_v1.3.apk
 Auto Update Mode:None
 #Not in Market
 Update Check Mode:RepoManifest
-Current Version:1.3
-Current Version Code:30
+Current Version:1.3.1
+Current Version Code:31

--- a/metadata/info.toyonos.hfr4droid.txt
+++ b/metadata/info.toyonos.hfr4droid.txt
@ -18,6 +18,6 @@ Build Version:0.6.1,61,160,subdir=hfr4droid,prebuild=mv lib libs

 Auto Update Mode:None
 Update Check Mode:Market
-Current Version:0.7.1
-Current Version Code:71
+Current Version:0.7.4
+Current Version Code:74

--- a/metadata/li.klass.fhem.txt
+++ b/metadata/li.klass.fhem.txt
@ -24,6 +24,6 @@ Build Version:1.8.8,88,!Includes proprietary software

 Auto Update Mode:None
 Update Check Mode:Market
-Current Version:2.0.5
-Current Version Code:105
+Current Version:2.1.0
+Current Version Code:110

--- a/metadata/net.bible.android.activity.txt
+++ b/metadata/net.bible.android.activity.txt
@ -24,6 +24,6 @@ Build Version:1.6.0,83,5aad7e0ec7793a23296a8c7257687550ff6bca81,subdir=AndBible,

 Auto Update Mode:None
 Update Check Mode:Market
-Current Version:1.7.1
-Current Version Code:91
+Current Version:1.7.3
+Current Version Code:93

--- a/metadata/net.kervala.comicsreader.txt
+++ b/metadata/net.kervala.comicsreader.txt
@ -30,6 +30,6 @@ Build Version:1.0.576,13,a1f5b72b82f3,buildjni=yes,forceversion=yes

 Auto Update Mode:None
 Update Check Mode:Market
-Current Version:1.1.609
-Current Version Code:14
+Current Version:1.1.612
+Current Version Code:15

--- a/metadata/net.rocrail.androc.txt
+++ b/metadata/net.rocrail.androc.txt
@ -50,9 +50,10 @@ Build Version:376,376,376,target=android-14
 Build Version:377,377,!wrong version code at 377,target=android-14
 Build Version:379,379,379,target=android-14
 Build Version:381,381,381,target=android-14
+Build Version:386,386,386,target=android-14

 Auto Update Mode:Version %c
 Update Check Mode:Market
-Current Version:381
-Current Version Code:381
+Current Version:386
+Current Version Code:386

--- a/metadata/net.sourceforge.servestream.txt
+++ b/metadata/net.sourceforge.servestream.txt
@ -62,9 +62,8 @@ sed -i '/PIPESTATUS/d' arm-build.sh && sed -i '/PIPESTATUS/d' x86-build.sh && \
 ./x86-build.sh && cp -r build/ffmpeg/* ../jni/ffmpeg/ffmpeg && cd ../,buildjni=yes
 Build Version:0.5.2,66,!waiting on MIPS script

-
 Auto Update Mode:None
 Update Check Mode:Market
-Current Version:0.5.2
-Current Version Code:66
+Current Version:0.5.3
+Current Version Code:67

--- a/metadata/org.github.OxygenGuide.txt
+++ b/metadata/org.github.OxygenGuide.txt
@ -0,0 +1,21 @@
+Category:Navigation
+License:GPLv3
+Web Site:https://github.com/nicolas-raoul/OxygenGuide-Android
+Source Code:https://github.com/nicolas-raoul/OxygenGuide-Android
+Issue Tracker:https://github.com/nicolas-raoul/OxygenGuide-Android/issues
+
+Summary:Wikivoyage Offline travel guide
+Description:
+World travel guide stored on SD card.
+Articles are downloaded from Wikivoyage, the travel wiki.
+Whole world takes less than 1GB.
+.
+
+Repo Type:git
+Repo:https://github.com/nicolas-raoul/OxygenGuide-Android.git
+
+Build Version:1.3,4,0c9cea72a9
+
+Auto Update Mode:None
+Update Check Mode:Market
+
--- a/metadata/org.lumicall.android.txt
+++ b/metadata/org.lumicall.android.txt
@ -27,9 +27,10 @@ Build Version:1.8.7,122,1.8.7,buildjni=yes,submodules=yes
 Build Version:1.8.11,126,!this seems to just hang when building (at 1.8.11),buildjni=yes,submodules=yes
 Build Version:1.8.13,128,!1.8.13,buildjni=yes,submodules=yes
 Build Version:1.8.15,130,1.8.15,buildjni=yes,submodules=yes
+Build Version:1.8.18,133,1.8.18,buildjni=yes,submodules=yes

 Auto Update Mode:Version %v
 Update Check Mode:Tags
-Current Version:1.8.13
-Current Version Code:128
+Current Version:1.8.18
+Current Version Code:133

--- a/metadata/org.ttrssreader.txt
+++ b/metadata/org.ttrssreader.txt
@ -35,6 +35,7 @@ Build Version:1.3,1302,78751fbd9edc,subdir=ttrss-reader,target=android-15,srclib
 Build Version:1.32,1320,236793708946,subdir=ttrss-reader,target=android-15,srclibs=ActionBarSherlock@6e3f2bb5,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
 Build Version:1.33,1330,09d31c76076542a0d705937daaac7c682019fc44,subdir=ttrss-reader,target=android-15,srclibs=ActionBarSherlock@6e3f2bb5,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
 Build Version:1.34,1340,a3af08a3b019,subdir=ttrss-reader,target=android-15,srclibs=ActionBarSherlock@6e3f2bb5,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties
+Build Version:1.38,1380,ee51a2579898,subdir=ttrss-reader,target=android-15,srclibs=ActionBarSherlock@6e3f2bb5,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties

 Auto Update Mode:None
 Update Check Mode:Market
--- a/stats/licenses.txt
+++ b/stats/licenses.txt
@ -5,7 +5,7 @@ Beer1.03 1
 GPLv3+ 38
 Unknown 2
 GPLv2 69
-GPLv3 268
+GPLv3 269
 Apache2 146
 NYSLv0.9982 1
 EPL 1
--- a/stats/repotypes.txt
+++ b/stats/repotypes.txt
@ -1,7 +1,7 @@
 svn 66
 srclib 6
 none 18
-git 395
+git 396
 bzr 10
 git-svn 115
 hg 60
--- a/stats/total_downloads_app.txt
+++ b/stats/total_downloads_app.txt