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

metadata/com.mareksebera.simpledilbert.txt

@@ -24,15 +24,10 @@ prebuild=cp -f libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
 sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
 sed -i 's@\(reference.2=\).*@\1$$ImageLoader$$@' project.properties && \
 sed -i 's@\(reference.3=\).*@\1$$PhotoView$$@' project.properties
-Build Version:3.0,23,!build problems at v3.0,extlib=android/android-support-v4.jar,\
+Build Version:3.1,24,!we need read-only submodules v3.1,extlib=android/android-support-v4.jar,submodules=yes
-srclibs=ActionBarSherlock@4.3.1;ImageLoader@v1.8.5;PhotoView@05b1c2aae5985,\
-prebuild=cp -f libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
-sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
-sed -i 's@\(reference.2=\).*@\1$$ImageLoader$$@' project.properties && \
-sed -i 's@\(reference.3=\).*@\1$$PhotoView$$@' project.properties
 
 Auto Update Mode:None
-Update Check Mode:RepoManifest
+Update Check Mode:Tags
 Current Version:3.1
 Current Version Code:24
 

metadata/de.cketti.dashclock.k9.txt

@@ -22,6 +22,7 @@ Repo:https://github.com/cketti/DashClock_K-9.git
 
 Build Version:1.0,1,release-v1.0
 Build Version:1.1,2,release-v1.1
+Build Version:1.2,3,release-v1.2
 
 Auto Update Mode:None
 Update Check Mode:Tags

metadata/de.luhmer.owncloudnewsreader.txt

@@ -29,7 +29,7 @@ prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@'
 sed -i 's@\(android.library.reference.2=\).*@\1$$PullToRefresh$$@' project.properties && \
 cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
 Build Version:0.3.9,22,cc37f084b364e73508,\
-srclibs=ActionBarSherlock@4.3.1;PullToRefresh@d18bb778edad9,rm=OwncloudNewsReader.apk,\
+srclibs=ActionBarSherlock@4.3.1;PullToRefresh@319024754481f23e,rm=OwncloudNewsReader.apk,\
 prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
 sed -i 's@\(android.library.reference.2=\).*@\1$$PullToRefresh$$@' project.properties && \
 cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/

metadata/dk.jens.backup.txt

@@ -19,6 +19,9 @@ Renaming the folder from "oabackups" to "oandbackups" upon updating will solve p
 (As this app is still in an early phase, please don't rely on it solely unless you know what you are doing.)
 
 Requires root: Yes. Copies files from /data/data, /data/app and /system/app.
+If you don't have root you can use '''adb''' from the 
+[http://developer.android.com/sdk Android SDK] platform tools to make 
+backups via a desktop computer.
 .
 
 Requires Root:Yes

metadata/info.guardianproject.cacert.txt

@@ -8,16 +8,22 @@ Donate:https://guardianproject.info/contact
 Auto Name:CACertMan
 Summary:Disable untrusted certificates
 Description:
-An app to manage security certificates on your phone also containing a version of the Android CACert keystore
+Android 4+ allows you to disable certificates
-vetted by the Guardian Project. If a certificate has become untrusted you will need to install an update
+from the system Settings and root isn't required, so try that first if you want 
-to remain safe. However, the latest version of the vetted keystore can be grabbed from the source code page.
+to manually mess with the certificates. 
-In addition, you can backup and remove certificates by yourself. Android 4+ allows you to disable certificates
+The app won't work with Android 4+ anyway.
-from the main settings and root isn't required, so try that first if you want to manually mess with
-the certificates.
 
-This application requires root, as well as a device that has the ‘grep’ command on it. (check busybox)
+An app to manage security certificates on your phone also containing a version 
-If the ‘save’ doesn’t work, then you will need to make your /system partition read-write by using
+of the Android CACert keystore derived from Mozilla. 
-a file explorer like Ghost Commander or running something like #mount -o remount,rw /system in the terminal
+If a certificate has recently become untrusted you can either install an update
+to this app or you can backup and remove certificates by yourself. 
+
+Requires root: Yes, it writes to the system partition. 
+You will need a device that has the ‘grep’ command on it (via busybox: 
+present on most custom ROMs). 
+If the ‘save’ doesn’t work, then you will need to make your /system partition 
+read-write by using a file explorer like [[com.ghostsq.commander]] or via 
+a command in [[jackpal.androidterm]].
 .
 
 Requires Root:Yes
@@ -27,6 +33,11 @@ Repo:https://github.com/guardianproject/cacert.git
 
 Build Version:0.0.2-20110906,3,0.0.2,target=android-8,subdir=app
 Build Version:0.0.2.20111012,4,212187e9c398e46fda87fe2335ee48bb693caca0,target=android-8,subdir=app
+Build Version:0.1,5,6d819d26d,subdir=app,\
+submodules=yes,\
+target=android-10,\
+build=cd .. && gpg --import ca-certificates-maintainer-Michael-Shuler.pub.asc && \
+      make && mv stores/debiancacerts.bks app/res/raw/cacerts.bks
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest

metadata/net.osmand.plus.txt

@@ -9,10 +9,6 @@ Name:OsmAnd~
 Auto Name:OsmAnd~
 Summary:Maps & navigation; online and off
 Description:
-Osmand~ is the generic name for builds of Osmand not done by the developers.
-Each apk is labelled according to the CPU architecture which it is designed
-to run on. 
-
 Osmand~'s features can be extended by enabling the plugins 
 via the settings, which include online
 maps from many sources, tracking, OSM editing and accessibility enhancements.
@@ -21,11 +17,16 @@ and raster types can be stored on the phone memory card for offline usage, and
 navigation by default uses offline methods. 
 Map data packages for many territories can be downloaded from
 within the app and there is a desktop program available on the website as well
-for creating your own. Donations by way of PayPal or BidforFix are accepted.
+for creating your own.
+
+Osmand~ is the generic name for builds of Osmand not done by the developers.
 
 Status: We have technical difficulties building the latest versions.
 .
 
+#Each apk is labelled according to the CPU architecture which it is designed
+#to run on. 
+
 Repo Type:srclib
 Repo:android
 
@@ -54,11 +55,12 @@ sed -i 's/app_version">[^<]*/app_version">0.8.2-fdroid/' res/values/no_translate
 cp ../DataExtractionOSM/build/OsmAndMapCreator.jar libs/ && \
 zip -d libs/OsmAndMapCreator.jar net/osmand/LogUtil.class && \
 cp -r ../DataExtractionOSM/build/lib/ libs/
+
 # Name srclibs in such a way as to replicate OsmAnd build tree
 # 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,141,!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 && \
@@ -70,7 +72,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,142,!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 && \
@@ -83,7 +85,7 @@ 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,!permission denied in build/srclib/core/android-configure.sh at r1.4,forcevercode=yes,\
+Build Version:1.4-ARM,143,!permission denied in build/srclib/core/android-configure.sh at 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 && \
@@ -96,12 +98,13 @@ ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_ARM_ONLY=true ./ndk-build.sh && \
 ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \
 ant build -f ../OsmAnd-java/build.xml,buildjni=no
 
-# GA maybe in next version
+# In next version: GA maybe, Qt, will need to source "resources" srclib 
-# will need to source "resources" srclib for next version
+# and no android-configure.sh script in v1.5/core
 # see https://github.com/osmandapp/OsmAnd-manifest/blob/master/current_release.xml 
-# use custom VC scheme: multiply VC by 10; it never matches published apk anyway
 Auto Update Mode:None
-Update Check Mode:Market
+Update Check Mode:None
-Current Version:1.4.1
+# New version in new branch
-Current Version Code:143
+Current Version:1.5
+# Version code system is unfathomable
+Current Version Code:145
 

metadata/org.beide.droidgain.txt

@@ -6,16 +6,22 @@ Issue Tracker:https://github.com/beide/Droidgain/issues
 Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=kees%40huibertsbloembollen%2enl&lc=NL&item_name=Sophie%27s%20software&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted
 
 Auto Name:Droidgain
+Name:Droidgain
 Summary:Normalizer for audio files
 Description:
-Normalizes mp3 files: it makes them all sound equally loud.
+Normalizes mp3 files; it makes them all sound equally loud, so if you have 
+a song that's too quiet this app can make it be louder.
+Currently, it picks files via another app, so you will need to have a 
+music player, such as [[com.android.music]] installed, or perhaps some 
+other suitable file picker.
 .
 
+
 Repo Type:git
 Repo:git://github.com/beide/Droidgain.git
 
 Build Version:1.0,1,3cf8be7ebc,\
-build=sed -i '6 i \<uses-sdk android:targetSdkVersion="15"\n\
+build=sed -i '6 i \<uses-sdk android:targetSdkVersion="10"\n\
 android:minSdkVersion="8" \/\>' AndroidManifest.xml && \
       mkdir -p ndk/toolchains && \
       find $$NDK$$ -maxdepth 1 -mindepth 1 -not -name toolchains -print0 |\

metadata/org.fdroid.dashclock.k9.txt

@@ -23,6 +23,11 @@ Repo:https://github.com/cketti/DashClock_K-9.git
 Build Version:1.1-fdroid,2,release-v1.1,forceversion=yes,patch=packageid.patch,\
 prebuild=find . -type f -print0 | xargs -0 sed -i 's/com.fsck.k9/org.fdroid.k9/g' && \
 echo "android.jar=$$SDK$$/platforms/android-17/android.jar" > ant.properties
+Build Version:1.2-fdroid,3,release-v1.2,\
+forceversion=yes,\
+patch=packageid.patch,\
+prebuild=find . -type f -print0 | xargs -0 sed -i 's/com.fsck.k9/org.fdroid.k9/g' && \
+         echo 'android.jar=$$SDK$$/platforms/android-17/android.jar' > ant.properties
 
 Auto Update Mode:None
 Update Check Mode:None