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

metadata/android.tether.txt

@@ -1,3 +1,4 @@
+Disabled:Prebuilts
 Category:System
 License:GPLv3
 Web Site:https://code.google.com/p/android-wifi-tether/
@@ -32,8 +33,5 @@ Repo:http://android-wifi-tether.googlecode.com/svn/trunk/
 Build Version:2.0.7,26,523,buildjni=yes
 
 Auto Update Mode:None
-#Update Check Mode:Market
+Update Check Mode:Static
-Update Check Mode:None
-Current Version:2.0.7
-Current Version Code:26
 

metadata/com.f2prateek.dfg.txt

@@ -5,6 +5,7 @@ Source Code:https://github.com/f2prateek/Device-Frame-Generator
 Issue Tracker:https://github.com/f2prateek/Device-Frame-Generator/issues
 Donate:http://forum.xda-developers.com/donatetome.php?u=4203118
 
+Auto Name:Device Frame Generator
 Summary:Realistic borders for screenshots
 Description:
 The device frame generator allows you to quickly wrap your app screenshots in
@@ -26,10 +27,11 @@ sed -i 's/integration-tests/app/g' pom.xml && \
 sed -i 's/<version>1.0-SNAPSHOT/<version>1.0.1/g' app/pom.xml && \
 sed -i 's/<version>1.0-SNAPSHOT/<version>1.0.1/g' pom.xml && \
 git clone https://github.com/square/dagger
+Build Version:1.0.4,104,!gradle job,subdir=app/src/main
 
 Auto Update Mode:None
-# Bumps when starting on new release
+# tags behind; Bumps when starting on new release
-Update Check Mode:None
+Update Check Mode:RepoManifest
-Current Version:1.0.1
+Current Version:1.0.4
-Current Version Code:101
+Current Version Code:104
 

metadata/com.github.mobile.txt

@@ -33,6 +33,6 @@ Auto Update Mode:Version %v
 #Manifest isn't in root dir
 #Update Check Mode:Market
 Update Check Mode:None
-Current Version:1.6.1
+Current Version:1.7
-Current Version Code:1300
+Current Version Code:1400
 

metadata/com.google.code.geobeagle.txt

@@ -23,7 +23,7 @@ cp -r factory/roboguice/util/ src/com/google/code/geobeagle/ && \
 sed -i 's/<uses-library android:name="com.google.android.maps" \/>/<uses-library android:name="com.google.android.maps" android:required="false" \/>/g' AndroidManifest.xml
 
 Auto Update Mode:None
-#Update Check Mode:Market
+# not on market
 Update Check Mode:None
 Current Version:1.4.15
 Current Version Code:206

metadata/com.googlecode.android.wifi.tether.txt

@@ -1,3 +1,4 @@
+Disabled:Prebuilts
 Category:System
 License:GPLv3
 Web Site:https://code.google.com/p/android-wifi-tether/
@@ -33,8 +34,5 @@ Repo:http://android-wifi-tether.googlecode.com/svn/trunk/
 Build Version:3.2-beta2,38,548,buildjni=yes,forceversion=yes
 
 Auto Update Mode:None
-#Update Check Mode:Market
+Update Check Mode:Static
-Update Check Mode:None
-Current Version:3.3-beta2-06102013
-Current Version Code:43
 

metadata/com.googlecode.awsms.txt

@@ -21,6 +21,6 @@ echo "source.dir=src;../core/src" >> project.properties
 Auto Update Mode:None
 #Update Check Mode:Market
 Update Check Mode:None
-Current Version:2.0.4
+Current Version:2.0.5
-Current Version Code:24
+Current Version Code:25
 

metadata/com.gs.mobileprint.txt

@@ -1,23 +1,26 @@
 Category:System
 License:GPLv3
 Web Site:http://sourceforge.net/projects/mobileprint/
-Source Code:https://mobileprint.svn.sourceforge.net/svnroot/mobileprint/
+# Empty
+#Source Code:http://sourceforge.net/p/mobileprint/mobileprint
 Issue Tracker:http://sourceforge.net/p/mobileprint/tickets/
 
 Auto Name:MobilePrint
 Summary:Mobile Printing through a server
 Description:
-Mobile printing app. Currently requires Windows XP or newer on a PC connected to a computer, though
+Currently requires Windows XP or newer on a PC connected to a computer, though
 the author wishes to develop servers for the other platforms.
+
+Status: Beta
 .
 
-Repo Type:svn
+Repo Type:git-svn
-Repo:https://mobileprint.svn.sourceforge.net/svnroot/mobileprint
+Repo:svn://svn.code.sf.net/p/mobileprint/code/trunk
 
 Build Version:0.5,1,1
 
 Auto Update Mode:None
-#not in market
+# Source AWOL
 Update Check Mode:None
 Current Version:0.5
 Current Version Code:1

metadata/com.jecelyin.editor.txt

@@ -11,6 +11,9 @@ Auto Name:920 Text Editor
 Summary:Text editor
 Description:
 View and edit code (even as root). Multi-tab, syntax-highlighting and more.
+
+Status: The app is now using resources from AOSP so it's unlikely we'll
+be able to update it.
 .
 
 Repo Type:git
@@ -23,7 +26,7 @@ Build Version:12.8.29,34,!No source code published,buildjni=yes
 Build Version:12.9.25,35,!No source code published,buildjni=yes
 Build Version:12.11.23,39,6ecd84ce9c,forceversion=yes,forcevercode=yes,prebuild=\
 sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml,buildjni=yes
-Build Version:13.07.18,46,1a5f84489c5fd6,prebuild=rm -r apk/ bin/ && \
+Build Version:13.07.18,46,!uses AOSP libraries at 1a5f84489c5fd6,prebuild=rm -rf apk/ bin/ && \
 sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml,buildjni=yes
 
 Auto Update Mode:None

metadata/com.matburt.mobileorg.txt

@@ -5,7 +5,7 @@ Source Code:https://github.com/matburt/mobileorg-android
 Issue Tracker:https://github.com/matburt/mobileorg-android/issues
 
 Auto Name:MobileOrg
-Summary:TODO/task management application
+Summary:TODO list/task management
 Description:
 ''Syncing of files via Dropbox won't work because there aren't any API keys in the source code. The other
 syncing methods should work though.''
@@ -19,9 +19,15 @@ Repo:https://github.com/matburt/mobileorg-android.git
 Build Version:0.9.0,90,0.9.0,prebuild=sed -i 's@android@$$SDK$$/tools/android@g' setup.sh && ./setup.sh
 Build Version:0.9.8,98,0.9.8,prebuild=sed -i 's@^android@$$SDK$$/tools/android@g' setup.sh && ./setup.sh
 
-Auto Update Mode:None
+Build Version:0.9.13,913,0.9.13,\
-#Update Check Mode:Market
+srclibs=ActionBarSherlock@9598f2bb2ce,\
-Update Check Mode:None
+update=.;libs/locale,\
-Current Version:0.9.8
+prebuild=sed -i 's@\(reference.2=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-Current Version Code:98
+         sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml
+
+# uses submodules
+Auto Update Mode:None
+Update Check Mode:Tags
+Current Version:0.9.13
+Current Version Code:913
 

metadata/com.menny.android.anysoftkeyboard.txt

@@ -57,9 +57,19 @@ sed -i 's@..\/AnySoftKeyboardTools@$$AnySoftKeyboardTools$$@g' build.xml && \
 rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore \
 StoreStuff/ res/raw/words_1.dict,buildjni=yes
 
+Build Version:20130709,106,f1ba2de,\
+srclibs=AnySoftKeyboard-API@30851236d7;AnySoftKeyboardTools@73e9a09496,\
+prebuild=sed -i 's@\(.1=\).*@\1$$AnySoftKeyboard-API$$@' project.properties && \
+         sed -i 's@..\/AnySoftKeyboardTools@$$AnySoftKeyboardTools$$@g' build.xml && \
+         rm -rf libs/armeabi*/ libs/x86/ libs/mips/ ant/ keyboard_keystore \
+         StoreStuff/ res/raw/words_1.dict,\
+buildjni=yes
+Build Version:20130807,107,!not published
+
+# Tags are at menny/AnySoftKeyboard
 Auto Update Mode:None
 #Update Check Mode:Market
-Update Check Mode:None
+Update Check Mode:RepoManifest
-Current Version:20130709
+Current Version:20130807
-Current Version Code:106
+Current Version Code:107
 

metadata/com.midisheetmusic.txt

@@ -31,3 +31,5 @@ Update Check Mode:None
 Current Version:2.5.1
 Current Version Code:8
 
+No Source Since:2.6
+

metadata/com.newsblur.txt

@@ -35,11 +35,16 @@ srclibs=Google-Gson@gson-2.2.4,update=.;libs/ActionBarSherlock,prebuild=\
 cp -r $$Google-Gson$$/src/main/java/com/google src/com/ && \
 rm libs/gson*.jar && cd ../../ && ls |grep -v android |xargs rm -rf && cd ../ && \
 ls |grep -v clients |xargs rm -rf 
-Build Version:2.1.2,41,!No corresponding source in repo
+
+Build Version:2.5.0,43,b3eb49128b32,subdir=clients/android/NewsBlur,\
+init=rm -rf libs/ActionBarSherlock/bin/ libs/ActionBarSherlock/gen/,\
+update=.;libs/ActionBarSherlock,\
+prebuild=cd ../../ && ls |grep -v android |xargs rm -rf && \
+         cd ../ && ls |grep -v clients |xargs rm -rf 
 
 Auto Update Mode:None
 #Update Check Mode:Market
 Update Check Mode:None
-Current Version:2.1.2
+Current Version:2.5.0
-Current Version Code:41
+Current Version Code:43
 

metadata/eu.e43.impeller.txt

@@ -40,7 +40,17 @@ Build Version:0.5.2,5002,v0.5.2,init=rm jiraconnect-android-main/build.xml,updat
 Build Version:0.5.3,5003,v0.5.3,init=rm jiraconnect-android-main/build.xml,update=.;jiraconnect-android-main
 Build Version:0.5.5,5005,v0.5.5,init=rm jiraconnect-android-main/build.xml,update=.;jiraconnect-android-main
 Build Version:0.6.0,6000,v0.6.0,init=rm jiraconnect-android-main/build.xml,update=.;jiraconnect-android-main
-Build Version:0.6.1,6001,!needs gradle (at v0.6.1),init=rm jiraconnect-android-main/build.xml,update=.;jiraconnect-android-main
+
+Build Version:0.6.1,6001,v0.6.1,\
+init=rm jiraconnect-android-main/build.xml,\
+srclibs=disklrucache@disklrucache-2.0.1,\
+update=.;jiraconnect-android-main,\
+target=android-18,\
+extlibs=android/android-support-v4.jar;oauth-signpost/signpost-core-1.2.1.2.jar,\
+prebuild=printf 'source.dir=src;$$disklrucache$$/java' > ant.properties && \
+         printf 'android.library.reference.1=jiraconnect-android-main' >> project.properties && \
+         mkdir -p jiraconnect-android-main/libs && cd jiraconnect-android-main/libs/ && \
+         wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/acra-4.5.0.jar && wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/apache-mime4j-0.5.jar && wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/commons-io-2.4.jar && wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/guava-r08.jar && wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpclient-4.0.jar && wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpcore-4.0-beta3.jar && wget https://github.com/oshepherd/Impeller/raw/v0.6.0/jiraconnect-android-main/libs/httpmime-4.0-beta2.jar 
 
 Auto Update Mode:Version v%v
 Update Check Mode:Tags

metadata/net.osmand.plus.txt

@@ -110,6 +110,11 @@ build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_ARM_ONLY=true ./ndk-build.s
       ant build -f ../OsmAnd-java/build.xml,\
 buildjni=no
 
+# do another 1.5 update when the branch settles down
+# replace GPS Status with YGPS and elaborate description. see 
+#    https://f-droid.org/forums/topic/update-osmand-and-osmand/page/3/#post-8253 
+# add parking patch (already committed.
+
 # Could build gnu-trove via srclib
 # Don't really understand what the other build.xmls do: they don't appear to put jars in classpath
 # Qt in new_core branch

metadata/net.osmand.plus/osmand_enable_parking_148.diff

@@ -0,0 +1,13 @@
+diff --git a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java
+index d0f6080..00b7d87 100644
+--- a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java
++++ b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java
+@@ -75,7 +75,7 @@ public abstract class OsmandPlugin {
+ 			installPlugin(SRTM_PLUGIN_COMPONENT, SRTMPlugin.ID, app,
+ 					new SRTMPlugin(app, false));
+ 		}
+-		installPlugin(PARKING_PLUGIN_COMPONENT, ParkingPositionPlugin.ID, app, new ParkingPositionPlugin(app));
++		installedPlugins.add(new ParkingPositionPlugin(app));
+ 		installPlugin(OSMODROID_PLUGIN_COMPONENT, OsMoDroidPlugin.ID, app, new OsMoDroidPlugin(app));
+ 		installedPlugins.add(new DistanceCalculatorPlugin(app));
+ 		installedPlugins.add(new AudioVideoNotesPlugin(app));

metadata/org.jfedor.frozenbubble.txt

@@ -1,4 +1,3 @@
-AntiFeatures:Ads
 Category:Games
 License:GPLv2
 Web Site:http://code.google.com/p/frozenbubbleandroid/
@@ -10,9 +9,6 @@ Summary:Bubble shooting game
 Description:
 A bubble shooting game. Knock the bubbles down by forming clusters of three
 or more bubbles.
-
-Anti-features: Ads — you may be shown an ad for some other non-free software 
-of the developers' making.
 .
 
 Repo Type:git-svn
@@ -30,7 +26,13 @@ Build Version:1.16,17,40,buildjni=yes
 Build Version:1.17,18,49,buildjni=yes
 Build Version:1.18,19,50,buildjni=yes
 Build Version:1.19,20,52,buildjni=yes
-Build Version:1.20,21,!not on gplay
+
+Build Version:1.20,21,58,\
+prebuild=sed -i '156s/true/false/g;448s/true/false/g' \
+           src/org/jfedor/frozenbubble/FrozenBubble.java && \
+         sed -i '68s/true/false/g;118s/true/false/g' \
+           src/com/efortin/frozenbubble/PreferencesActivity.java,\
+buildjni=yes
 
 Auto Update Mode:None
 # also on gplay

metadata/org.mult.daap.txt

@@ -20,6 +20,8 @@ Build Version:.9.6.2,38,!No corresponding source in repo
 Build Version:.9.6.5,39,89
 Build Version:.9.7,40,90
 Build Version:.9.7+,45,107,forceversion=yes,target=android-8
+# forgot to bump version ... again
+Build Version:.9.7++,46,108,forceversion=yes,forcevercode=yes,target=android-8
 
 Auto Update Mode:None
 #Update Check Mode:Market

srclibs/disklrucache.txt

@@ -0,0 +1,3 @@
+Repo Type:git
+Repo:https://github.com/JakeWharton/DiskLruCache
+Subdir:src/main