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

metadata/com.android2.calculator3.txt

@@ -35,3 +35,5 @@ Update Check Mode:Market
 Current Version:v3.4.1
 Current Version Code:48
 
+No Source Since:3.4.1
+

metadata/com.fsck.k9.txt

@@ -1,3 +1,4 @@
+Disabled:Use org.fdroid.k9 instead
 Category:Internet
 License:Apache2
 Web Site:http://code.google.com/p/k9mail/
@@ -20,10 +21,6 @@ We leave this app as a developer build to minimize the disruption to users a
 signature switch would cause. Building the app from source is very
 straightforward though.  Stable releases are numbered x.even and they are
 maintained in their own git branches.
-
-Current development versions are based on the Android 4 email client. When that
-becomes stable we will probably only offer a source-built version with
-a different package name.
 .
 
 Repo Type:git

metadata/com.github.nutomic.controldlna.txt

@@ -0,0 +1,27 @@
+Category:Multimedia
+License:Apache2
+Web Site:
+Source Code:https://github.com/Nutomic/control-dlna
+Issue Tracker:https://github.com/Nutomic/control-dlna/issues
+
+Auto Name:ControlDLNA
+Summary:DLNA/UPnP control point
+Description:
+Works for browsing audio and playing it to renderers; possibly for video.
+Depending on interest future features would include local rendering etc.
+
+Status: Testing.
+.
+
+Repo Type:git
+Repo:https://github.com/Nutomic/control-dlna.git
+
+Build Version:0.1.0,1,0972b7973,srclibs=ActionBarSherlock@4.3.1,prebuild=\
+sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
+Auto Update Mode:None
+Update Check Mode:Static
+Current Version:0.1.0
+Current Version Code:1
+

metadata/com.opendoorstudios.ds4droid.txt

@@ -45,7 +45,7 @@ rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
 Build Version:30,30,release30,target=android-17,extlibs=acra/acra-4.2.3.jar,\
 buildjni=yes,patch=fix_stuff_2.patch,prebuild=\
 rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
-Build Version:34,34,release34,target=android-17,extlibs=acra/acra-4.2.3.jar,\
+Build Version:35,35,release35,target=android-17,extlibs=acra/acra-4.2.3.jar,\
 buildjni=yes,patch=fix_stuff_2.patch,prebuild=\
 rm -rf jni/desmume/src/android/7z/CPP/7zip/Archive/obj/local/*
 

metadata/com.owncloud.android.txt

@@ -30,7 +30,7 @@ Build Version:1.3.20,103020,oc-android-1-3-20,submodules=yes,update=.;actionbars
 Build Version:1.3.21,103021,oc-android-1-3-21,submodules=yes,update=.;actionbarsherlock/library
 Build Version:1.3.22,103022,oc-android-1-3-22,submodules=yes,update=.;actionbarsherlock/library
 Build Version:1.4.0,104000,oc-android-1-4-0,submodules=yes,update=.;actionbarsherlock/library
-Build Version:1.4.1,104001,oc-android-1-4-1,submodules=yes,update=.;actionbarsherlock/library
+Build Version:1.4.1,104001,oc-android-1.4.1,submodules=yes,update=.;actionbarsherlock/library
 
 Auto Update Mode:None
 Update Check Mode:Tags

metadata/com.paranoid.ParanoidWallpapers.txt

@@ -10,6 +10,7 @@ Summary:Wallpapers from a custom ROM
 Description:
 Pick from 9 wallpapers that come with the Paranoid Android ROM 
 or choose one of seven solid-(ish) colours.
+The wallpapers are designed more for high resolution screens.
 There is no launcher icon: instead they are made available via the 
 system wallpaper picker.
 .

metadata/net.osmand.plus.txt

@@ -55,7 +55,7 @@ cp -r ../DataExtractionOSM/build/lib/ libs/
 # Could try making https://github.com/osmandapp/OsmAnd-external-qtbase a srclib too
 # Don't really understand what the other build.xmls do: they don't appear to put jars in classpath
 # Jars haven't been verified
-Build Version:1.4-MIPS,1450,r1.4,forcevercode=yes,\
+Build Version:1.4-MIPS,1450,!r1.4,forcevercode=yes,\
 rm=SherlockBar/build.xml,subdir=OsmAnd,encoding=utf-8,\
 srclibs=tools@9b4c9da995;core@r1.1.4,prebuild=\
 sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
@@ -67,7 +67,7 @@ res/values/no_translate.xml && sed -i '/keys/d' ant.properties,build=\
 ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_MIPS_ONLY=true ./ndk-build.sh && \
 ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \
 ant build -f ../OsmAnd-java/build.xml,buildjni=no
-Build Version:1.4-x86,1451,r1.4,forcevercode=yes,\
+Build Version:1.4-x86,1451,!r1.4,forcevercode=yes,\
 rm=SherlockBar/build.xml,subdir=OsmAnd,encoding=utf-8,\
 srclibs=tools@9b4c9da995;core@r1.1.4,prebuild=\
 sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
@@ -79,7 +79,7 @@ res/values/no_translate.xml && sed -i '/keys/d' ant.properties,build=\
 ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_X86_ONLY=true ./ndk-build.sh && \
 ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \
 ant build -f ../OsmAnd-java/build.xml,buildjni=no
-Build Version:1.4-ARM,1452,r1.4,forcevercode=yes,\
+Build Version:1.4-ARM,1452,!r1.4,forcevercode=yes,\
 rm=SherlockBar/build.xml,subdir=OsmAnd,encoding=utf-8,\
 srclibs=tools@9b4c9da995;core@r1.1.4,prebuild=\
 sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \

metadata/net.rocrail.androc.txt

@@ -63,9 +63,8 @@ Build Version:399,399,399,target=android-14
 Build Version:401,401,402,target=android-14
 Build Version:407,407,407,target=android-14
 Build Version:409,409,409,target=android-14
-Build Version:411,411,411,target=android-14
 
-Auto Update Mode:Version %c
+Auto Update Mode:None
 Update Check Mode:Market
 Current Version:411
 Current Version Code:411

metadata/org.fdroid.k9.txt

@@ -5,25 +5,23 @@ Source Code:https://github.com/k9mail/k-9
 Issue Tracker:http://code.google.com/p/k9mail/issues/list
 
 Auto Name:K-9 Mail
-Summary:Beta version of K-9
+Summary:Email client
 Description:
-4.3xx and 4.5xx are betas for 4.400 and 4.600 respectively. 
+'''N.B''' This package has a different name to the developer builds of K-9 — 
-There isn't a huge difference between the two, so better to stick with 4.5xx 
+therefore, they can be installed alongside this.
-if you already have it installed even though the stable release 
-will be further away.
 
 E-mail client supporting multiple accounts, POP3, IMAP and Push IMAP.
 Packed with features and highly configurable.
-Import of settings from [[com.fsck.k9]] is possible so that all
+Can do encryption if [[org.thialfihar.android.apg]] is installed ; stay tuned: 
-that's required to setup the app is to enter the account passwords,
+more GPG clients are coming soon.
-but a file manager will need to be already installed.
-These versions are based on the Android 4 email client ;
-when it becomes stable we will probably only publish this package.
-Both K-9 and this can co-exist easily.
 
-If you would like to contribute financially to k9mail, please consider
+Settings and account configurations can be exported so that they can be imported
+easily if you are switching packages/signatures: a file manager will need to be 
+already installed to achieve this.
+
+If you would like to contribute financially to k9mail, consider
 donating to the local SPCA
-(Societies for the prevention of cruelty to animals).
+(societies for the prevention of cruelty to animals).
 
 [https://github.com/k9mail/k-9/raw/master/res/raw/changelog.xml Changelog]
 .
@@ -31,7 +29,7 @@ donating to the local SPCA
 Repo Type:git
 Repo:https://github.com/k9mail/k-9.git
 
-Build Version:4.330-fdroid,17031,4.330,\
+Build Version:4.330-fdroid,17031,!4.330,\
 forceversion=yes,srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
 update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\
 plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,init=\
@@ -49,7 +47,7 @@ rm -rf ../../libs/jzlib* ../../libs/htmlcleaner*.zip jzlib*,build=\
 $$MVN3$$ package -f HtmlCleaner/pom.xml && \
 mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
 rm -rf HtmlCleaner
-Build Version:4.331-fdroid,17032,4.331,\
+Build Version:4.331-fdroid,17032,!4.331,\
 forceversion=yes,srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
 update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\
 plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,init=\
@@ -67,7 +65,7 @@ rm -rf ../../libs/jzlib* ../../libs/htmlcleaner*.zip jzlib*,build=\
 $$MVN3$$ package -f HtmlCleaner/pom.xml && \
 mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
 rm -rf HtmlCleaner
-Build Version:4.393-fdroid,17036,4.393,\
+Build Version:4.393-fdroid,17036,!4.393,\
 forceversion=yes,srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
 update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\
 plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,init=\
@@ -86,6 +84,25 @@ $$MVN3$$ package -f HtmlCleaner/pom.xml && \
 mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
 rm -rf HtmlCleaner
 
+Build Version:4.400,17037,4.400,\
+srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
+update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\
+plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,init=\
+sed -i 's@\(target=\).*@\1android-17@' plugins/Android-PullToRefresh/\
+library/project.properties,prebuild=\
+sed -i 's/com\/fsck\/k9beta/org\/fdroid\/k9/g;\
+s/com.fsck.k9beta/org.fdroid.k9/g;11\,17d' tools/build-beta && \
+mkdir -p src/org/fdroid && chmod +x tools/build-beta && \
+./tools/build-beta && \
+rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
+unzip libs/htmlcleaner-2.2-all.zip && cd src/com/ && \
+cp -r ../../$$Jutf7$$/src/main/java/com/beetstra .  && \
+tar xzf ../../libs/jzlib-1.0.7.tar.gz && mv jzlib-1.0.7/com/* . && \
+rm -rf ../../libs/jzlib* ../../libs/htmlcleaner*.zip jzlib*,build=\
+$$MVN3$$ package -f HtmlCleaner/pom.xml && \
+mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
+rm -rf HtmlCleaner
+
 Build Version:4.502-fdroid,18002,4.502,\
 forceversion=yes,srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
 update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\
@@ -105,10 +122,11 @@ $$MVN3$$ package -f HtmlCleaner/pom.xml && \
 mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
 rm -rf HtmlCleaner
 
+# Should think about providing maintenance updates for 4.400 
 # K9 have their own fork of jzlib and jutf7 that won't change very often
 Auto Update Mode:None
 # Tags would work but the package ID is different
 Update Check Mode:None
-Current Version:4.393
+Current Version:4.400
-Current Version Code:17036
+Current Version Code:17037
 

metadata/org.jamienicol.episodes.txt

@@ -16,6 +16,7 @@ Repo Type:git
 Repo:https://github.com/jamienicol/episodes
 
 Build Version:0.2,2,v0.2
+Build Version:0.3,3,v0.3
 
 Auto Update Mode:None
 Update Check Mode:Tags

metadata/org.macno.puma.txt

@@ -13,10 +13,10 @@ A simple Pump.io client still in active development.
 Repo Type:git
 Repo:git://gitorious.org/puma-droid/puma.git
 
-Build Version:0.5,5,01990078969dc3
+Build Version:0.6,6,0.6
 
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:0.5
+Current Version:0.6
-Current Version Code:5
+Current Version Code:6
 

metadata/org.mariotaku.twidere.txt

@@ -1,7 +1,7 @@
 Category:Internet
 License:GPLv3
-Web Site:https://github.com/mariotaku/twidere/
+Web Site:https://github.com/mariotaku/twidere
-Source Code:https://github.com/mariotaku/twidere/
+Source Code:https://github.com/mariotaku/twidere
 Issue Tracker:https://github.com/mariotaku/twidere/issues
 Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=mariotaku.lee%40gmail%2ecom&item_name=Donate%20to%20Twidere
 
@@ -62,6 +62,8 @@ Build Version:0.2.6.5,59,!still fails (at 9a12aa76f31c0d96a),prebuild=rm -rf dis
 Build Version:0.2.7.5,65,!still fails (at d00b32c2c1f0c335),prebuild=rm -rf dist/ art/,patch=constants1.patch
 Build Version:0.2.7.6,66,!still fails (at 893601f9dc6adbf5),prebuild=rm -rf dist/ art/,patch=constants1.patch
 Build Version:0.2.8.3,72,!still fails (at eefd4bf2d79f21f0),prebuild=rm -rf dist/ art/,patch=constants1.patch
+# From here on, the api keys are already hard-coded in the source code
+Build Version:0.2.8.6,76,!still fails (at 8b7f5477018d6cc56a),prebuild=rm -rf dist/ art/
 
 Auto Update Mode:None
 # Tags are outdated again

metadata/org.mozilla.firefox.txt

@@ -31,6 +31,6 @@ license is Custom or other non-free.
 Auto Update Mode:None
 #Device-variable in Market
 Update Check Mode:None
-Current Version:21.0
+Current Version:22.0
-Current Version Code:2013050822
+Current Version Code:2013061803
 

metadata/org.videolan.vlc.txt

@@ -42,7 +42,7 @@ Build Version:0.0.11-mips,113,0.0.11,forceversion=yes,forcevercode=yes,subdir=vl
 update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock,\
 prebuild=sed -i '48d' ../Makefile,build=cd ../ && \
 ANDROID_ABI=mips ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./compile.sh release,buildjni=no
-Build Version:0.1.2-x86,1202,0.1.2,\
+Build Version:0.1.2-x86,1202,!BS problems: permissions of a script at 0.1.2,\
 forceversion=yes,forcevercode=yes,subdir=vlc-android,srclibs=VLC@41edeb738,\
 update=.;../java-libs/SlidingMenu;../java-libs/ActionBarSherlock;\
 ../java-libs/WheelView,prebuild=sed -i '/ant/d' ../Makefile && \

srclibs/Support.txt

@@ -0,0 +1,2 @@
+Repo Type:git
+Repo:https://android.googlesource.com/platform/frameworks/support