Merge remote-tracking branch 'upstream/master'

2013-12-14 23:43:38 +01:00 · 2013-12-14 23:43:38 +01:00 · ea7407993b
parent 0bcdbe3d98 7fbd10e7bc
commit ea7407993b
18 changed files with 929 additions and 835 deletions
--- a/metadata/com.angrydoughnuts.android.alarmclock.txt
+++ b/metadata/com.angrydoughnuts.android.alarmclock.txt
@ -23,7 +23,11 @@ Build:1.7,8
    commit=alarmclock-1.7
    subdir=android/alarmclock

-Auto Update Mode:None
+Build:1.9,10
+    commit=alarmclock-1.9
+    subdir=android/alarmclock
+
+Auto Update Mode:Version alarmclock-%v
 Update Check Mode:Tags
 Current Version:1.9
 Current Version Code:10
--- a/metadata/com.byagowi.persiancalendar.txt
+++ b/metadata/com.byagowi.persiancalendar.txt
@ -52,6 +52,12 @@ Build:4.03,43
    gradle=yes
    rm=PersianCalendar.apk;extra/

+Build:4.04,44
+    commit=4.04
+    subdir=PersianCalendar
+    gradle=yes
+    rm=PersianCalendar.apk;extra/
+
 Maintainer Notes:
 Using tags from 4.02 onwards.
 .
--- a/metadata/com.google.zxing.client.android.txt
+++ b/metadata/com.google.zxing.client.android.txt
@ -59,6 +59,11 @@ Build:4.5.1,94
    subdir=android
    build=$$MVN3$$ package -f ../core/pom.xml

+Build:4.5.2,95
+    commit=2982
+    subdir=android
+    build=$$MVN3$$ package -f ../core/pom.xml
+
 Auto Update Mode:None
 # see downloads page or gplay; tags are not used
 Update Check Mode:RepoManifest
--- a/metadata/com.ichi2.anki.txt
+++ b/metadata/com.ichi2.anki.txt
@ -57,6 +57,9 @@ Build:2.0.1,32
 Build:2.0.2beta6,37
    disable=beta version

+Build:2.0.2beta8,39
+    disable=beta version
+
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:2.0.2beta8
--- a/metadata/com.liato.bankdroid.txt
+++ b/metadata/com.liato.bankdroid.txt
@ -120,9 +120,14 @@ Build:1.9.6.3-RC2,168
 Build:1.9.6.4-RC3,172
    disable=not building RCs of this

+Build:1.9.6.4,173
+    commit=v1.9.6.4
+    extlibs=commons-io/commons-io-2.0.1.jar;jsoup/jsoup-1.7.2.jar;jackson/jackson-annotations-2.1.0.jar;jackson/jackson-core-2.1.0.jar;jackson/jackson-databind-2.1.0.jar;guava-r08/guava-r08.jar
+
 Maintainer Notes:
 Releases were tagged for a while, but not any more, so RepoManifest must be
-used.
+used. (Recently tags have come back, so possibly switch back to Tags if they
+stay consistent?)

 As of 1.9.6.2 it's supposed to build with gradle but it doesn't - it complains
 that res/drawable-hdpi-v4/button_bg_pressed__2.9.2010-07-02_1022.png is not a
--- a/metadata/com.matoski.adbm.txt
+++ b/metadata/com.matoski.adbm.txt
@ -5,7 +5,7 @@ Source Code:https://github.com/ilijamt/android-adbm
 Issue Tracker:https://github.com/ilijamt/android-adbm/issues

 Auto Name:ADB Manager
-Summary:
+Summary:Control ADB connections
 Description:
 * Easy control and access details from notification bar
 * Auto connect on saved WiFi networks
@ -27,11 +27,14 @@ Requires Root:Yes
 Repo Type:git
 Repo:https://github.com/ilijamt/android-adbm.git

-# rm= runs after update ?
 Build:1.0.1,16
    commit=1.0.1
    init=rm build.xml

+Build:1.0.5,18
+    commit=1.0.5
+    update=force
+
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:1.0.5
--- a/metadata/com.menny.android.anysoftkeyboard.txt
+++ b/metadata/com.menny.android.anysoftkeyboard.txt
@ -109,6 +109,6 @@ Build:20131101,114

 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:1.1.
-Current Version Code:115
+Current Version:1.2.
+Current Version Code:116

--- a/metadata/com.owncloud.android.txt
+++ b/metadata/com.owncloud.android.txt
@ -108,7 +108,11 @@ Build:1.5.1,105001
    commit=oc-android-1.5.1
    submodules=yes

-Auto Update Mode:None
+Build:1.5.2,105002
+    commit=oc-android-1.5.2
+    submodules=yes
+
+Auto Update Mode:Version oc-android-%v
 Update Check Mode:Tags
 Current Version:1.5.2
 Current Version Code:105002
--- a/metadata/com.rigid.birthdroid.txt
+++ b/metadata/com.rigid.birthdroid.txt
@ -43,6 +43,6 @@ Needs appcompat for next release.

 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:0.6.2
-Current Version Code:62
+Current Version:0.6.3
+Current Version Code:63

--- a/metadata/info.guardianproject.otr.app.im.txt
+++ b/metadata/info.guardianproject.otr.app.im.txt
@ -85,6 +85,6 @@ Build:12.7.1,92

 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:13.0.4
-Current Version Code:98
+Current Version:13.0.5
+Current Version Code:99

--- a/metadata/org.openintents.filemanager.txt
+++ b/metadata/org.openintents.filemanager.txt
@ -68,6 +68,14 @@ Build:2.0.3-rc1,28
        rm -rf ../FileManagerDemo ../icons ../promotion ../FileManagerTest
    buildjni=yes

+Build:2.0.3,29
+    disable=not yet
+
+Maintainer Notes:
+2.0.3 is a 'preparing for next release commit' - doesn't appear to be a real
+release yet.
+.
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:2.0.3
--- a/metadata/org.ppsspp.ppsspp.txt
+++ b/metadata/org.ppsspp.ppsspp.txt
@ -145,6 +145,46 @@ Build:0.9.5-armv7,953
        NDK=$$NDK$$ ./ab.sh
    buildjni=no

+Build:0.9.6-x86,961
+    commit=v0.9.6
+    subdir=android
+    submodules=yes
+    forceversion=yes
+    forcevercode=yes
+    rm=dx9sdk;pspautotests;android/custom_rules.xml
+    srclibs=2:NoAnalytics@d38ae535b5
+    prebuild=echo 'APP_ABI=x86' >> jni/Application.mk && \
+        rm libs/libGoogleAnalytics*
+    scandelete=ffmpeg
+    scanignore=android/android-ndk-profiler
+    build=declare -rx NDK=$$NDK$$ && \
+        cd ../ffmpeg && \
+        sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' ax86-build.sh && \
+        ./ax86-build.sh && \
+        cd ../android && \
+        NDK=$$NDK$$ ./ab.sh
+    buildjni=no
+
+Build:0.9.6-armv7,963
+    commit=v0.9.6
+    subdir=android
+    submodules=yes
+    forceversion=yes
+    forcevercode=yes
+    rm=dx9sdk;pspautotests;android/custom_rules.xml
+    srclibs=2:NoAnalytics@d38ae535b5
+    prebuild=echo 'APP_ABI=armeabi-v7a' >> jni/Application.mk && \
+        rm libs/libGoogleAnalytics*
+    scandelete=ffmpeg
+    scanignore=android/android-ndk-profiler
+    build=declare -rx NDK=$$NDK$$ && \
+        cd ../ffmpeg && \
+        sed -i -e 's@^NDK.*@NDK=$$NDK$$@' -e 's/windows.*/linux-x86*/' -e '/^build_ARMv6/d' android-build.sh && \
+        ./android-build.sh && \
+        cd ../android && \
+        NDK=$$NDK$$ ./ab.sh
+    buildjni=no
+
 # +0: - (upstream)
 # +1: x86
 # +2: arm
--- a/metadata/org.totschnig.myexpenses.txt
+++ b/metadata/org.totschnig.myexpenses.txt
@ -142,6 +142,6 @@ Build:1.10.2,100

 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.10.1.2
-Current Version Code:97
+Current Version:1.10.2
+Current Version Code:100

--- a/metadata/ru.glesik.nostrangersms.txt
+++ b/metadata/ru.glesik.nostrangersms.txt
@ -29,6 +29,6 @@ Build:1.4,140

 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:1.4
-Current Version Code:140
+Current Version:1.4.1
+Current Version Code:141

--- a/metadata/uk.co.ashtonbrsc.android.intentintercept.txt
+++ b/metadata/uk.co.ashtonbrsc.android.intentintercept.txt
@ -17,12 +17,21 @@ Some details of the intent can now be edited before resending it.
 Repo Type:git
 Repo:https://github.com/intrications/intent-intercept.git

-Build Version:2.0,100,965ec1d9ed,submodules=yes,subdir=IntentIntercept,target=android-16,update=\
-.;../contrib/ActionBarSherlock/library;../contrib/android-switch-backport
-Build Version:2.01,101,2a5e768b6e,submodules=yes,subdir=IntentIntercept,target=android-16
+Build:2.0,100
+    commit=965ec1d9ed
+    subdir=IntentIntercept
+    submodules=yes
+    target=android-16
+    update=.;../contrib/ActionBarSherlock/library;../contrib/android-switch-backport
+
+Build:2.01,101
+    commit=2a5e768b6e
+    subdir=IntentIntercept
+    submodules=yes
+    target=android-16

 Auto Update Mode:None
 Update Check Mode:RepoManifest
-Current Version:2.01
-Current Version Code:101
+Current Version:2.0.2
+Current Version Code:102

--- a/stats/known_apks.txt
+++ b/stats/known_apks.txt
@ -366,6 +366,7 @@ com.andybotting.tramhunter_1000.apk com.andybotting.tramhunter 2012-09-07
 com.andybotting.tramhunter_1100.apk com.andybotting.tramhunter 2013-01-02
 com.andybotting.tramhunter_1200.apk com.andybotting.tramhunter 2013-05-10
 com.andybotting.tramhunter_1300.apk com.andybotting.tramhunter 2013-08-13
+com.angrydoughnuts.android.alarmclock_10.apk com.angrydoughnuts.android.alarmclock 2013-12-13
 com.angrydoughnuts.android.alarmclock_8.apk com.angrydoughnuts.android.alarmclock 2011-05-19
 com.anoshenko.android.mahjongg_14.apk com.anoshenko.android.mahjongg 2012-02-12
 com.anysoftkeyboard.languagepack.SSH_4.apk com.anysoftkeyboard.languagepack.SSH 2013-03-15
@ -479,6 +480,7 @@ com.byagowi.persiancalendar_36.apk com.byagowi.persiancalendar 2013-04-09
 com.byagowi.persiancalendar_38.apk com.byagowi.persiancalendar 2013-06-04
 com.byagowi.persiancalendar_42.apk com.byagowi.persiancalendar 2013-10-27
 com.byagowi.persiancalendar_43.apk com.byagowi.persiancalendar 2013-11-10
+com.byagowi.persiancalendar_44.apk com.byagowi.persiancalendar 2013-12-13
 com.casimirlab.simpleDeadlines_10.apk com.casimirlab.simpleDeadlines 2013-03-26
 com.casimirlab.simpleDeadlines_12.apk com.casimirlab.simpleDeadlines 2013-05-20
 com.casimirlab.simpleDeadlines_14.apk com.casimirlab.simpleDeadlines 2013-09-03
@ -842,6 +844,7 @@ com.liato.bankdroid_155.apk com.liato.bankdroid 2013-06-03
 com.liato.bankdroid_160.apk com.liato.bankdroid 2013-06-25
 com.liato.bankdroid_161.apk com.liato.bankdroid 2013-10-01
 com.liato.bankdroid_166.apk com.liato.bankdroid 2013-11-05
+com.liato.bankdroid_173.apk com.liato.bankdroid 2013-12-13
 com.lightbox.android.camera_2.apk com.lightbox.android.camera 2013-12-09
 com.lukekorth.screennotifications_11.apk com.lukekorth.screennotifications 2013-04-08
 com.lukekorth.screennotifications_14.apk com.lukekorth.screennotifications 2013-07-08
@ -871,6 +874,7 @@ com.matburt.mobileorg_90.apk com.matburt.mobileorg 2012-10-26
 com.matburt.mobileorg_913.apk com.matburt.mobileorg 2013-08-15
 com.matburt.mobileorg_98.apk com.matburt.mobileorg 2013-02-22
 com.matoski.adbm_16.apk com.matoski.adbm 2013-12-11
+com.matoski.adbm_18.apk com.matoski.adbm 2013-12-13
 com.maxfierke.sandwichroulette_2.apk com.maxfierke.sandwichroulette 2012-08-29
 com.mehmetakiftutuncu.eshotroid_3.apk com.mehmetakiftutuncu.eshotroid 2013-12-11
 com.mendhak.gpslogger_27.apk com.mendhak.gpslogger 2013-03-05
@ -1028,6 +1032,7 @@ com.owncloud.android_104005.apk com.owncloud.android 2013-09-23
 com.owncloud.android_104006.apk com.owncloud.android 2013-10-20
 com.owncloud.android_105000.apk com.owncloud.android 2013-11-16
 com.owncloud.android_105001.apk com.owncloud.android 2013-12-04
+com.owncloud.android_105002.apk com.owncloud.android 2013-12-13
 com.owncloud_1.apk com.owncloud 2012-05-18
 com.owncloud_103001.apk com.owncloud.android 2012-08-02
 com.owncloud_103003.apk com.owncloud.android 2012-08-09
@ -2717,6 +2722,8 @@ org.ppsspp.ppsspp_90.apk org.ppsspp.ppsspp 2013-08-21
 org.ppsspp.ppsspp_91.apk org.ppsspp.ppsspp 2013-08-23
 org.ppsspp.ppsspp_951.apk org.ppsspp.ppsspp 2013-11-13
 org.ppsspp.ppsspp_953.apk org.ppsspp.ppsspp 2013-11-08
+org.ppsspp.ppsspp_961.apk org.ppsspp.ppsspp 2013-12-13
+org.ppsspp.ppsspp_963.apk org.ppsspp.ppsspp 2013-12-13
 org.primftpd_2.apk org.primftpd 2013-03-05
 org.projectmaxs.main_1.apk org.projectmaxs.main 2013-10-10
 org.projectmaxs.main_2.apk org.projectmaxs.main 2013-10-14
--- a/stats/repotypes.txt
+++ b/stats/repotypes.txt
@ -1,6 +1,6 @@
-svn 9
+svn 10
 none 14
 git 702
 bzr 12
-git-svn 195
+git-svn 194
 hg 70
--- a/stats/total_downloads_app.txt
+++ b/stats/total_downloads_app.txt