From d4706128de501f1bf2fb4879a79021cb6edd1f63 Mon Sep 17 00:00:00 2001 From: Daniel Kraft Date: Fri, 17 Aug 2012 14:45:35 +0200 Subject: [PATCH 01/14] New app added. --- metadata/eu.domob.bjtrainer.txt | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 metadata/eu.domob.bjtrainer.txt diff --git a/metadata/eu.domob.bjtrainer.txt b/metadata/eu.domob.bjtrainer.txt new file mode 100644 index 0000000000..5375fa30a5 --- /dev/null +++ b/metadata/eu.domob.bjtrainer.txt @@ -0,0 +1,23 @@ +Category:Games +License:GPLv3 +Web Site:http://www.domob.eu/projects/bjtrainer.php +Source Code:https://sourceforge.net/p/bjtrainer/code/ +Issue Tracker:https://sourceforge.net/p/bjtrainer/tickets/ +Donate:http://www.domob.eu/donate.php + +Summary:Learning BlackJack +Description: +This app helps you in learning to play BlackJack well, +by simulating the game for you and also telling you about +sub-optimal decisions made. It even includes a mode to +systematically train all possible initial situations. +. + +Repo Type:git-svn +Repo:https://bjtrainer.svn.sourceforge.net/svnroot/bjtrainer/trunk + +Build Version:0.1,00100,31,update=force + +Update Check Mode:None +Current Version:0.1 +Current Version Code:00100 From 637414997aba45bbf7532e45ad07857483bdfcbe Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Wed, 22 Aug 2012 09:41:11 +0100 Subject: [PATCH 02/14] Updated WordPress to 2.1.5 --- metadata/org.wordpress.android.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/metadata/org.wordpress.android.txt b/metadata/org.wordpress.android.txt index dc0477ee59..6844612c3f 100644 --- a/metadata/org.wordpress.android.txt +++ b/metadata/org.wordpress.android.txt @@ -23,8 +23,10 @@ Build Version:2.1,48,708,subdir=trunk,encoding=utf-8 Build Version:2.1.1,49,721,subdir=trunk,encoding=utf-8 Build Version:2.1.2,50,729,subdir=trunk,encoding=utf-8 Build Version:2.1.3,52,738,subdir=trunk,encoding=utf-8 +Build Version:2.1.5,56,780,subdir=tags/2.1.5,encoding=utf-8,\ +prebuild=rm ../1.4.0/bin/wp-android.apk && rm ../2.0.3/bin/wp-android.apk && rm ../1.4.1/bin/wp-android.apk && rm ../2.0/bin/wp-android.apk Update Check Mode:Market -Current Version:2.1.3 -Current Version Code:52 +Current Version:2.1.5 +Current Version Code:56 From c83d3ef3e39de33abf8f89aaae9ba31b3f659cc3 Mon Sep 17 00:00:00 2001 From: David Black Date: Wed, 22 Aug 2012 14:16:52 +0100 Subject: [PATCH 03/14] Change license for osmand(+) --- metadata/net.osmand.plus.txt | 2 +- metadata/net.osmand.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt index be83682231..734eaebedc 100644 --- a/metadata/net.osmand.plus.txt +++ b/metadata/net.osmand.plus.txt @@ -1,5 +1,5 @@ Category:Navigation -License:LGPL +License:GPLv3 Web Site:http://code.google.com/p/osmand/ Source Code:https://github.com/osmandapp/Osmand Issue Tracker:http://code.google.com/p/osmand/issues/list diff --git a/metadata/net.osmand.txt b/metadata/net.osmand.txt index 497a0528ea..9588a4bb90 100644 --- a/metadata/net.osmand.txt +++ b/metadata/net.osmand.txt @@ -1,5 +1,5 @@ Category:Navigation -License:LGPL +License:GPLv3 Web Site:http://code.google.com/p/osmand/ Source Code:https://github.com/osmandapp/Osmand Issue Tracker:http://code.google.com/p/osmand/issues/list From bbc8e8a18c66c98953b352ae3f82e5b777cecf0c Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Wed, 22 Aug 2012 15:08:53 +0100 Subject: [PATCH 04/14] Current version updates --- metadata/An.stop.txt | 2 ++ metadata/android.game.prboom.txt | 2 ++ metadata/apps.droidnotify.txt | 4 ++-- metadata/cgeo.geocaching.txt | 4 ++-- metadata/com.android.keepass.txt | 6 +++--- metadata/com.axelby.podax.txt | 4 ++-- metadata/com.boardgamegeek.txt | 4 ++-- metadata/com.bottleworks.dailymoney.txt | 4 ++-- metadata/com.bwx.bequick.txt | 4 ++-- metadata/com.ciarang.tallyphant.txt | 6 ++++-- metadata/com.csipsimple.txt | 4 ++-- metadata/com.dririan.RingyDingyDingy.txt | 5 ++--- metadata/com.eleybourn.bookcatalogue.txt | 4 ++-- metadata/com.fsck.k9.txt | 4 ++-- metadata/com.github.mobile.txt | 4 ++-- metadata/com.ihunda.android.binauralbeat.txt | 6 +++--- metadata/com.integralblue.callerid.txt | 4 ++-- metadata/com.madgag.agit.txt | 4 ++-- metadata/com.owncloud.android.txt | 4 ++-- metadata/com.prey.txt | 4 ++-- metadata/com.proch.practicehub.txt | 4 ++-- metadata/com.showmehills.txt | 6 +++--- metadata/com.totsp.crossword.shortyz.txt | 4 ++-- metadata/com.ubuntuone.android.files.txt | 4 ++-- metadata/com.zoffcc.applications.zanavi.txt | 5 ++++- metadata/de.schildbach.wallet_test.txt | 5 ++--- metadata/de.ub0r.android.callmeter.txt | 4 ++-- metadata/dk.andsen.asqlitemanager.txt | 4 ++-- metadata/eu.vranckaert.worktime.txt | 4 ++-- metadata/jp.co.kayo.android.localplayer.ds.ampache.txt | 5 ++++- metadata/jp.sblo.pandora.jota.txt | 4 ++-- metadata/kaljurand_at_gmail_dot_com.diktofon.txt | 5 ++++- metadata/me.guillaumin.android.osmtracker.txt | 6 +++--- metadata/me.shkschneider.dropbearserver.txt | 4 ++-- metadata/name.boyle.chris.sgtpuzzles.txt | 5 ++++- metadata/net.cactii.mathdoku.txt | 4 ++-- metadata/net.mafro.android.wakeonlan.txt | 4 ++-- metadata/net.osmand.plus.txt | 4 ++-- metadata/net.osmand.txt | 4 ++-- metadata/net.sourceforge.servestream.txt | 4 ++-- metadata/org.aprsdroid.app.txt | 5 ++++- metadata/org.eehouse.android.xw4.txt | 2 +- metadata/org.liberty.android.fantastischmemo.txt | 7 +++---- metadata/org.mozilla.firefox_beta.txt | 2 +- metadata/org.navitproject.navit.txt | 3 +-- metadata/org.pyload.android.client.txt | 4 ++++ metadata/org.thoughtcrime.securesms.txt | 4 ++-- metadata/org.wahtod.wififixer.txt | 4 ++-- metadata/org.xcsoar.txt | 4 ++-- metadata/org.yaaic.txt | 6 +++--- metadata/ru.orangesoftware.financisto.txt | 4 ++-- metadata/sk.baka.aedict.txt | 4 ++++ metadata/stericson.busybox.donate.txt | 4 ++-- metadata/uk.ac.cam.cl.dtg.android.barcodebox.txt | 4 ++-- 54 files changed, 127 insertions(+), 102 deletions(-) diff --git a/metadata/An.stop.txt b/metadata/An.stop.txt index 7eeb26ed95..dbf33725b2 100644 --- a/metadata/An.stop.txt +++ b/metadata/An.stop.txt @@ -17,4 +17,6 @@ Build Version:1.4,9,34,subdir=trunk Build Version:1.5,10,100,subdir=branches/anstop-v1_5 Update Check Mode:None +Current Version:1.5 +Current Version Code:10 diff --git a/metadata/android.game.prboom.txt b/metadata/android.game.prboom.txt index 91940b8b04..ab3062db7b 100644 --- a/metadata/android.game.prboom.txt +++ b/metadata/android.game.prboom.txt @@ -24,3 +24,5 @@ Repo Type:git-svn Repo:http://prboom4android.googlecode.com/svn/trunk/ Build Version:1.3.1-beta,31,49,buildjni=yes + +Update Check Mode:Market diff --git a/metadata/apps.droidnotify.txt b/metadata/apps.droidnotify.txt index 07ab92fc47..5278cf9c67 100644 --- a/metadata/apps.droidnotify.txt +++ b/metadata/apps.droidnotify.txt @@ -25,6 +25,6 @@ Build Version:3.7,40,!No source code Build Version:3.12,45,!No source code Update Check Mode:Market -Current Version:3.12 -Current Version Code:45 +Current Version:3.16 +Current Version Code:49 diff --git a/metadata/cgeo.geocaching.txt b/metadata/cgeo.geocaching.txt index 3c4a012c6d..d24a92a693 100644 --- a/metadata/cgeo.geocaching.txt +++ b/metadata/cgeo.geocaching.txt @@ -14,8 +14,8 @@ Repo Type:git Repo:https://github.com/cgeo/c-geo-opensource.git Update Check Mode:Market -Current Version:2012.06.28 -Current Version Code:20120628 +Current Version:2012.08.15 +Current Version Code:20120815 #Needs version naming properly, we can't have all versions being called "developer build" #Build Version:"developer build",20120628,388a5a3b1c0885a65fb036feb2cbd3d4106e83f0,subdir=main diff --git a/metadata/com.android.keepass.txt b/metadata/com.android.keepass.txt index ddbe26dad9..06bb50832f 100644 --- a/metadata/com.android.keepass.txt +++ b/metadata/com.android.keepass.txt @@ -22,10 +22,10 @@ Build Version:1.9.5,82,v1.9.5 Build Version:1.9.6,83,v1.9.6 Build Version:1.9.7,84,v1.9.7,target=android-8 Build Version:1.9.8,85,v1.9.8,target=android-8 + #Temporarily disabled - need MIPS version of NDK I think #Build Version:1.9.9,86,v1.9.9,target=android-8,buildjni=yes - Update Check Mode:Market -Current Version:1.9.9 -Current Version Code:86 +Current Version:1.9.14 +Current Version Code:91 diff --git a/metadata/com.axelby.podax.txt b/metadata/com.axelby.podax.txt index 8f5c9bac1b..01cb9e7d64 100644 --- a/metadata/com.axelby.podax.txt +++ b/metadata/com.axelby.podax.txt @@ -31,6 +31,6 @@ Build Version:4.02,21,!e5da76325a5a build failure - submodules refer to deleted Build Version:4.03,22,!151b8d508b3 submodules still invalid - Clone of 'git://github.com/thasmin/ViewPagerIndicator.git' into submodule path 'ViewPagerIndicator' failed Update Check Mode:RepoManifest -Current Version:4.03 -Current Version Code:22 +Current Version:4.5 +Current Version Code:28 diff --git a/metadata/com.boardgamegeek.txt b/metadata/com.boardgamegeek.txt index 72e81aa94b..65a86cfcde 100644 --- a/metadata/com.boardgamegeek.txt +++ b/metadata/com.boardgamegeek.txt @@ -17,6 +17,6 @@ Build Version:3.3,20,r416,subdir=BoardGameGeek,target=android-8 Build Version:3.4,21,r525,subdir=BoardGameGeek,target=android-8 Update Check Mode:Market -Current Version:3.5 -Current Version Code:22 +Current Version:3.6 +Current Version Code:23 diff --git a/metadata/com.bottleworks.dailymoney.txt b/metadata/com.bottleworks.dailymoney.txt index 8f85dd110a..51c4cb6896 100644 --- a/metadata/com.bottleworks.dailymoney.txt +++ b/metadata/com.bottleworks.dailymoney.txt @@ -19,8 +19,8 @@ Repo Type:svn Repo:https://daily-money.googlecode.com/svn/trunk/ Update Check Mode:Market -Current Version:0.9.7-0702-freshly -Current Version Code:2011070200 +Current Version:0.9.8-120802-freshly +Current Version Code:2012080201 # Does not build yet #Build Version:0.9.7-0702-freshly,2011070200,218,subdir=dailymoney-surface/,target=android-7,prebuild=\ diff --git a/metadata/com.bwx.bequick.txt b/metadata/com.bwx.bequick.txt index 54263a7acf..5384d13f39 100644 --- a/metadata/com.bwx.bequick.txt +++ b/metadata/com.bwx.bequick.txt @@ -20,6 +20,6 @@ Build Version:1.9.9.3,201107260,220,target=android-8 Build Version:1.9.9.7,201202290,!Source has disappeared Update Check Mode:Market -Current Version:1.9.9.7 -Current Version Code:201202290 +Current Version:1.9.10 +Current Version Code:201207300 diff --git a/metadata/com.ciarang.tallyphant.txt b/metadata/com.ciarang.tallyphant.txt index 9ad9437bb6..91755a7634 100644 --- a/metadata/com.ciarang.tallyphant.txt +++ b/metadata/com.ciarang.tallyphant.txt @@ -1,4 +1,3 @@ - Category:Office License:GPLv3 Web Site:http://projects.ciarang.com/p/tallyphant/ @@ -25,4 +24,7 @@ Build Version:0.2,3,38c8d82a1b19c7313aea5cdaae9f93a95fcaac32 Build Version:0.3,4,cbe9aa47adb5ac24244b4e80484fee3eb356cf8b Build Version:0.4,5,f207fbd7d2d7a682ba71c4fa7c446cc636401cba -Update Check Mode:None +Update Check Mode:RepoManifest +Current Version:0.4 +Current Version Code:5 + diff --git a/metadata/com.csipsimple.txt b/metadata/com.csipsimple.txt index a5b1d10413..cdf24f0715 100644 --- a/metadata/com.csipsimple.txt +++ b/metadata/com.csipsimple.txt @@ -13,6 +13,6 @@ A SIP (VOIP) client. Update Check Mode:Market #Note : build needs a customised ndk, as described at: # http://code.google.com/p/csipsimple/wiki/HowToBuild -Current Version:0.03-01 -Current Version Code:1108 +Current Version:0.04-00 +Current Version Code:1788 diff --git a/metadata/com.dririan.RingyDingyDingy.txt b/metadata/com.dririan.RingyDingyDingy.txt index 87ec13840e..7465b9c4e7 100644 --- a/metadata/com.dririan.RingyDingyDingy.txt +++ b/metadata/com.dririan.RingyDingyDingy.txt @@ -25,7 +25,6 @@ Build Version:0.7.1,701,v0.7.1 Build Version:0.7.2,702,v0.7.2 Update Check Mode:RepoManifest - -Current Version:0.7.2 -Current Version Code:702 +Current Version:0.7.3 +Current Version Code:000703 diff --git a/metadata/com.eleybourn.bookcatalogue.txt b/metadata/com.eleybourn.bookcatalogue.txt index 7e9c223a3e..b310d1bd9d 100644 --- a/metadata/com.eleybourn.bookcatalogue.txt +++ b/metadata/com.eleybourn.bookcatalogue.txt @@ -30,6 +30,6 @@ Build Version:4.0.3,79,!No matching source Build Version:4.0.6,88,!0d673d0b1 but requires GoodReads API keys Update Check Mode:Market -Current Version:4.0.6 -Current Version Code:88 +Current Version:4.0.7 +Current Version Code:90 diff --git a/metadata/com.fsck.k9.txt b/metadata/com.fsck.k9.txt index aed7239e81..bbb9055bc2 100644 --- a/metadata/com.fsck.k9.txt +++ b/metadata/com.fsck.k9.txt @@ -16,6 +16,6 @@ Repo:https://github.com/k9mail/k-9.git #Note - k9 is currently developer's binary only #Build Version:3.906,14006,3.906,oldsdkloc=yes,patch=target9to10.patch,target=android-10 Update Check Mode:Market -Current Version:4.009 -Current Version Code:14027 +Current Version:4.011 +Current Version Code:14029 diff --git a/metadata/com.github.mobile.txt b/metadata/com.github.mobile.txt index bc73c3a22c..903b87e949 100644 --- a/metadata/com.github.mobile.txt +++ b/metadata/com.github.mobile.txt @@ -28,6 +28,6 @@ Repo:https://github.com/github/android.git Build Version:1.1,600,1.1,maven=yes,bindir=app/target Update Check Mode:Market -Current Version:1.1 -Current Version Code:600 +Current Version:1.2 +Current Version Code:700 diff --git a/metadata/com.ihunda.android.binauralbeat.txt b/metadata/com.ihunda.android.binauralbeat.txt index a5487f8f0a..e33b43843c 100644 --- a/metadata/com.ihunda.android.binauralbeat.txt +++ b/metadata/com.ihunda.android.binauralbeat.txt @@ -23,10 +23,10 @@ Build Version:1.2,24,85160b47e80d1cac025d02756f642f3c8f667191 Build Version:1.3,25,!No source in repo Build Version:1.6,29,!973a1ee943cfb251759f5e29137892f262a1d860 but source is incomplete - missing class and drawables Build Version:1.6.2,32,!No source in repo + #Missing various things, won't build... #Build Version:1.7,34,e65c60a8ac - Update Check Mode:Market -Current Version:1.7 -Current Version Code:34 +Current Version:2.0.3 +Current Version Code:39 diff --git a/metadata/com.integralblue.callerid.txt b/metadata/com.integralblue.callerid.txt index d459246289..e3e126cc6e 100644 --- a/metadata/com.integralblue.callerid.txt +++ b/metadata/com.integralblue.callerid.txt @@ -16,6 +16,6 @@ Repo:git://gitorious.org/callerid-for-android/mainline.git Update Check Mode:Market #Disabled pending figuring out how to stop it zipaligning.... #Build Version:1.0,1,e6d5a9ac4bb24ae3866a0782f2b23d1f18eb2266,subdir=application,maven=yes,bindir=application/target,prebuild=wget http://osmdroid.googlecode.com/files/osmdroid-android-3.0.3.jar && mvn install:install-file -DgroupId=org.osmdroid -DartifactId=osmdroid -Dversion=3.0.3 -Dpackaging=jar -Dfile=osmdroid-android-3.0.3.jar -Current Version:1.5 -Current Version Code:6 +Current Version:1.6 +Current Version Code:7 diff --git a/metadata/com.madgag.agit.txt b/metadata/com.madgag.agit.txt index 3817bc9449..ec46402fe4 100644 --- a/metadata/com.madgag.agit.txt +++ b/metadata/com.madgag.agit.txt @@ -15,6 +15,6 @@ Repo:https://github.com/rtyley/agit.git #Nearly builds, but not quite #Build Version:1.28,120300515,441017d73a5bcd67729e95e779ff806da7fee204,maven=yes Update Check Mode:Market -Current Version:1.31 -Current Version Code:120601307 +Current Version:1.34 +Current Version Code:120801417 diff --git a/metadata/com.owncloud.android.txt b/metadata/com.owncloud.android.txt index cc450f54ea..37218cdba7 100644 --- a/metadata/com.owncloud.android.txt +++ b/metadata/com.owncloud.android.txt @@ -17,6 +17,6 @@ Repo:git://gitorious.org/owncloud/android-devel.git Build Version:1.3.1,103001,239be8fb4f,submodules=yes,prebuild=android update project -p actionbarsherlock/library Update Check Mode:RepoManifest -Current Version:1.3.1 -Current Version Code:103001 +Current Version:1.3.6 +Current Version Code:103006 diff --git a/metadata/com.prey.txt b/metadata/com.prey.txt index 7886498a91..e22cd1e117 100644 --- a/metadata/com.prey.txt +++ b/metadata/com.prey.txt @@ -27,6 +27,6 @@ Repo:https://github.com/prey/prey-android-client Build Version:0.5,34,8934cda82af81580a26cf4de233da15feaab1dfd,prebuild=echo "ask-for-password=true\nprey-minor-version=0\nprey-versionon=0.5\nprey-subdomain=control\nprey-domain=preyproject.com\n#c2dm\nc2dm-mail=\nc2dm-action=\nc2dm-message-sync=" > res/raw/config Update Check Mode:Market -Current Version:0.5 -Current Version Code:33 +Current Version:0.5.5 +Current Version Code:35 diff --git a/metadata/com.proch.practicehub.txt b/metadata/com.proch.practicehub.txt index 42c0dbb77e..b6ee89df32 100644 --- a/metadata/com.proch.practicehub.txt +++ b/metadata/com.proch.practicehub.txt @@ -16,6 +16,6 @@ Repo:https://code.google.com/p/music-practice-tools/ Build Version:1.0,1,109c0bddf346 Update Check Mode:Market -Current Version:1.0 -Current Version Code:1 +Current Version:2.0 +Current Version Code:2 diff --git a/metadata/com.showmehills.txt b/metadata/com.showmehills.txt index 03a6075958..f6b6cf2126 100644 --- a/metadata/com.showmehills.txt +++ b/metadata/com.showmehills.txt @@ -21,10 +21,10 @@ Build Version:0.16,16,v0.16,update=no,subdir=ShowMe/ShowMeHills,prebuild=\ mkdir src && \ echo "sdk.dir=$$SDK$$" >local.properties && \ echo "sdk.dir=$$SDK$$" >../ShowMeX/local.properties + #Note that 0.17 will either need acra.disabled patching to be true by default, or #the appropriate AntiFeature flag adding. - Update Check Mode:Market -Current Version:0.15 -Current Version Code:15 +Current Version:0.20 +Current Version Code:20 diff --git a/metadata/com.totsp.crossword.shortyz.txt b/metadata/com.totsp.crossword.shortyz.txt index 219092b8d3..b1d3bae1ea 100644 --- a/metadata/com.totsp.crossword.shortyz.txt +++ b/metadata/com.totsp.crossword.shortyz.txt @@ -18,6 +18,6 @@ Build Version:3.1.0,30100,1ce970a00083,subdir=shortyz,target=android-11,prebuild Build Version:3.1.7,30107,!No source code apparently Update Check Mode:Market -Current Version:3.1.7 -Current Version Code:30107 +Current Version:3.2.7 +Current Version Code:30207 diff --git a/metadata/com.ubuntuone.android.files.txt b/metadata/com.ubuntuone.android.files.txt index 6485a85abc..e0c0e0d167 100644 --- a/metadata/com.ubuntuone.android.files.txt +++ b/metadata/com.ubuntuone.android.files.txt @@ -14,8 +14,8 @@ Repo Type:bzr Repo:lp:ubuntuone-android-files Update Check Mode:Market -Current Version:1.2.3 -Current Version Code:315 +Current Version:1.2.4 +Current Version Code:404 #Need more dependencies for this too, but pointless since at least one is proprietary. #The others will need to be checked carefully too. diff --git a/metadata/com.zoffcc.applications.zanavi.txt b/metadata/com.zoffcc.applications.zanavi.txt index 9d41f2c336..059d8e4239 100644 --- a/metadata/com.zoffcc.applications.zanavi.txt +++ b/metadata/com.zoffcc.applications.zanavi.txt @@ -3,7 +3,6 @@ License:GPLv2 Web Site:http://zanavi.cc/index.php/Main_Page Source Code:http://viewsvn1.zanavi.cc/viewvc.cgi/zanavi_public1/navit/ Issue Tracker:http://trac.zanavi.cc/ -Donate: Summary:Offline Navigation Description: @@ -25,5 +24,9 @@ Features include: Repo Type:git-svn Repo:http://zanavi.cc/zanavi_public1/navit +Update Check Mode:Market +Current Version:2.0.0 +Current Version Code:200 + #...... #Build Version:1.0.52 diff --git a/metadata/de.schildbach.wallet_test.txt b/metadata/de.schildbach.wallet_test.txt index 88baca1a42..92fe0cfbb0 100644 --- a/metadata/de.schildbach.wallet_test.txt +++ b/metadata/de.schildbach.wallet_test.txt @@ -31,7 +31,6 @@ srclibs=BitcoinJWallet@8ced139bf179,\ prebuild=\ mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \ mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar - Build Version:2.16_test,87,49c3da045e57,subdir=wallet,maven=2,\ bindir=wallet/target,\ srclibs=BitcoinJWallet@a160dc24f38c,\ @@ -41,6 +40,6 @@ mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3 mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar Update Check Mode:RepoManifest -Current Version:2.16_test -Current Version Code:87 +Current Version:2.21_test +Current Version Code:92 diff --git a/metadata/de.ub0r.android.callmeter.txt b/metadata/de.ub0r.android.callmeter.txt index a0c8f24300..c1c606ede9 100644 --- a/metadata/de.ub0r.android.callmeter.txt +++ b/metadata/de.ub0r.android.callmeter.txt @@ -12,6 +12,6 @@ CallMeter is an Android application summing up your call and text logs. Differen . Update Check Mode:Market -Current Version:3.0 -Current Version Code:2836 +Current Version:3.5.1 +Current Version Code:7351000 diff --git a/metadata/dk.andsen.asqlitemanager.txt b/metadata/dk.andsen.asqlitemanager.txt index 39f9c87560..d2d15a458f 100644 --- a/metadata/dk.andsen.asqlitemanager.txt +++ b/metadata/dk.andsen.asqlitemanager.txt @@ -20,6 +20,6 @@ Build Version:3.2,12,236,subdir=aSQLiteManager,target=android-10 Build Version:3.3,13,241,subdir=aSQLiteManager,target=android-10 Update Check Mode:Market -Current Version:3.2 -Current Version Code:12 +Current Version:3.3.1 +Current Version Code:14 diff --git a/metadata/eu.vranckaert.worktime.txt b/metadata/eu.vranckaert.worktime.txt index 2541e132e2..9da08da9df 100644 --- a/metadata/eu.vranckaert.worktime.txt +++ b/metadata/eu.vranckaert.worktime.txt @@ -20,6 +20,6 @@ Build Version:1.1.3.a - UNSTABLE,107,273,target=android-11,patch=style.patch Build Version:1.1.4,165,541,target=android-11,patch=style.patch Update Check Mode:Market -Current Version:1.1.4 -Current Version Code:165 +Current Version:1.1.7 +Current Version Code:192 diff --git a/metadata/jp.co.kayo.android.localplayer.ds.ampache.txt b/metadata/jp.co.kayo.android.localplayer.ds.ampache.txt index fc7d62be6f..5677729cdd 100644 --- a/metadata/jp.co.kayo.android.localplayer.ds.ampache.txt +++ b/metadata/jp.co.kayo.android.localplayer.ds.ampache.txt @@ -3,7 +3,6 @@ License:GPLv2 Web Site:http://justplayer-dev.blogspot.jp/ Source Code:https://bitbucket.org/yokmama/just-player-providers/src Issue Tracker:https://plus.google.com/101509207997544022048 -Donate: Summary:Ampache plugin for Just-Player Description: @@ -13,5 +12,9 @@ This app allows you to add remote streaming functionality to Just-Player using A Repo Type:git Repo:https://bitbucket.org/yokmama/just-player-providers.git +Update Check Mode:Market +Current Version:1.19 +Current Version Code:410044 + #Build problems #Build Version:1.19,410044,1370e4cfe884,subdir=AmpacheProvider diff --git a/metadata/jp.sblo.pandora.jota.txt b/metadata/jp.sblo.pandora.jota.txt index c61da79fbf..a31feb0772 100644 --- a/metadata/jp.sblo.pandora.jota.txt +++ b/metadata/jp.sblo.pandora.jota.txt @@ -19,6 +19,6 @@ Build Version:0.2.07,57,86,buildjni=yes,target=android-11 Build Version:0.2.13,63,113,buildjni=yes,target=android-11 Update Check Mode:Market -Current Version:0.2.19 -Current Version Code:69 +Current Version:0.2.26 +Current Version Code:76 diff --git a/metadata/kaljurand_at_gmail_dot_com.diktofon.txt b/metadata/kaljurand_at_gmail_dot_com.diktofon.txt index c36d1b89f7..d03cdbb13c 100644 --- a/metadata/kaljurand_at_gmail_dot_com.diktofon.txt +++ b/metadata/kaljurand_at_gmail_dot_com.diktofon.txt @@ -3,7 +3,6 @@ License:Apache 2.0 Web Site:http://code.google.com/p/diktofon/ Source Code:https://github.com/Kaljurand/Diktofon/ Issue Tracker:http://code.google.com/p/diktofon/issues/list -Donate: Summary:Dictaphone with text-to-speech for Estonian Description: @@ -19,5 +18,9 @@ The Diktofon app provides also language independent features like tagging, high Repo Type:git Repo:https://github.com/Kaljurand/Diktofon.git +Update Check Mode:Market +Current Version:0.9.76 +Current Version Code:976 + #Missing dependencies (and possibly proprietary) #Build Version:0.9.76,976,8036d6c7,subdir=app diff --git a/metadata/me.guillaumin.android.osmtracker.txt b/metadata/me.guillaumin.android.osmtracker.txt index 8e045985d9..24db62156c 100644 --- a/metadata/me.guillaumin.android.osmtracker.txt +++ b/metadata/me.guillaumin.android.osmtracker.txt @@ -1,10 +1,10 @@ -Name:OSMTracker Category:Navigation License:GPLv3 Web Site:https://code.google.com/p/osmtracker-android/ Source Code:https://github.com/nguillaumin/osmtracker-android Issue Tracker:https://code.google.com/p/osmtracker-android/issues/list +Name:OSMTracker Summary:GPS Track Recorder Description: OSMTracker allows you to track your journey and mark significant way points. @@ -21,6 +21,6 @@ Build Version:0.5.6,21,0.5.6,target=android-8 Build Version:0.5.7,22,eac27c8a37066988f784cbc2ad7e7a2ab0326839,target=android-8 Update Check Mode:Market -Current Version:0.5.7 -Current Version Code:22 +Current Version:0.6.2 +Current Version Code:26 diff --git a/metadata/me.shkschneider.dropbearserver.txt b/metadata/me.shkschneider.dropbearserver.txt index 5e93f9cbf4..6a0e360dee 100644 --- a/metadata/me.shkschneider.dropbearserver.txt +++ b/metadata/me.shkschneider.dropbearserver.txt @@ -36,6 +36,6 @@ Repo:https://github.com/shkschneider/android_DropBearServer.git Build Version:1.7.0,170,b943a751dc Update Check Mode:Market -Current Version:1.8.6 -Current Version Code:186 +Current Version:1.9.4 +Current Version Code:194 diff --git a/metadata/name.boyle.chris.sgtpuzzles.txt b/metadata/name.boyle.chris.sgtpuzzles.txt index a863979580..395cee4bd9 100644 --- a/metadata/name.boyle.chris.sgtpuzzles.txt +++ b/metadata/name.boyle.chris.sgtpuzzles.txt @@ -3,7 +3,6 @@ License:MIT Web Site:http://chris.boyle.name/projects/android-puzzles Source Code:https://github.com/chrisboyle/sgtpuzzles Issue Tracker:https://github.com/chrisboyle/sgtpuzzles/issues -Donate: Summary:33 single-player logic games Description: @@ -14,5 +13,9 @@ logic games. Repo Type:git Repo:git://github.com/chrisboyle/sgtpuzzles.git +Update Check Mode:Market +Current Version:9561.1 +Current Version Code:72 + #This doesn't build #Build Version:9411.2,70,bb35b1265f,buildjni=yes diff --git a/metadata/net.cactii.mathdoku.txt b/metadata/net.cactii.mathdoku.txt index 9b5f6fc20d..8ab37d65c8 100644 --- a/metadata/net.cactii.mathdoku.txt +++ b/metadata/net.cactii.mathdoku.txt @@ -15,6 +15,6 @@ Repo:http://mathdoku.googlecode.com/svn/trunk/ Build Version:1.8,70,70 Update Check Mode:Market -Current Version:1.8 -Current Version Code:70 +Current Version:1.95c +Current Version Code:76 diff --git a/metadata/net.mafro.android.wakeonlan.txt b/metadata/net.mafro.android.wakeonlan.txt index eef813db07..7fe0918e08 100644 --- a/metadata/net.mafro.android.wakeonlan.txt +++ b/metadata/net.mafro.android.wakeonlan.txt @@ -15,6 +15,6 @@ Repo:https://github.com/mafrosis/Wake-On-Lan.git Build Version:1.4.2,12,468312845057e78a70f7b6260f2b116042571c42 Update Check Mode:Market -Current Version:1.4.2 -Current Version Code:12 +Current Version:1.5 +Current Version Code:13 diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt index 78692253dd..8b0ebbeb81 100644 --- a/metadata/net.osmand.plus.txt +++ b/metadata/net.osmand.plus.txt @@ -24,6 +24,6 @@ Build Version:0.6.9,42,v0.6.9,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir raw Build Version:0.6.9',43,!No corresponding source for whatever this is Update Check Mode:Market -Current Version:0.7.3 -Current Version Code:55 +Current Version:0.8.1 +Current Version Code:65 diff --git a/metadata/net.osmand.txt b/metadata/net.osmand.txt index a7fd8f4c36..f537e83494 100644 --- a/metadata/net.osmand.txt +++ b/metadata/net.osmand.txt @@ -18,6 +18,6 @@ Build Version:0.5.2,25,efc0e83a,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir asse Build Version:0.5.3,26,8e9d76ea685ea75d6c08,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir assets && mkdir raw Update Check Mode:Market -Current Version:0.7.3 -Current Version Code:56 +Current Version:0.8.1 +Current Version Code:65 diff --git a/metadata/net.sourceforge.servestream.txt b/metadata/net.sourceforge.servestream.txt index b279946d70..55901f6849 100644 --- a/metadata/net.sourceforge.servestream.txt +++ b/metadata/net.sourceforge.servestream.txt @@ -26,6 +26,6 @@ Build Version:0.4.8,58,1031,prebuild=mv lib/ libs/ Build Version:0.4.9,59,1049,buildjni=no Update Check Mode:Market -Current Version:0.4.9 -Current Version Code:59 +Current Version:0.4.11 +Current Version Code:61 diff --git a/metadata/org.aprsdroid.app.txt b/metadata/org.aprsdroid.app.txt index 373b0dd548..cb07c66214 100644 --- a/metadata/org.aprsdroid.app.txt +++ b/metadata/org.aprsdroid.app.txt @@ -3,7 +3,6 @@ License:GPLv2 Web Site:http://aprsdroid.org Source Code:https://github.com/ge0rg/aprsdroid Issue Tracker:https://github.com/ge0rg/aprsdroid/issues -Donate: Summary:App for Amateur Radio Operators Description: @@ -13,5 +12,9 @@ Report your position to the APRS-IS network and view nearby stations on a map. A Repo Type:git Repo:https://github.com/ge0rg/aprsdroid.git +Update Check Mode:Market +Current Version:1.2.0 +Current Version Code:10 + #Missing AudioBufferProcessor.java... #Build Version:1.2.0,10,6060f53846 diff --git a/metadata/org.eehouse.android.xw4.txt b/metadata/org.eehouse.android.xw4.txt index ae0b8c6906..d89f4b8330 100644 --- a/metadata/org.eehouse.android.xw4.txt +++ b/metadata/org.eehouse.android.xw4.txt @@ -23,5 +23,5 @@ Build Version:4.4 beta 39,31,android_beta_39,subdir=xwords4/android/XWords4,buil Update Check Mode:Market Current Version:4.4 -Current Version Code:38 +Current Version Code:42 diff --git a/metadata/org.liberty.android.fantastischmemo.txt b/metadata/org.liberty.android.fantastischmemo.txt index 5cd550d400..158f8b90b7 100644 --- a/metadata/org.liberty.android.fantastischmemo.txt +++ b/metadata/org.liberty.android.fantastischmemo.txt @@ -15,11 +15,10 @@ Repo:https://github.com/helloworld1/AnyMemo.git Build Version:8.3.0,135,a591497118fe2cae101027add50d835c7fe6ed27,target=android-13,prebuild=rm -rf jni/ Build Version:8.3.1,136,!No source in repo + #Doesn't build, may need some adjustments... #Build Version:9.0.10,160,2da472cae9a732a8ad1144a93ab7e83201b8f0a6,target=android-13,prebuild=rm -rf jni/ - - Update Check Mode:Market -Current Version:9.0.10 -Current Version Code:160 +Current Version:9.1 +Current Version Code:166 diff --git a/metadata/org.mozilla.firefox_beta.txt b/metadata/org.mozilla.firefox_beta.txt index 5c2404784b..46db497e98 100644 --- a/metadata/org.mozilla.firefox_beta.txt +++ b/metadata/org.mozilla.firefox_beta.txt @@ -14,5 +14,5 @@ Beta version of Firefox Mobile web browser. #They come from here: http://ftp.mozilla.org/pub/mozilla.org/mobile/releases/latest/android/multi/ Update Check Mode:Market Current Version:15.0 -Current Version Code:2012072419 +Current Version Code:2012081423 diff --git a/metadata/org.navitproject.navit.txt b/metadata/org.navitproject.navit.txt index 584c9dbbad..0d741a9187 100644 --- a/metadata/org.navitproject.navit.txt +++ b/metadata/org.navitproject.navit.txt @@ -16,8 +16,7 @@ Repo:https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit ## apks at http://download.navit-project.org/navit/android/svn/ and http://download.navit-project.org/navit/android_armv4t/svn/ ## don't know where to find version and version code - Update Check Mode:Market Current Version:navit -Current Version Code:4785 +Current Version Code:5197 diff --git a/metadata/org.pyload.android.client.txt b/metadata/org.pyload.android.client.txt index b299cb5167..2de5c45e45 100644 --- a/metadata/org.pyload.android.client.txt +++ b/metadata/org.pyload.android.client.txt @@ -29,3 +29,7 @@ Repo:https://bitbucket.org/ranan/pyload-android Build Version:0.2.5,12,74ce7f5c81b0,prebuild=mv lib/* libs/ && rm -r lib/ +Update Check Mode:Market +Current Version:0.2.5 +Current Version Code:12 + diff --git a/metadata/org.thoughtcrime.securesms.txt b/metadata/org.thoughtcrime.securesms.txt index 82e899eb39..04076b41e6 100644 --- a/metadata/org.thoughtcrime.securesms.txt +++ b/metadata/org.thoughtcrime.securesms.txt @@ -19,6 +19,6 @@ Repo:https://github.com/WhisperSystems/TextSecure.git Build Version:0.5.7,21,6a30867fd481474e8634b508d524863bc8a6b565,target=android-10 Update Check Mode:Market -Current Version:0.5.7 -Current Version Code:21 +Current Version:0.6.2 +Current Version Code:24 diff --git a/metadata/org.wahtod.wififixer.txt b/metadata/org.wahtod.wififixer.txt index 656a71582f..6e469e40af 100644 --- a/metadata/org.wahtod.wififixer.txt +++ b/metadata/org.wahtod.wififixer.txt @@ -24,6 +24,6 @@ Build Version:0.9.0.1,915,!commit 7155ca938dc1 but can't compile for some reason Build Version:0.9.0.2,922,b354e4538bf242f10125af49050e36126b668972,subdir=wififixer,target=android-15 Update Check Mode:Market -Current Version:0.9.0.3 -Current Version Code:931 +Current Version:0.9.5.1 +Current Version Code:955 diff --git a/metadata/org.xcsoar.txt b/metadata/org.xcsoar.txt index f781c4fff5..e3d8c33cfd 100644 --- a/metadata/org.xcsoar.txt +++ b/metadata/org.xcsoar.txt @@ -15,8 +15,8 @@ Repo Type:git Repo:http://git.xcsoar.org/cgit/master/xcsoar.git/ Update Check Mode:Market -Current Version:6.3.8 -Current Version Code:65 +Current Version:6.4 +Current Version Code:69 #Far too difficult to build - binary in repo #Build Version:6.2.4,51,95a3ad045eb05cb69b11b274f27c7eae387b9c40 diff --git a/metadata/org.yaaic.txt b/metadata/org.yaaic.txt index d24f0bad5d..0bf97d7c8f 100644 --- a/metadata/org.yaaic.txt +++ b/metadata/org.yaaic.txt @@ -18,10 +18,10 @@ Repo:https://github.com/pocmo/Yaaic.git Build Version:0.7,9,v0.7,subdir=application,bindir=builds/ant Build Version:0.8,10,v0.8,subdir=application,bindir=builds/ant Build Version:0.9,11,v0.9,subdir=application,bindir=builds/ant + #Complains that the embedded ActionBarSherlock has an invalid build.xml #Build Version:1.0,12,db6ed0a1224,subdir=application,bindir=builds/ant - Update Check Mode:Market -Current Version:0.9 -Current Version Code:11 +Current Version:1.0 +Current Version Code:12 diff --git a/metadata/ru.orangesoftware.financisto.txt b/metadata/ru.orangesoftware.financisto.txt index 57464af3ec..65009dc678 100644 --- a/metadata/ru.orangesoftware.financisto.txt +++ b/metadata/ru.orangesoftware.financisto.txt @@ -21,8 +21,8 @@ Repo Type:bzr Repo:lp:financisto Update Check Mode:Market -Current Version:1.5.9u1 -Current Version Code:76 +Current Version:1.6.0 +Current Version Code:77 # Build fails, wrong path to GreenDroid library #Build Version:1.5.4,57,303,target=android-4 diff --git a/metadata/sk.baka.aedict.txt b/metadata/sk.baka.aedict.txt index 3e748c7246..90c805d568 100644 --- a/metadata/sk.baka.aedict.txt +++ b/metadata/sk.baka.aedict.txt @@ -31,5 +31,9 @@ Allows automatic download of a German/French EDict, the names dictionary and the Repo Type:hg Repo:https://code.google.com/p/aedict/ +Update Check Mode:Market +Current Version:2.9 +Current Version Code:290 + #Doesn't build, needs work... #Build Version:2.10,2100,df770685 diff --git a/metadata/stericson.busybox.donate.txt b/metadata/stericson.busybox.donate.txt index dfdacd3f41..2d9602b247 100644 --- a/metadata/stericson.busybox.donate.txt +++ b/metadata/stericson.busybox.donate.txt @@ -31,6 +31,6 @@ Build Version:7.6.1,112,!No source available Build Version:7.8.3,117,!No source available Update Check Mode:Market -Current Version:9.2 -Current Version Code:134 +Current Version:9.4 +Current Version Code:136 diff --git a/metadata/uk.ac.cam.cl.dtg.android.barcodebox.txt b/metadata/uk.ac.cam.cl.dtg.android.barcodebox.txt index f122f16f84..dcccac301a 100644 --- a/metadata/uk.ac.cam.cl.dtg.android.barcodebox.txt +++ b/metadata/uk.ac.cam.cl.dtg.android.barcodebox.txt @@ -15,6 +15,6 @@ Repo:https://github.com/ucam-cl-dtg/barcodebox.git Build Version:1.1.1,3,a78f80f87298bb1cba0d80bc699ba2841be66e2a Update Check Mode:RepoManifest -Current Version:1.1.1 -Current Version Code:3 +Current Version:1.1.2 +Current Version Code:4 From e3da91a0d89f3595e96fcfeee185339d0c3013d6 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Wed, 22 Aug 2012 16:21:34 +0100 Subject: [PATCH 05/14] Updated repo icon --- fdroid-icon.png | Bin 2017 -> 3280 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/fdroid-icon.png b/fdroid-icon.png index 717577be38a89e6617caeb0ed2678ae4ff000271..8b76c9ab11dd56bf95f45d53fdc1a8dc893522e1 100644 GIT binary patch delta 3238 zcmV;X3|aHx56~HqN`DR4000fw0YWI7cmMzZ2XskIMF-pn77r9FWn^4l000b7NklLz@By>cU8Xz^MVNxfF4nIFfuxD1S;OMN+)&eRp=w`My4! z*_m0AOGi&}fex`eXU<&C|Nq_R9P`I7%$~H)e8GgpKmCi}ynm1X1IOq8e*QY>^8x1h zz}oPS!2E_f`}OC(G(Y!22mgnEcj6N8GVm*+`fC9${wvV;fX4#m<%<)>3IIMtkQukhy+- z%-`u-rxDhwmv{C~z|<8tp@_hY(bhvon9dSn0gS zqAl+1ei<}JQ3dN{Fo7sBAyJn)qfsao=F@vhg_9}4ez@l0f_iG}*)dd@&HCXiqAo|) zN2h3?27*2fSWm#Iq^9IlxL^BEoU{RDwfgTkbx87a$vsZpL;jL^()T#-RsID~oU~c3 zet#vo?y>ax)*fL(Q5Qrlg5(?(cH7_MzwdpPLNH2XHx8A!(T7li9_Av-YV}1n8{a@Q z#!7Rahk#K_)MYRMXEl||eyi@f3SC!uAEPl3Wj=@byR$oojQ4tiJ4ypxnJt7KKs@>QB z>7O^QO-__U69gZqN>rRst?#)?wfp*!M*Ha(UK+8x8`n$0=)?z!fD7ZOP+s`Xi=X?& zoq+^?`ES4edp|Qb`6pxJqa_oXp1VEUO3k@dl*Gw3IQ=)1E+lr8GOjsJCFjA&CK9YfVCTSDkE&=QW6-mw| zIad(nvFYKl+d4GTas)e={RFm4=_)1j8V2q!@BofUeD;NUAS*mZ} zrT(K;>UY<1-S~hR6h}&oo>}17V~dQRUBF24E>U0HrER`C&GJUq3B>@yn9)O>SXGcj zZK_EbEk1l90U)ReFbGP3Q2{mV-CkkqTW=E8n@8Gl+={5&TBdSqnc>+<=6|1klCg#3 ziR2TBi!T{8Pb~R4QG!^pgQAdFhg1KM=_TU;jPv9m0j~z5;JS|WSHDYTc{P2<#Kah< z7Ur0mo1r*9LUE)_+~^S18tiOtv$pntcB@T$yTZzU{1?ZsKF-|FT}u4H6Y${sNodkK z=OB&;WMZdC@4hc7bN8NWB7ZW&qBxhlARnWQ zg8C?9)F4(_{l>Rb@TVU+$uhiBQd`|*{l@n=@sTG|lhMQvG-pO4ig8DM4_J%zRH#6Z05=8=ykn~| z)ZV^BW7CJ@g~bz`_}GWo2|`-y+ic!=ov7LNJ}z0-Y_2_E<2yH*Tsq18^{YG>9p>?m zKZSecTkP#t*;`&^?0?ieBPZt)AM9y@v@cG;iNxW?YCh>;v& z7!rnI^5LJA1aZ5=`m6tgvyR=;5RYCs3qYsQqP@PgZ_Z4JVm*d|A2h0mXuxG8#0j<4 zO#p_6%hO zu&;YGt!LC2=tQZ76o$*F6-w6eerP@bOZMK|ipcWCU@ z(kK-K0kiY7URVmvTHObS(cx4p>6%bNz*>hm)qmIyC?&*+SF4pi;61fl1IOoQSYO+u zvb{$+>LP^#OOGzG{LUReaUzJVH*ZlW772<4x~(=rVES@{sxrQCin~$*+#?OJoigOD+l|eVd(6%pFf{wY_#9wL&;E$Jp2iLHZf$Z8q+9 ziGP}{qzKEv2Z7=I#Yd^T0ChrZbuIOu($r)Ew10lJUbxmNc?SJ?z**v+59A*7A=ID8 zr7@u# z%woUo52s=k>ulfhbg zA}ch?qg=f5IJbZJ4$fLCD?g?@K0$eUj{9+bWv>7o2ed$xZlg|ncav_bmDWpFK6HuA z7TDPJtvmMi5PEHFAa-`J2E;k6wSPD#Y4S3;&5C>yYP1A~$9U?a*ZBT-ZxTfjoqCN< zy+&9pP$-QO6pENa0kJV^W8!ubaV}d#m>A{q6PLKV(Gi3XC^8NpfA*dCF{ zVkdqQvmbnJl`iR58*Q5HfG4kCqqeohyYH@GV~dL|F0KxA=JIff^XJbJj(;8Ft^2hE zu;vQcTtAl!tO>BMar^ELBjqyJo_UJEcG-TgL$y*P>UMEf zC=^3Vr6H!LCz+m|Ceo0*8#TI>-F++7nmf;=pKdqBK9n-Z2gJH4j-z4Ga3A>mj%ELN zZ?N9%aBH~(1}4YGm|dD-sDBs|h6ZbuZfvPGI;^hj9bClK!TV!rUwzDsqfQ8B=Kz6I zr%s*juD|&OiR0%8heiw%VgfZP!O^Sd!GYn89oYDZ7kB08Jv0*t>HY zgzyR^1BC*uf@4cz02h>Y0Uvz~I*8NO4udVa%1lwp6w8Q|XDhaK9Xk#sU>Q&X91aEajy?-e42%o~^nYAy3<~*K6Hpln=*et#=46<7wC&b(tfV`3$bRd4?PGoTTWtpuNK(Ijv<90~5p{H|`JP&g9A z;r#o+XIc!)HojM8nfD?v3OL(QCA+2_$OyhBBlzRMZNQw2AX{6o-M|Q7rSn-4a1!Ws zEj!U60ISxHYYzS`pgd#fIp8R;&B=qdY$k9l6wsGsfPZpHDQiLjofq_JT}z>*b4TCN zcg~=LLRB)KJ_1Y!hB|7~*1~K99tUOtFJulRs-oc^&fE9>E&=dlupC=)DVTPm-=h^S zt*^T+p68kaX_#Vw??geGWw z>5L&figZXJkbsmzrimf05=6>0MVft(j&IseN(mBSHl_pu6iqpow+dy-S@Y}F>+WLZ zpN?;lahbH^_J^sniGpNJ%$qzJ^CnNm3X-+4f`8Zg?n#}FyHls*?$nvMJ5`s^ zQfCvIaW>&H>Ju)bKB*cFN!9oysT%)DDpq4kvCbLIfUQ+KtMC53oJ+0+PPC%&k2(E} z1w0c9=sTS8*+ye(g{Q(>b#l?s=|~Vte(jXvQ!$%T6yHCfUh%5MzT5lHF_K;H=r(MsGy?JL&M(uW3{X-bexbUb}t#Of@PI}^|V zqqQ6m4sBXWT|u_M-2FZDnKgi3(@XIT_JT`X4OU8-{<9@Q5%@;=L4kok8b;C75(>u_ zAv_AIzf~P6Yej-Z=eE-}ct`ZWJE8|x%%XAADM}wL=ggYpxO!?7-`9_ed(YA58-D{y z)WpGpo|F6JQbJ{So(GUpqIeZb=T{(r!H*B4zAnbG+9;({icwWTLAe(xWykZSI{-8X zm5iIL{myX`UBQw~lkoR;^XmFztY3PV z%HN$}&@Fy``bvQDGX}DH?%P~$N?uL)>kh!>R(SD=cj;N;;eqeo%0GA2@sn@YX@Bhze145J zf1XPC%^**0PS>WVAKphYVez$jBRI7CEVgxn>_GHlx~|+ZrWnh#`9&ni&nu_lE7FKZ zO$Jo>nKrv3-8P#xpPgKqz7=ao+!z2ean2j{ns-*^Vk87?E8d~cl6=O zjpspF@=6Z3R!&bUe66lnZSrpK$q8Z@`c z{I#Fw2hZKvZtxk0tNG4h=FU(+cehyBj^7J8SK@1Osmv}-!KEoEiomudM#{!A?VK99 zP(T;mszTW)WtkGow6ZpQooNdH=hjgG?{z~=wOsC9(^M;dW4rWn*8$Vt z$)5!9Dlk5aTX{wSG@P4``?L5Bxq8h7XFB>DLEc#vjszpX7qSUND4<&zep`TVWn)20 zZNHhsHv!xP(7gbR)~~$UZ;$gy;LZZDH;c9($`aUbv-nkC*Bx+*+bZBdi?;XfEPfGS zdkYD_=elz+<0cpTvEfK?d=7r2!ja&_&YJ(fH>2yW{ZcYh00000NkvXXu0mjfC@iy_ From 107204c8e4d0f5008f8b2abd61c98202b6c71109 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Wed, 22 Aug 2012 16:49:25 +0100 Subject: [PATCH 06/14] Update check mode for fdroid --- metadata/org.fdroid.fdroid.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/metadata/org.fdroid.fdroid.txt b/metadata/org.fdroid.fdroid.txt index 4ca3ab733f..66d91d4242 100644 --- a/metadata/org.fdroid.fdroid.txt +++ b/metadata/org.fdroid.fdroid.txt @@ -27,5 +27,7 @@ Build Version:0.23,14,aa58a8aad1a1c3832eafb9f1bdd6db8292d2c172,update=force Build Version:0.24,15,9b5fe2976443255b95027abd412f1c1e7f3d27b2,update=force Build Version:0.25,16,43977cc493e47a4dc841c4192ae8a40fb14b639b,update=force -Update Check Mode:None +Update Check Mode:RepoManifest +Current Version:0.25 +Current Version Code:16 From ad10fddcdfdc278776cc46e4a8704606c1f5cd46 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Wed, 22 Aug 2012 17:29:32 +0100 Subject: [PATCH 07/14] Manually adjust current version code for twidere --- metadata/org.mariotaku.twidere.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/org.mariotaku.twidere.txt b/metadata/org.mariotaku.twidere.txt index 3bc124acfd..f87f417633 100644 --- a/metadata/org.mariotaku.twidere.txt +++ b/metadata/org.mariotaku.twidere.txt @@ -22,5 +22,5 @@ Build Version:0.1.6,35,b87d64e197,target=Google Inc.:Google APIs:16 Update Check Mode:Market Current Version:0.1.6 -Current Version Code:34 +Current Version Code:35 From f2e5ab06472590001c0dd4f46086a455ec64d95e Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Wed, 22 Aug 2012 17:44:21 +0100 Subject: [PATCH 08/14] Stats, etc --- stats/known_apks.txt | 14 + stats/latestapps.txt | 8 +- stats/licenses.txt | 7 +- stats/repotypes.txt | 6 +- stats/total_downloads_app.txt | 550 +++++++++++++++++----------------- 5 files changed, 301 insertions(+), 284 deletions(-) diff --git a/stats/known_apks.txt b/stats/known_apks.txt index 3c738e7796..39f201c332 100644 --- a/stats/known_apks.txt +++ b/stats/known_apks.txt @@ -80,6 +80,7 @@ OpenGPSTracker-0.9.22.apk nl.sogeti.android.gpstracker OpenGPSTracker-0.9.23.apk nl.sogeti.android.gpstracker OpenGPSTracker-0.9.24.apk nl.sogeti.android.gpstracker OpenGPSTracker-1.0.apk nl.sogeti.android.gpstracker +OpenGPSTracker_1.3.2-osmupdate.apk nl.sogeti.android.gpstracker 2012-08-21 OpenManager_1.1.2.apk com.nexes.manager 2010-10-21 OpenSatNav-snapshot-r179.apk org.opensatnav OpenSatNav_0.9.apk org.opensatnav 2010-10-21 @@ -88,6 +89,7 @@ OsmAnd-0.5.1beta-b2.apk net.osmand 2010-12-29 OsmAnd-0.5.1beta-b3.apk net.osmand Osmdroid_2.0.apk org.andnav.osm 2010-10-21 PiwikMobile_1.apk org.piwik.mobile 2010-10-21 +Piwik_Mobile_1.8.apk org.piwik.mobile 2012-08-21 Postcode_1.0.apk net.tevp.postcode 2010-10-21 Postcode_1.1.apk net.tevp.postcode ReplicaIsland_1.3.apk com.replica.replicaisland 2010-10-21 @@ -138,6 +140,7 @@ at.tomtasche.reader_15.apk at.tomtasche.reader 2011-01-13 at.tomtasche.reader_22.apk at.tomtasche.reader 2012-02-10 at.tomtasche.reader_24.apk at.tomtasche.reader 2012-02-10 au.com.darkside.XServer_2.apk au.com.darkside.XServer 2012-03-06 +au.com.darkside.XServer_9.apk au.com.darkside.XServer 2012-08-13 caldwell.ben.trolly_6.apk caldwell.ben.trolly 2011-01-27 cmupdaterapp.ui_501.apk cmupdaterapp.ui 2011-07-12 com.FireFart.Permissions_2.apk com.FireFart.Permissions 2011-03-02 @@ -207,6 +210,7 @@ com.dririan.RingyDingyDingy_5.apk com.dririan.RingyDingyDingy 2012-08-10 com.dririan.RingyDingyDingy_600.apk com.dririan.RingyDingyDingy 2012-08-10 com.dririan.RingyDingyDingy_700.apk com.dririan.RingyDingyDingy 2012-08-10 com.dririan.RingyDingyDingy_701.apk com.dririan.RingyDingyDingy 2012-08-10 +com.dririan.RingyDingyDingy_702.apk com.dririan.RingyDingyDingy 2012-08-13 com.eddyspace.networkmonitor_2.apk com.eddyspace.networkmonitor 2011-01-23 com.eleybourn.bookcatalogue_35.apk com.eleybourn.bookcatalogue 2010-11-11 com.eleybourn.bookcatalogue_36.apk com.eleybourn.bookcatalogue 2010-11-11 @@ -316,7 +320,9 @@ com.morphoss.acal_53.apk com.morphoss.acal 2012-07-06 com.morphoss.acal_54.apk com.morphoss.acal 2012-07-06 com.morphoss.acal_55.apk com.morphoss.acal 2012-07-12 com.morphoss.acal_56.apk com.morphoss.acal 2012-07-21 +com.morphoss.acal_57.apk com.morphoss.acal 2012-08-19 com.mp3tunes.android.player_89.apk com.mp3tunes.android.player 2011-04-09 +com.naholyr.android.horairessncf_301.apk com.naholyr.android.horairessncf 2012-08-13 com.namelessdev.mpdroid_20.apk com.namelessdev.mpdroid 2012-01-29 com.nexes.manager_212.apk com.nexes.manager 2011-03-09 com.nexes.manager_218.apk com.nexes.manager 2011-07-22 @@ -325,6 +331,7 @@ com.owncloud.android_103001.apk com.owncloud.android 2012-08-02 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 +com.passwordmaker_10.apk com.passwordmaker 2012-08-13 com.proch.practicehub_1.apk com.proch.practicehub 2011-11-25 com.replica.replicaisland_14.apk com.replica.replicaisland 2011-03-03 com.ringdroid_20500.apk com.ringdroid 2011-03-26 @@ -569,6 +576,7 @@ net.rocrail.androc_347.apk net.rocrail.androc 2012-05-28 net.rocrail.androc_348.apk net.rocrail.androc 2012-06-07 net.rocrail.androc_350.apk net.rocrail.androc 2012-06-21 net.rocrail.androc_351.apk net.rocrail.androc 2012-07-12 +net.rocrail.androc_362.apk net.rocrail.androc 2012-08-21 net.sf.andbatdog.batterydog_11.apk net.sf.andbatdog.batterydog 2011-04-02 net.sourceforge.servestream_35.apk net.sourceforge.servestream 2011-03-30 net.sourceforge.servestream_46.apk net.sourceforge.servestream 2011-08-02 @@ -665,6 +673,7 @@ org.coolreader_96.apk org.coolreader 2011-02-08 org.curiouscreature.android.shelves_1.apk org.curiouscreature.android.shelves 2011-01-27 org.damazio.notifier_11.apk org.damazio.notifier 2011-01-31 org.dnaq.dialer2_17.apk org.dnaq.dialer2 2012-03-02 +org.droidparts.battery_widget_201205220.apk org.droidparts.battery_widget 2012-08-13 org.droidseries_12.apk org.droidseries 2011-03-02 org.droidseries_13.apk org.droidseries 2011-11-28 org.eehouse.android.xw4_26.apk org.eehouse.android.xw4 2012-01-13 @@ -693,6 +702,7 @@ org.fox.ttrss_74.apk org.fox.ttrss 2012-06-21 org.fox.ttrss_83.apk org.fox.ttrss 2012-06-27 org.fox.ttrss_85.apk org.fox.ttrss 2012-07-06 org.fox.ttrss_86.apk org.fox.ttrss 2012-07-12 +org.fox.ttrss_87.apk org.fox.ttrss 2012-08-21 org.geometerplus.zlibrary.ui.android_10011.apk org.geometerplus.zlibrary.ui.android 2011-04-26 org.geometerplus.zlibrary.ui.android_10013.apk org.geometerplus.zlibrary.ui.android 2011-05-16 org.geometerplus.zlibrary.ui.android_10014.apk org.geometerplus.zlibrary.ui.android 2011-05-18 @@ -743,6 +753,7 @@ org.marcus905.wifi.ace_20120115.apk org.marcus905.wifi.ace 2012-02-06 org.mariotaku.twidere_28.apk org.mariotaku.twidere 2012-07-30 org.mariotaku.twidere_31.apk org.mariotaku.twidere 2012-07-30 org.mariotaku.twidere_33.apk org.mariotaku.twidere 2012-08-09 +org.mariotaku.twidere_35.apk org.mariotaku.twidere 2012-08-21 org.mixare_14.apk org.mixare 2011-07-22 org.mixare_20.apk org.mixare 2012-01-28 org.mult.daap_30.apk org.mult.daap 2011-01-27 @@ -840,6 +851,7 @@ org.wordpress.android_48.apk org.wordpress.android 2012-05-12 org.wordpress.android_49.apk org.wordpress.android 2012-05-26 org.wordpress.android_50.apk org.wordpress.android 2012-06-01 org.wordpress.android_52.apk org.wordpress.android 2012-06-27 +org.wordpress.android_56.apk org.wordpress.android 2012-08-22 org.xbmc.android.remote_730.apk org.xbmc.android.remote 2011-02-24 org.xbmc.android.remote_768.apk org.xbmc.android.remote 2011-05-18 org.xbmc.android.remote_808.apk org.xbmc.android.remote 2012-02-29 @@ -891,8 +903,10 @@ transdroid-0.22.2.apk org.transdroid transdroid-0.22.3.apk org.transdroid transdroid-1.0.4.apk org.transdroid 2011-05-24 transdroid-1.1.0-beta.apk org.transdroid 2011-10-21 +transdroid-1.1.4.apk org.transdroid 2012-08-21 tuioDroid.impl_4.apk tuioDroid.impl 2011-11-28 tuxrider_1.0.4.apk com.drodin.tuxrider 2010-11-18 +uk.ac.cam.cl.dtg.android.barcodebox_3.apk uk.ac.cam.cl.dtg.android.barcodebox 2012-08-13 uk.co.jarofgreen.JustADamnCompass_2.apk uk.co.jarofgreen.JustADamnCompass 2012-02-12 urbanstew.RehearsalAssistant_22.apk urbanstew.RehearsalAssistant 2011-02-19 us.bravender.android.dongsa_6.apk us.bravender.android.dongsa 2012-03-06 diff --git a/stats/latestapps.txt b/stats/latestapps.txt index 33abb521f0..5b6849c2fc 100644 --- a/stats/latestapps.txt +++ b/stats/latestapps.txt @@ -1,10 +1,10 @@ +uk.ac.cam.cl.dtg.android.barcodebox com.github.mobile +com.passwordmaker +com.naholyr.android.horairessncf +org.droidparts.battery_widget com.dririan.RingyDingyDingy jp.co.kayo.android.localplayer.ds.podcast com.eolwral.osmonitor jp.co.kayo.android.localplayer.ds.ampache com.owncloud.android -org.mariotaku.twidere -com.brocktice.JustSit -com.alfray.asqare -android.tether diff --git a/stats/licenses.txt b/stats/licenses.txt index 83605d7461..463fcad20d 100644 --- a/stats/licenses.txt +++ b/stats/licenses.txt @@ -3,21 +3,20 @@ GPL 6 GPLv3+ 25 Unknown 3 GPLv2 50 -GPLv3 123 -Apache2 69 +GPLv3 126 +Apache2 72 EPL 1 AGPL 1 MIT 12 CCBYSA 1 WTFPL 1 Apache 2.0 2 -BSD 7 GPLv2+ 19 EUPL 1 AGPLv3 4 GPLv3/CCv3.0by 1 -New BSD 2 LGPL 5 +NewBSD 9 Public Domain/Unlicense 1 MPL 2 Expat 1 diff --git a/stats/repotypes.txt b/stats/repotypes.txt index 3ad4ddb576..9089efaab3 100644 --- a/stats/repotypes.txt +++ b/stats/repotypes.txt @@ -1,7 +1,7 @@ svn 55 srclib 4 none 39 -git 160 +git 164 bzr 8 -git-svn 41 -hg 32 +git-svn 42 +hg 33 diff --git a/stats/total_downloads_app.txt b/stats/total_downloads_app.txt index a621c0e0e3..e0fed3b6f0 100644 --- a/stats/total_downloads_app.txt +++ b/stats/total_downloads_app.txt @@ -1,286 +1,290 @@ # Total downloads by application, since October 2011 -ALL 688628 -An.stop 2988 -aarddict.android 4141 -android.androidVNC 3415 -android.game.prboom 1301 -android.tether 148 -apps.droidnotify 1489 -arity.calculator 2959 -at.tomtasche.reader 594 -au.com.darkside.XServer 1555 -caldwell.ben.trolly 1956 +ALL 728609 +An.stop 3220 +aarddict.android 4272 +android.androidVNC 3524 +android.game.prboom 1366 +android.tether 203 +apps.droidnotify 1525 +arity.calculator 3086 +at.tomtasche.reader 615 +au.com.darkside.XServer 1786 +caldwell.ben.trolly 2013 cm.aptoide.pt 89 -cmupdaterapp.ui 4584 -com.FireFart.Permissions 2424 -com.addi 2694 +cmupdaterapp.ui 4598 +com.FireFart.Permissions 2498 +com.addi 2775 com.agiro.scanner.android 519 -com.alfray.asqare 216 -com.alfray.mandelbrot2 1642 -com.alfray.timeriffic 810 -com.andrewshu.android.reddit 2021 -com.android.inputmethod.norwegian 321 -com.android.keepass 3395 -com.androidemu.nes 627 -com.angrydoughnuts.android.alarmclock 4031 -com.anoshenko.android.mahjongg 1764 -com.appengine.paranoid_android.lost 1359 -com.ath0.rpn 582 -com.axelby.podax 1382 -com.beem.project.beem 3298 -com.boardgamegeek 1194 -com.brocktice.JustSit 100 -com.bwx.bequick 2953 -com.bwx.qs.battery 2383 -com.chessclock.android 379 -com.ciarang.tallyphant 498 -com.commonsware.android.arXiv 1213 -com.csipsimple 2421 -com.danga.squeezer 382 -com.digitallizard.nicecompass 1589 -com.dozingcatsoftware.bouncy 3886 -com.dririan.RingyDingyDingy 19 +com.alfray.asqare 285 +com.alfray.mandelbrot2 1698 +com.alfray.timeriffic 831 +com.andrewshu.android.reddit 2058 +com.android.inputmethod.norwegian 327 +com.android.keepass 3484 +com.androidemu.nes 708 +com.angrydoughnuts.android.alarmclock 4153 +com.anoshenko.android.mahjongg 1855 +com.appengine.paranoid_android.lost 1395 +com.ath0.rpn 608 +com.axelby.podax 1424 +com.beem.project.beem 3384 +com.boardgamegeek 1223 +com.brocktice.JustSit 134 +com.bwx.bequick 3020 +com.bwx.qs.battery 2426 +com.chessclock.android 395 +com.ciarang.tallyphant 506 +com.commonsware.android.arXiv 1243 +com.csipsimple 2492 +com.danga.squeezer 387 +com.digitallizard.nicecompass 1664 +com.dozingcatsoftware.bouncy 4015 +com.dririan.RingyDingyDingy 69 com.drodin.tuxrider 26 -com.eddyspace.networkmonitor 1357 -com.eleybourn.bookcatalogue 1849 -com.eolwral.osmonitor 122 +com.eddyspace.networkmonitor 1403 +com.eleybourn.bookcatalogue 1889 +com.eolwral.osmonitor 375 com.episode6.android.appalarm.pro 168 -com.evancharlton.mileage 1356 -com.everysoft.autoanswer 578 -com.example.android.maxpapers 2391 -com.fsck.k9 11352 -com.funambol.androidsync 1536 -com.ghostsq.commander 7492 -com.github.mobile 2 -com.glTron 458 -com.google.android.diskusage 4926 +com.evancharlton.mileage 1401 +com.everysoft.autoanswer 606 +com.example.android.maxpapers 2463 +com.fsck.k9 11723 +com.funambol.androidsync 1567 +com.ghostsq.commander 7737 +com.github.mobile 36 +com.glTron 613 +com.google.android.diskusage 5063 com.google.android.maps.mytracks 561 -com.google.android.stardroid 361 -com.google.code.appsorganizer 2656 -com.google.zxing.client.android 10352 +com.google.android.stardroid 384 +com.google.code.appsorganizer 2736 +com.google.zxing.client.android 10656 com.googlecode.androidcells 430 -com.googlecode.chartdroid 531 -com.googlecode.droidwall 4995 -com.googlecode.talkmyphone 744 -com.gpl.rpg.AndorsTrail 5286 -com.hermit.btreprap 162 -com.hughes.android.dictionary 2432 -com.ichi2.anki 3149 -com.ihunda.android.binauralbeat 2549 -com.jadn.cc 1604 -com.kirit.android.mintercept 2600 -com.kmagic.solitaire 4189 -com.kostmo.wallpaper.spiral 657 -com.lecz.android.tiltmazes 2645 -com.leinardi.kitchentimer 1964 -com.liato.bankdroid 565 -com.matburt.mobileorg 1897 -com.mobilepearls.sokoban 2745 -com.morphoss.acal 8147 -com.mp3tunes.android.player 129 -com.namelessdev.mpdroid 1087 -com.nexes.manager 3475 -com.owncloud 1033 -com.owncloud.android 214 -com.proch.practicehub 1640 -com.replica.replicaisland 3153 -com.ringdroid 1935 -com.roozen.SoundManager 1700 -com.scottmain.android.searchlight 1847 -com.seavenois.tetris 1968 -com.serone.desktoplabel 1098 -com.showmehills 224 -com.smorgasbork.hotdeath 1636 -com.stericson.permissions 3016 -com.tastycactus.timesheet 837 -com.teleca.jamendo 2746 -com.textuality.lifesaver2 1157 -com.totsp.bookworm 1055 -com.totsp.crossword.shortyz 513 -com.unitedcoders.android.gpodroid 803 -com.uploadedlobster.PwdHash 83 -com.voidcode.diasporawebclient 2014 -com.volosyukivan 1803 -com.wanghaus.remembeer 206 -com.webworxshop.swallowcatcher 1234 -com.zapta.apps.maniana 1332 +com.googlecode.chartdroid 542 +com.googlecode.droidwall 5169 +com.googlecode.talkmyphone 757 +com.gpl.rpg.AndorsTrail 5439 +com.hermit.btreprap 173 +com.hughes.android.dictionary 2539 +com.ichi2.anki 3217 +com.ihunda.android.binauralbeat 2645 +com.jadn.cc 1656 +com.kirit.android.mintercept 2670 +com.kmagic.solitaire 4346 +com.kostmo.wallpaper.spiral 690 +com.lecz.android.tiltmazes 2716 +com.leinardi.kitchentimer 2058 +com.liato.bankdroid 578 +com.matburt.mobileorg 1942 +com.mobilepearls.sokoban 2820 +com.morphoss.acal 8580 +com.mp3tunes.android.player 131 +com.naholyr.android.horairessncf 36 +com.namelessdev.mpdroid 1150 +com.nexes.manager 3605 +com.owncloud 1045 +com.owncloud.android 465 +com.passwordmaker 17 +com.proch.practicehub 1700 +com.replica.replicaisland 3247 +com.ringdroid 1990 +com.roozen.SoundManager 1745 +com.scottmain.android.searchlight 1958 +com.seavenois.tetris 2083 +com.serone.desktoplabel 1133 +com.showmehills 228 +com.smorgasbork.hotdeath 1690 +com.stericson.permissions 3114 +com.tastycactus.timesheet 877 +com.teleca.jamendo 2820 +com.textuality.lifesaver2 1192 +com.totsp.bookworm 1074 +com.totsp.crossword.shortyz 527 +com.unitedcoders.android.gpodroid 841 +com.uploadedlobster.PwdHash 99 +com.voidcode.diasporawebclient 2067 +com.volosyukivan 1847 +com.wanghaus.remembeer 210 +com.webworxshop.swallowcatcher 1254 +com.zapta.apps.maniana 1407 com.zegoggles.smssync 704 -cri.sanity 1222 -cx.hell.android.pdfview 3929 -cz.hejl.chesswalk 2840 -cz.romario.opensudoku 2421 -de.blau.android 384 -de.danielweisser.android.ldapsync 93 -de.delusions.measure 736 -de.duenndns.gmdice 777 -de.fmaul.android.cmis 196 +cri.sanity 1283 +cx.hell.android.pdfview 4176 +cz.hejl.chesswalk 2940 +cz.romario.opensudoku 2491 +de.blau.android 415 +de.danielweisser.android.ldapsync 126 +de.delusions.measure 779 +de.duenndns.gmdice 833 +de.fmaul.android.cmis 211 de.joergjahnke.c64.android 32 -de.schildbach.wallet 551 -de.schildbach.wallet_test 135 -de.shandschuh.slightbackup 1761 -de.shandschuh.sparserss 4413 -de.ub0r.android.adBlock 4330 -dk.andsen.asqlitemanager 2005 -edu.killerud.kitchentimer 756 -edu.nyu.cs.omnidroid.app 1506 -edu.rit.poe.atomix 2123 -es.cesar.quitesleep 552 -es.prodevelop.gvsig.mini 1697 -eu.domob.anacam 550 -eu.domob.angulo 592 -fm.libre.droid 1335 -fr.keuse.rightsalert 737 -fr.seeks 553 -goo.TeaTimer 1417 -in.shick.diode 330 -in.shick.lockpatterngenerator 272 -info.guardianproject.browser 1923 -info.guardianproject.cacert 1038 -info.guardianproject.otr.app.im 2140 -info.lamatricexiste.network 6194 -info.staticfree.android.twentyfourhour 1740 -info.staticfree.android.units 3917 -jackpal.androidterm 2156 -jp.co.kayo.android.localplayer.ds.ampache 8 -jp.co.kayo.android.localplayer.ds.podcast 2 -kdk.android.simplydo 1067 -li.klass.fhem 398 -me.guillaumin.android.osmtracker 2390 -mixedbit.speechtrainer 1284 -name.bagi.levente.pedometer 2325 -net.androgames.level 3557 -net.avs234 2462 -net.bytten.xkcdviewer 2120 -net.cactii.mathdoku 1358 -net.dahanne.android.regalandroid 548 -net.fercanet.LNM 2369 -net.gaast.giggity 528 -net.healeys.lexic 485 -net.iowaline.dotdash 792 -net.jaqpot.netcounter 2287 -net.mafro.android.wakeonlan 1625 -net.micode.compass 3582 -net.nightwhistler.pageturner 903 -net.osmand 2785 -net.osmand.plus 8808 -net.pierrox.mcompass 2279 -net.rocrail.androc 1810 -net.sf.andbatdog.batterydog 2869 -net.sourceforge.servestream 1367 -net.status.client.mobile 809 -net.sylvek.sharemyposition 1037 -net.szym.barnacle 1711 -net.tapi.handynotes 3578 -net.tedstein.AndroSS 3968 -net.tevp.postcode 307 -nl.sogeti.android.gpstracker 1301 -no.rkkc.bysykkel 29 -nu.firetech.android.pactrack 117 +de.schildbach.wallet 572 +de.schildbach.wallet_test 145 +de.shandschuh.slightbackup 1830 +de.shandschuh.sparserss 4628 +de.ub0r.android.adBlock 4479 +dk.andsen.asqlitemanager 2116 +edu.killerud.kitchentimer 818 +edu.nyu.cs.omnidroid.app 1540 +edu.rit.poe.atomix 2180 +es.cesar.quitesleep 568 +es.prodevelop.gvsig.mini 1748 +eu.domob.anacam 673 +eu.domob.angulo 687 +fm.libre.droid 1370 +fr.keuse.rightsalert 780 +fr.seeks 566 +goo.TeaTimer 1459 +in.shick.diode 385 +in.shick.lockpatterngenerator 312 +info.guardianproject.browser 2014 +info.guardianproject.cacert 1058 +info.guardianproject.otr.app.im 2234 +info.lamatricexiste.network 6382 +info.staticfree.android.twentyfourhour 1855 +info.staticfree.android.units 4034 +jackpal.androidterm 3471 +jp.co.kayo.android.localplayer.ds.ampache 43 +jp.co.kayo.android.localplayer.ds.podcast 23 +kdk.android.simplydo 1120 +li.klass.fhem 414 +me.guillaumin.android.osmtracker 2469 +mixedbit.speechtrainer 1331 +name.bagi.levente.pedometer 2398 +net.androgames.level 3689 +net.avs234 2591 +net.bytten.xkcdviewer 2185 +net.cactii.mathdoku 1393 +net.dahanne.android.regalandroid 561 +net.fercanet.LNM 2442 +net.gaast.giggity 539 +net.healeys.lexic 512 +net.iowaline.dotdash 833 +net.jaqpot.netcounter 2342 +net.mafro.android.wakeonlan 1678 +net.micode.compass 3760 +net.nightwhistler.pageturner 1001 +net.osmand 2874 +net.osmand.plus 9138 +net.pierrox.mcompass 2369 +net.rocrail.androc 1843 +net.sf.andbatdog.batterydog 2945 +net.sourceforge.servestream 1403 +net.status.client.mobile 833 +net.sylvek.sharemyposition 1071 +net.szym.barnacle 1780 +net.tapi.handynotes 3686 +net.tedstein.AndroSS 4063 +net.tevp.postcode 314 +nl.sogeti.android.gpstracker 1361 +no.rkkc.bysykkel 33 +nu.firetech.android.pactrack 120 org.abrantix.rockon.rockonnggl 1307 -org.adaway 13129 -org.adw.launcher 3705 -org.ametro 1754 -org.andnav.osm 2609 -org.androidsoft.games.memory.kids 1917 -org.bc_bd.mrwhite 885 -org.beide.bomber 817 -org.birthdayadapter 1031 -org.connectbot 5490 -org.coolreader 7502 -org.curiouscreature.android.shelves 530 -org.damazio.notifier 670 -org.dnaq.dialer2 1117 -org.droidseries 2064 -org.eehouse.android.xw4 2154 -org.example.pushupbuddy 876 -org.fastergps 3782 -org.fdroid.fdroid 134100 +org.adaway 13832 +org.adw.launcher 3846 +org.ametro 1823 +org.andnav.osm 2700 +org.androidsoft.games.memory.kids 1982 +org.bc_bd.mrwhite 936 +org.beide.bomber 981 +org.birthdayadapter 1120 +org.connectbot 5691 +org.coolreader 7658 +org.curiouscreature.android.shelves 546 +org.damazio.notifier 686 +org.dnaq.dialer2 1156 +org.droidparts.battery_widget 102 +org.droidseries 2111 +org.eehouse.android.xw4 2211 +org.example.pushupbuddy 902 +org.fastergps 3978 +org.fdroid.fdroid 151441 org.fdroid.taskstrid 24 -org.fosdem 512 -org.fox.ttrss 541 -org.geometerplus.zlibrary.ui.android 6051 -org.helllabs.android.xmp 752 -org.hermit.audalyzer 2668 -org.hermit.netscramble 1656 -org.hermit.tricorder 3971 -org.jessies.mathdroid 2233 -org.jfedor.frozenbubble 7863 -org.jmoyer.NotificationPlus 525 -org.johanhil.flygtider 137 -org.jsharkey.sky 1548 -org.jtb.alogcat 3514 -org.jtb.droidlife 2551 -org.jtb.httpmon 1069 -org.kost.externalip 2246 -org.kreed.vanilla 3983 -org.liberty.android.fantastischmemo 745 -org.linphone 1869 -org.madore.android.unicodeMap 233 +org.fosdem 521 +org.fox.ttrss 573 +org.geometerplus.zlibrary.ui.android 6171 +org.helllabs.android.xmp 769 +org.hermit.audalyzer 2787 +org.hermit.netscramble 1696 +org.hermit.tricorder 4099 +org.jessies.mathdroid 2316 +org.jfedor.frozenbubble 8060 +org.jmoyer.NotificationPlus 543 +org.johanhil.flygtider 142 +org.jsharkey.sky 1611 +org.jtb.alogcat 3611 +org.jtb.droidlife 2610 +org.jtb.httpmon 1105 +org.kost.externalip 2316 +org.kreed.vanilla 4154 +org.liberty.android.fantastischmemo 778 +org.linphone 1922 +org.madore.android.unicodeMap 269 org.mailboxer.saymyname 31 -org.marcus905.wifi.ace 3008 -org.mariotaku.twidere 161 -org.mixare 2020 -org.moparisthebest.appbak 2513 -org.mozilla.firefox 22493 -org.mozilla.firefox_beta 1942 -org.mult.daap 1101 -org.mustard.android 2071 -org.mythdroid 745 -org.navitproject.navit 2184 -org.nerdcircus.android.klaxon 231 -org.ntpsync 966 -org.opengpx 110 -org.openintents.filemanager 2782 +org.marcus905.wifi.ace 3072 +org.mariotaku.twidere 340 +org.mixare 2028 +org.moparisthebest.appbak 2597 +org.mozilla.firefox 23184 +org.mozilla.firefox_beta 2105 +org.mult.daap 1137 +org.mustard.android 2120 +org.mythdroid 757 +org.navitproject.navit 2298 +org.nerdcircus.android.klaxon 241 +org.ntpsync 1041 +org.opengpx 120 +org.openintents.filemanager 2964 org.openintents.newsreader 5 -org.opensatnav 4037 -org.paulmach.textedit 4703 -org.penghuang.tools.rotationlock 1717 -org.piwik.mobile 380 -org.pocketworkstation.pckeyboard 6946 -org.projectvoodoo.simplecarrieriqdetector 300 -org.pyload.android.client 66 -org.scoutant.blokish 4081 -org.sipdroid.sipua 1582 -org.sixgun.ponyexpress 675 -org.sparkleshare.android 442 -org.swiftp 1617 -org.thialfihar.android.apg 3137 -org.thoughtcrime.securesms 1529 -org.tof 1775 -org.tomdroid 1493 -org.torproject.android 3463 -org.transdroid 1716 -org.ttrssreader 2436 -org.uaraven.e 1259 -org.vudroid 4044 -org.wahtod.wififixer 2775 -org.wikipedia 5561 -org.wiktionary 269 -org.woltage.irssiconnectbot 204 -org.wordpress.android 1772 -org.xbmc.android.remote 1316 -org.xcsoar 368 -org.yaaic 2070 -org.yaxim.androidclient 2199 -org.zirco 5792 -paulscode.android.mupen64plus 1080 -pl.magot.vetch.ancal 353 -pt.isec.tp.am 2921 -remuco.client.android 1084 -ru.gelin.android.weather.notification 2478 -ru.qrck.quitetaskmanager 1715 -se.johanhil.clipboard 1316 -se.johanhil.duckduckgo 3605 -se.peterbjorkman.android.trafikinfo 178 -se.sandos.android.delayed 24 -seanfoy.wherering 566 -stericson.busybox.donate 387 -tkj.android.homecontrol.mythmote 633 -to.networld.android.divedroid 482 -tuioDroid.impl 258 -uk.co.jarofgreen.JustADamnCompass 1077 -urbanstew.RehearsalAssistant 1301 -us.bravender.android.dongsa 105 -us.lindanrandy.cidrcalculator 1362 -vu.de.urpool.quickdroid 2154 -wb.receiptspro 317 +org.opensatnav 4179 +org.paulmach.textedit 4874 +org.penghuang.tools.rotationlock 1766 +org.piwik.mobile 412 +org.pocketworkstation.pckeyboard 7148 +org.projectvoodoo.simplecarrieriqdetector 412 +org.pyload.android.client 72 +org.scoutant.blokish 4211 +org.sipdroid.sipua 1621 +org.sixgun.ponyexpress 694 +org.sparkleshare.android 451 +org.swiftp 1689 +org.thialfihar.android.apg 3259 +org.thoughtcrime.securesms 1582 +org.tof 1846 +org.tomdroid 1555 +org.torproject.android 3606 +org.transdroid 1765 +org.ttrssreader 2468 +org.uaraven.e 1322 +org.vudroid 4165 +org.wahtod.wififixer 2830 +org.wikipedia 5739 +org.wiktionary 320 +org.woltage.irssiconnectbot 251 +org.wordpress.android 1840 +org.xbmc.android.remote 1341 +org.xcsoar 375 +org.yaaic 2114 +org.yaxim.androidclient 2244 +org.zirco 5932 +paulscode.android.mupen64plus 1179 +pl.magot.vetch.ancal 492 +pt.isec.tp.am 3068 +remuco.client.android 1119 +ru.gelin.android.weather.notification 2571 +ru.qrck.quitetaskmanager 1783 +se.johanhil.clipboard 1378 +se.johanhil.duckduckgo 3719 +se.peterbjorkman.android.trafikinfo 180 +se.sandos.android.delayed 30 +seanfoy.wherering 579 +stericson.busybox.donate 389 +tkj.android.homecontrol.mythmote 644 +to.networld.android.divedroid 490 +tuioDroid.impl 270 +uk.ac.cam.cl.dtg.android.barcodebox 92 +uk.co.jarofgreen.JustADamnCompass 1134 +urbanstew.RehearsalAssistant 1345 +us.bravender.android.dongsa 109 +us.lindanrandy.cidrcalculator 1412 +vu.de.urpool.quickdroid 2206 +wb.receiptspro 361 From 924ea226d05dd104deaca0bf2f17bf838ab538a9 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Wed, 22 Aug 2012 19:20:12 +0100 Subject: [PATCH 09/14] Corrections for merge request 59 --- metadata/eu.domob.bjtrainer.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/metadata/eu.domob.bjtrainer.txt b/metadata/eu.domob.bjtrainer.txt index 5375fa30a5..9983034534 100644 --- a/metadata/eu.domob.bjtrainer.txt +++ b/metadata/eu.domob.bjtrainer.txt @@ -14,10 +14,10 @@ systematically train all possible initial situations. . Repo Type:git-svn -Repo:https://bjtrainer.svn.sourceforge.net/svnroot/bjtrainer/trunk +Repo:http://svn.code.sf.net/p/bjtrainer/code/trunk -Build Version:0.1,00100,31,update=force +Build Version:0.1,100,31,update=force Update Check Mode:None Current Version:0.1 -Current Version Code:00100 +Current Version Code:100 From 1712cd3f70abccc2c97361d0c988663dda6d7240 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Thu, 23 Aug 2012 07:37:01 +0100 Subject: [PATCH 10/14] Updated acal to 1.58 --- metadata/com.morphoss.acal.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/metadata/com.morphoss.acal.txt b/metadata/com.morphoss.acal.txt index 5bc4d20809..99902b1744 100644 --- a/metadata/com.morphoss.acal.txt +++ b/metadata/com.morphoss.acal.txt @@ -36,8 +36,9 @@ Build Version:1.54,54,r1.54,target=android-8 Build Version:1.55,55,r1.55,target=android-8 Build Version:1.56,56,r1.56,target=android-8 Build Version:1.57,57,r1.57,target=android-8 +Build Version:1.58,58,r1.58,target=android-8 Update Check Mode:RepoManifest -Current Version:1.57 -Current Version Code:57 +Current Version:1.58 +Current Version Code:58 From a9b264d6ad9f4ca1f8abe9f8bc1c4df8e62a84f9 Mon Sep 17 00:00:00 2001 From: David Black Date: Thu, 23 Aug 2012 11:20:56 +0100 Subject: [PATCH 11/14] update firefox beta version code --- metadata/org.mozilla.firefox_beta.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/metadata/org.mozilla.firefox_beta.txt b/metadata/org.mozilla.firefox_beta.txt index ef27c7ba07..23ac460a99 100644 --- a/metadata/org.mozilla.firefox_beta.txt +++ b/metadata/org.mozilla.firefox_beta.txt @@ -20,9 +20,5 @@ Warning: the issue tracker link is not mobile-friendly. #They come from here: http://ftp.mozilla.org/pub/mozilla.org/mobile/releases/ Update Check Mode:Market Current Version:15.0 -<<<<<<< HEAD -Current Version Code:2012073115 -======= Current Version Code:2012081423 ->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e From a0f71d074724d7df5012ecd2204ad4b30a1157e2 Mon Sep 17 00:00:00 2001 From: David Black Date: Thu, 23 Aug 2012 11:57:13 +0100 Subject: [PATCH 12/14] merge --- metadata/android.game.prboom.txt | 4 ---- metadata/com.android.keepass.txt | 3 --- metadata/com.axelby.podax.txt | 5 ----- metadata/com.bwx.bequick.txt | 4 ---- metadata/com.fsck.k9.txt | 6 ------ metadata/com.owncloud.android.txt | 5 ----- metadata/com.showmehills.txt | 5 ----- metadata/com.zoffcc.applications.zanavi.txt | 5 ----- metadata/de.schildbach.wallet_test.txt | 5 ----- metadata/jp.sblo.pandora.jota.txt | 5 ----- metadata/me.guillaumin.android.osmtracker.txt | 7 +------ metadata/org.eehouse.android.xw4.txt | 4 ---- metadata/org.wahtod.wififixer.txt | 5 ----- metadata/org.wordpress.android.txt | 5 ----- 14 files changed, 1 insertion(+), 67 deletions(-) diff --git a/metadata/android.game.prboom.txt b/metadata/android.game.prboom.txt index f76beedc48..f89717feaa 100644 --- a/metadata/android.game.prboom.txt +++ b/metadata/android.game.prboom.txt @@ -25,11 +25,7 @@ Repo:http://prboom4android.googlecode.com/svn/trunk/ Build Version:1.3.1-beta,31,49,buildjni=yes -<<<<<<< HEAD #not in market Update Check Mode:None Current Version:1.3.1-beta Current Version Code:31 -======= -Update Check Mode:Market ->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e diff --git a/metadata/com.android.keepass.txt b/metadata/com.android.keepass.txt index a12dbf15e4..135b03cd54 100644 --- a/metadata/com.android.keepass.txt +++ b/metadata/com.android.keepass.txt @@ -26,11 +26,8 @@ Build Version:1.9.8,85,v1.9.8,target=android-8 #Temporarily disabled - need MIPS version of NDK I think #Build Version:1.9.9,86,v1.9.9,target=android-8,buildjni=yes -<<<<<<< HEAD #Build Version:1.9.14,91,v1.9.14,target=android-8,buildjni=yes -======= ->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e Update Check Mode:Market Current Version:1.9.14 Current Version Code:91 diff --git a/metadata/com.axelby.podax.txt b/metadata/com.axelby.podax.txt index 7802d89c02..67b33506b9 100644 --- a/metadata/com.axelby.podax.txt +++ b/metadata/com.axelby.podax.txt @@ -33,11 +33,6 @@ Build Version:4.03,22,!151b8d508b3 submodules still invalid - Clone of 'git://gi #Build Version:4.3,25,c44247910375d9660ebcdfda91c1c7b25586579b Update Check Mode:RepoManifest -<<<<<<< HEAD -Current Version:4.3 -Current Version Code:25 -======= Current Version:4.5 Current Version Code:28 ->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e diff --git a/metadata/com.bwx.bequick.txt b/metadata/com.bwx.bequick.txt index 00f9586cbc..c446b3c134 100644 --- a/metadata/com.bwx.bequick.txt +++ b/metadata/com.bwx.bequick.txt @@ -19,11 +19,7 @@ Build Version:1.9.9.2,201106160,213,target=android-8 Build Version:1.9.9.3,201107260,220,target=android-8 Build Version:1.9.9.7,201202290,!Source has disappeared -<<<<<<< HEAD Update Check Mode:None -======= -Update Check Mode:Market ->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e Current Version:1.9.10 Current Version Code:201207300 diff --git a/metadata/com.fsck.k9.txt b/metadata/com.fsck.k9.txt index 9afbfc3910..5364b69978 100644 --- a/metadata/com.fsck.k9.txt +++ b/metadata/com.fsck.k9.txt @@ -18,15 +18,9 @@ Repo Type:git Repo:https://github.com/k9mail/k-9.git #Build Version:3.906,14006,3.906,oldsdkloc=yes,patch=target9to10.patch,target=android-10 -<<<<<<< HEAD Build Version:4.301,17001,5b4d2806 -Update Check Mode:RepoManifest -Current Version:4.301 -Current Version Code:17001 -======= Update Check Mode:Market Current Version:4.011 Current Version Code:14029 ->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e diff --git a/metadata/com.owncloud.android.txt b/metadata/com.owncloud.android.txt index 9dd6597198..37218cdba7 100644 --- a/metadata/com.owncloud.android.txt +++ b/metadata/com.owncloud.android.txt @@ -17,11 +17,6 @@ Repo:git://gitorious.org/owncloud/android-devel.git Build Version:1.3.1,103001,239be8fb4f,submodules=yes,prebuild=android update project -p actionbarsherlock/library Update Check Mode:RepoManifest -<<<<<<< HEAD -Current Version:1.3.4 -Current Version Code:103004 -======= Current Version:1.3.6 Current Version Code:103006 ->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e diff --git a/metadata/com.showmehills.txt b/metadata/com.showmehills.txt index 5f918f000e..f6b6cf2126 100644 --- a/metadata/com.showmehills.txt +++ b/metadata/com.showmehills.txt @@ -25,11 +25,6 @@ echo "sdk.dir=$$SDK$$" >../ShowMeX/local.properties #Note that 0.17 will either need acra.disabled patching to be true by default, or #the appropriate AntiFeature flag adding. Update Check Mode:Market -<<<<<<< HEAD -Current Version:0.15 -Current Version Code:15 -======= Current Version:0.20 Current Version Code:20 ->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e diff --git a/metadata/com.zoffcc.applications.zanavi.txt b/metadata/com.zoffcc.applications.zanavi.txt index 27fa939d75..059d8e4239 100644 --- a/metadata/com.zoffcc.applications.zanavi.txt +++ b/metadata/com.zoffcc.applications.zanavi.txt @@ -25,13 +25,8 @@ Repo Type:git-svn Repo:http://zanavi.cc/zanavi_public1/navit Update Check Mode:Market -<<<<<<< HEAD -Current Version:1.0.53 -Current Version Code:53 -======= Current Version:2.0.0 Current Version Code:200 ->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e #...... #Build Version:1.0.52 diff --git a/metadata/de.schildbach.wallet_test.txt b/metadata/de.schildbach.wallet_test.txt index 798eecef39..ecbcf97ec3 100644 --- a/metadata/de.schildbach.wallet_test.txt +++ b/metadata/de.schildbach.wallet_test.txt @@ -43,11 +43,6 @@ mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v Build Version:2.20_test,91,197963d9a457 ## new version of BitcoinJWallet. Update Check Mode:RepoManifest -<<<<<<< HEAD -Current Version:2.20_test -Current Version Code:91 -======= Current Version:2.21_test Current Version Code:92 ->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e diff --git a/metadata/jp.sblo.pandora.jota.txt b/metadata/jp.sblo.pandora.jota.txt index 62ffabada9..a31feb0772 100644 --- a/metadata/jp.sblo.pandora.jota.txt +++ b/metadata/jp.sblo.pandora.jota.txt @@ -19,11 +19,6 @@ Build Version:0.2.07,57,86,buildjni=yes,target=android-11 Build Version:0.2.13,63,113,buildjni=yes,target=android-11 Update Check Mode:Market -<<<<<<< HEAD -Current Version:0.2.19 -Current Version Code:69 -======= Current Version:0.2.26 Current Version Code:76 ->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e diff --git a/metadata/me.guillaumin.android.osmtracker.txt b/metadata/me.guillaumin.android.osmtracker.txt index 02093619a0..22fc873123 100644 --- a/metadata/me.guillaumin.android.osmtracker.txt +++ b/metadata/me.guillaumin.android.osmtracker.txt @@ -19,14 +19,9 @@ Repo:https://github.com/nguillaumin/osmtracker-android.git Build Version:0.5.6,21,0.5.6,target=android-8 Build Version:0.5.7,22,eac27c8a37066988f784cbc2ad7e7a2ab0326839,target=android-8 -Build Version:0.5.8,23,623453d4f0,target=android-8 +Build Version:0.6.2,26,0.6.2,target=android-15 Update Check Mode:Market -<<<<<<< HEAD -Current Version:0.5.8 -Current Version Code:23 -======= Current Version:0.6.2 Current Version Code:26 ->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e diff --git a/metadata/org.eehouse.android.xw4.txt b/metadata/org.eehouse.android.xw4.txt index d23a9e1bd1..d89f4b8330 100644 --- a/metadata/org.eehouse.android.xw4.txt +++ b/metadata/org.eehouse.android.xw4.txt @@ -23,9 +23,5 @@ Build Version:4.4 beta 39,31,android_beta_39,subdir=xwords4/android/XWords4,buil Update Check Mode:Market Current Version:4.4 -<<<<<<< HEAD -Current Version Code:40 -======= Current Version Code:42 ->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e diff --git a/metadata/org.wahtod.wififixer.txt b/metadata/org.wahtod.wififixer.txt index ebff0e3157..9459a4d677 100644 --- a/metadata/org.wahtod.wififixer.txt +++ b/metadata/org.wahtod.wififixer.txt @@ -25,11 +25,6 @@ Build Version:0.9.0.2,922,b354e4538bf242f10125af49050e36126b668972,subdir=wififi Build Version:0.9.5,952,4d6dda4c9aa283c162fd1d4c3edaeb8c0d6d8a32,subdir=wififixer,target=android-15 Update Check Mode:Market -<<<<<<< HEAD -Current Version:0.9.5 -Current Version Code:952 -======= Current Version:0.9.5.1 Current Version Code:955 ->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e diff --git a/metadata/org.wordpress.android.txt b/metadata/org.wordpress.android.txt index 6a03c802fc..6844612c3f 100644 --- a/metadata/org.wordpress.android.txt +++ b/metadata/org.wordpress.android.txt @@ -27,11 +27,6 @@ Build Version:2.1.5,56,780,subdir=tags/2.1.5,encoding=utf-8,\ prebuild=rm ../1.4.0/bin/wp-android.apk && rm ../2.0.3/bin/wp-android.apk && rm ../1.4.1/bin/wp-android.apk && rm ../2.0/bin/wp-android.apk Update Check Mode:Market -<<<<<<< HEAD -Current Version:2.1.4 -Current Version Code:53 -======= Current Version:2.1.5 Current Version Code:56 ->>>>>>> f2e5ab06472590001c0dd4f46086a455ec64d95e From 56cc0e01a0c1453253755e2f357ac76e496fa05c Mon Sep 17 00:00:00 2001 From: David Black Date: Thu, 23 Aug 2012 12:00:16 +0100 Subject: [PATCH 13/14] firefox typos --- metadata/org.mozilla.firefox.txt | 2 +- metadata/org.mozilla.firefox_beta.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata/org.mozilla.firefox.txt b/metadata/org.mozilla.firefox.txt index c82c3e3d9b..4853e75666 100644 --- a/metadata/org.mozilla.firefox.txt +++ b/metadata/org.mozilla.firefox.txt @@ -2,7 +2,7 @@ Category:Internet #mostly... License:MPL2 #also links to ftp site -Website:https://wiki.mozilla.org/Mobile/Platforms/Android#System_Requirements +Web Site:https://wiki.mozilla.org/Mobile/Platforms/Android#System_Requirements Source Code:http://hg.mozilla.org/ Issue Tracker:https://bugzilla.mozilla.org/buglist.cgi?resolution=---&op_sys=Android diff --git a/metadata/org.mozilla.firefox_beta.txt b/metadata/org.mozilla.firefox_beta.txt index 23ac460a99..fb70a64b1b 100644 --- a/metadata/org.mozilla.firefox_beta.txt +++ b/metadata/org.mozilla.firefox_beta.txt @@ -2,7 +2,7 @@ Category:Internet #mostly... License:MPL2 #this links to ftp site too -Website:https://wiki.mozilla.org/Mobile/Platforms/Android#System_Requirements +Web Site:https://wiki.mozilla.org/Mobile/Platforms/Android#System_Requirements Source Code:http://hg.mozilla.org/ Issue Tracker:https://bugzilla.mozilla.org/buglist.cgi?resolution=---&op_sys=Android From 55ad5c13c22ddbba06deb7b12adf81db9f8d1e66 Mon Sep 17 00:00:00 2001 From: David Black Date: Thu, 23 Aug 2012 12:04:48 +0100 Subject: [PATCH 14/14] fix typo and build error in mupen --- metadata/paulscode.android.mupen64plusae.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/paulscode.android.mupen64plusae.txt b/metadata/paulscode.android.mupen64plusae.txt index 554341e5f6..25e733163c 100644 --- a/metadata/paulscode.android.mupen64plusae.txt +++ b/metadata/paulscode.android.mupen64plusae.txt @@ -12,7 +12,7 @@ N64 emulator now in beta. See website for link to compatibility wiki Repo Type:git Repo:https://github.com/paulscode/mupen64plus-ae.git -#haven't tried to build it, need ssh to machine :-( .see readme for howto +#libcore.so missing it looks like #Build Version=1.9.2,14,1408b6,buildjni=yes,subdir=main Update Check Mode:RepoManifest