Merge remote-tracking branch 'fdroid/master'

2024-10-06 11:00:13 +02:00 · 2011-05-18 15:33:50 -04:00 · 2011-05-18 15:33:50 -04:00 · a3226ca7b7
commit a3226ca7b7
parent eb6f6fb2ed eb6f2a0dc1
19 changed files with 52 additions and 29 deletions
--- a/metadata/com.andrewshu.android.reddit.txt
+++ b/metadata/com.andrewshu.android.reddit.txt
@ -14,6 +14,7 @@ Repo:https://github.com/talklittle/reddit-is-fun.git

 Build Version:1.1.2a,67,d507af7facaf46323804,prebuild=rsync -r lib/ libs
 Build Version:1.1.3,68,b302eaa24a975060f7fb,prebuild=rsync -r lib/ libs
+Build Version:1.1.4,69,9372d0ab3a16125e9045,prebuild=rsync -r lib/ libs

 Market Version:1.1.4
 Market Version Code:69
--- a/metadata/com.angrydoughnuts.android.alarmclock.txt
+++ b/metadata/com.angrydoughnuts.android.alarmclock.txt
@ -6,5 +6,5 @@ Summary:An alarm clock
 Description:
 An alarm clock.
 .
-Market Version:1.6
-Market Version Code:7
+Market Version:1.7
+Market Version Code:8
--- a/metadata/com.google.android.diskusage.txt
+++ b/metadata/com.google.android.diskusage.txt
@ -1,7 +1,7 @@
 Use Built:Yes
 License:GPLv2
 Web Site:http://diskusage.googlecode.com/
-Source Code:http://diskusage.googlecode.com/svn/trunk/
+Source Code:http://code.google.com/p/diskusage/source/checkout
 Issue Tracker:http://code.google.com/p/diskusage/issues/list
 Summary:Visual disk usage explorer
 Description:
@ -11,9 +11,9 @@ Repo Type:svn
 Repo:http://diskusage.googlecode.com/svn/trunk/

 Build Version:2.0.4,2004,61,prebuild=mkdir libs && cp extra/system.jar libs/
-
 #Note - version name/code is wrong in the repo - we replace it
 Build Version:2.0.5,2005,62,prebuild=mkdir libs && cp extra/system.jar libs/,insertversion=2.0.4,insertvercode=2004
+Build Version:2.1.3,2103,65,prebuild=mkdir libs && cp extra/system.jar libs/

 Market Version:2.1.3
 Market Version Code:2103
--- a/metadata/com.integralblue.callerid.txt
+++ b/metadata/com.integralblue.callerid.txt
@ -16,5 +16,5 @@ Repo:git://gitorious.org/callerid-for-android/mainline.git
 #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

-Market Version:1.0
-Market Version Code:1
+Market Version:1.1
+Market Version Code:2
--- a/metadata/com.mp3tunes.android.player.txt
+++ b/metadata/com.mp3tunes.android.player.txt
@ -12,5 +12,5 @@ Repo Type:hg
 Repo:https://mp3tunes.googlecode.com/hg/
 Build Version:3.7,89,ba4550305733,target=android-4,fixapos=yes
 AntiFeatures:NonFreeNet
-Market Version:4.0
-Market Version Code:90
+Market Version:5.0
+Market Version Code:91
--- a/metadata/de.shandschuh.sparserss.txt
+++ b/metadata/de.shandschuh.sparserss.txt
@ -16,6 +16,7 @@ Repo:http://sparserss.googlecode.com/svn/trunk/

 Build Version:0.8.4,47,105,target=android-8
 Build Version:0.8.5,50,109,target=android-8
+Build Version:0.8.7,53,!No corresponding source in repo,target=android-8

 Market Version:0.8.7
 Market Version Code:53
--- a/metadata/net.avs234.txt
+++ b/metadata/net.avs234.txt
@ -10,5 +10,6 @@ are also supported.
 .
 Repo Type:svn
 Repo:http://andless.googlecode.com/svn/trunk/
+
 Market Version:1.3.0
 Market Version Code:6
--- a/metadata/net.gaast.giggity.txt
+++ b/metadata/net.gaast.giggity.txt
@ -15,5 +15,5 @@ Repo:http://wilmer.gaa.st/giggity/
 Build Version:0.8.1,4,133
 #There is a 0.8.2 in the market, but the repo source doesn't seem to correspond

-Market Version:0.8.3
-Market Version Code:6
+Market Version:0.9.0
+Market Version Code:7
--- a/metadata/net.rocrail.androc.txt
+++ b/metadata/net.rocrail.androc.txt
@ -15,5 +15,5 @@ Build Version:1.1.221,221,221
 Build Version:1.2.224,224,!No source for this version in repo
 Build Version:1.2.228,228,228

-Market Version:1.2.228
-Market Version Code:228
+Market Version:1.3.230
+Market Version Code:230
--- a/metadata/net.sourceforge.servestream.txt
+++ b/metadata/net.sourceforge.servestream.txt
@ -14,6 +14,7 @@ Repo Type:svn
 Repo:https://servestream.svn.sourceforge.net/svnroot/servestream/trunk

 Build Version:0.1,35,374,prebuild=mv lib/ libs/
+Build Version:0.2.5,40,!source has wrong version code at r442,prebuild=mv lib/ libs/

-Market Version:0.2.4
-Market Version Code:39
+Market Version:0.2.6
+Market Version Code:41
--- a/metadata/org.coolreader.txt
+++ b/metadata/org.coolreader.txt
@ -27,7 +27,8 @@ Build Version:3.0.44-03,103,cr3.0.44-3,subdir=android,rm=android/build.propertie
 Build Version:3.0.44-09,109,cr3.0.44-9,subdir=android,rm=android/build.properties,buildjni=yes
 Build Version:3.0.45-04,114,!tag points to wrong version,subdir=android,rm=android/build.properties,buildjni=yes
 Build Version:3.0.45-09,119,!tag points to wrong version,subdir=android,rm=android/build.properties,buildjni=yes
+Build Version:3.0.45-11,121,6c42a9b65090da9640ccb6ee317bb32de24201fb,subdir=android,rm=android/build.properties,buildjni=yes

-Market Version:3.0.45-11
-Market Version Code:121
+Market Version:3.0.45-14
+Market Version Code:124

--- a/metadata/org.eehouse.android.xw4.txt
+++ b/metadata/org.eehouse.android.xw4.txt
@ -10,6 +10,7 @@ Repo Type:git
 Repo:git://xwords.git.sourceforge.net/gitroot/xwords/xwords
 Build Version:4.4 beta 18,11,android_beta_18,subdir=xwords4/android/XWords4
 Build Version:4.4 beta 23,16,!Translation files are not valid
+Build Version:4.4 beta 26,19,!Missing resources? android_beta_26,subdir=xwords4/android/XWords4

-Market Version:4.4 beta 26
-Market Version Code:19
+Market Version:4.4 beta 27
+Market Version Code:20
--- a/metadata/org.geometerplus.zlibrary.ui.android.txt
+++ b/metadata/org.geometerplus.zlibrary.ui.android.txt
@ -9,9 +9,6 @@ Description:
 An e-book reader.
 .

-Market Version:1.0.11
-Market Version Code:10013
-
 Repo Type:git
 Repo:https://github.com/geometer/FBReaderJ.git

@ -21,4 +18,10 @@ Build Version:0.99.12,9912,0.99.12,antcommand=package
 Build Version:0.99.15,9915,0.99.15,antcommand=package
 Build Version:0.99.18,9918,0.99.18,antcommand=package
 Build Version:1.0.9,10011,1.0.9,antcommand=package
+Build Version:1.0.11,10013,1.0.11,antcommand=package
+
+Market Version:1.0.12
+Market Version Code:10014
+
+

--- a/metadata/org.hermit.tricorder.txt
+++ b/metadata/org.hermit.tricorder.txt
@ -6,5 +6,5 @@ Summary:Fully functional Star Trek style Tricorder
 Description:
 Turns your Android device into a functional Tricorder in the style of Star Trek.
 .
-Market Version:5.11
-Market Version Code:40
+Market Version:5.12
+Market Version Code:41
--- a/metadata/org.torproject.android.txt
+++ b/metadata/org.torproject.android.txt
@ -7,5 +7,5 @@ Description:
 A Tor client allowing private internet access via a local SOCKS or HTTP proxy. On a rooted
 device, the proxying can be completely transparent.
 .
-Market Version:1.0.4.1
-Market Version Code:12
+Market Version:0.2.2.25-orbot-alpha-1.0.5.2
+Market Version Code:14
--- a/metadata/org.ttrssreader.txt
+++ b/metadata/org.ttrssreader.txt
@ -25,6 +25,7 @@ Build Version:0.8.9,892,9ba20fcfb6,subdir=ttrss-reader,target=android-8
 Build Version:0.9.1,911,0.9.1,subdir=ttrss-reader,target=android-8
 Build Version:0.9.3,931,93412751548f,subdir=ttrss-reader,target=android-8
 Build Version:0.9.7,973,0.9.7 (3),subdir=ttrss-reader,target=android-8
+Build Version:1.0,1000,1efaebb5678f,subdir=ttrss-reader,target=android-8

-Market Version:0.9.7
-Market Version Code:973
+Market Version:1.0
+Market Version Code:1002
--- a/metadata/org.zirco.txt
+++ b/metadata/org.zirco.txt
@ -20,6 +20,7 @@ Repo Type:svn
 Repo:http://zirco-browser.googlecode.com/svn/tags/*

 Build Version:0.3.6,10,315,subdir=0.3.6
+Build Version:0.3.7,11,329,subdir=0.3.7

 Market Version:0.3.7
 Market Version Code:11
--- a/metadata/vu.de.urpool.quickdroid.txt
+++ b/metadata/vu.de.urpool.quickdroid.txt
@ -1,3 +1,4 @@
+Use Built:Yes
 License:Apache2
 Web Site:http://code.google.com/p/quickdroid/
 Source Code:http://code.google.com/p/quickdroid/source/checkout
@ -9,10 +10,13 @@ albums and songs. There is also a plugin interface which enables you
 to extend it by other search categories. Similar to Quicksilver,
 Launchy and GNOME Do for other systems.
 .
+
 Repo Type:svn
 Repo:http://quickdroid.googlecode.com/svn/trunk
+
 Build Version:2.9.4,31,65,subdir=Quickdroid,target=android-7
 Build Version:3.0,37,75,subdir=Quickdroid,target=android-9
-Use Built:Yes
+Build Version:3.0.1,38,76,subdir=Quickdroid,target=android-9
+
 Market Version:3.0.1
 Market Version Code:38
--- a/update.py
+++ b/update.py
@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # update.py - part of the FDroid server tools
-# Copyright (C) 2010, Ciaran Gultnieks, ciaran@ciarang.com
+# Copyright (C) 2010-11, Ciaran Gultnieks, ciaran@ciarang.com
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@ -328,6 +328,14 @@ for app in apps:
            # doesn't have to do any work by default...
            apklist = sorted(apklist, key=lambda apk: apk['versioncode'], reverse=True)

+            # Check for duplicates - they will make the client unhappy...
+            for i in range(len(apklist) - 1):
+                if apklist[i]['versioncode'] == apklist[i+1]['versioncode']:
+                    print "ERROR - duplicate versions"
+                    print apklist[i]['apkname']
+                    print apklist[i+1]['apkname']
+                    sys.exit(1)
+
            for apk in apklist:
                apkel = doc.createElement("package")
                apel.appendChild(apkel)