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

2013-07-02 13:58:08 +01:00 · 2013-07-02 13:58:08 +01:00 · b8524251e0
parent b9bcd5f9b1 df5841aa63
commit b8524251e0
21 changed files with 204 additions and 44 deletions
--- a/metadata/at.univie.sensorium.txt
+++ b/metadata/at.univie.sensorium.txt
@ -36,6 +36,7 @@ Build Version:1.1.6,9,af1b83545f23,subdir=Sensorium,prebuild=\
 sed -i '/play/d' project.properties && \
 sed -i '/Fused/d' res/values/sensors.xml && \
 rm src/at/univie/sensorium/sensors/FusedLocationSensor.java 
+Build Version:1.1.7,10,!not a release

 # Next version
 #Build Version:1.1.7,10,f7beb10ec44a,subdir=Sensorium,prebuild=\
--- a/metadata/ch.fixme.status.txt
+++ b/metadata/ch.fixme.status.txt
@ -16,9 +16,10 @@ Repo Type:git
 Repo:https://github.com/fixme-lausanne/MyHackerspace.git

 Build Version:1.6.1,10,56287be60f,prebuild=rm -rf apks/
+Build Version:1.7,11,!not a release

 Auto Update Mode:None
-# See Market or apks in repo
+# Also on gplay
 Update Check Mode:RepoManifest
 Current Version:1.7
 Current Version Code:11
--- a/metadata/com.blogspot.tonyatkins.freespeech.txt
+++ b/metadata/com.blogspot.tonyatkins.freespeech.txt
@ -22,7 +22,7 @@ Repo:https://bitbucket.org/duhrer/free-speech-for-android

 Build Version:1.17,117,freespeech-1.17,maven=yes,bindir=target,prebuild=\
 rm -rf target && sed -i '45 i \\tandroid:debuggable=\"false\"' AndroidManifest.xml
-Build Version:1.17,117,freespeech-1.19,maven=yes,bindir=target
+Build Version:1.19,119,freespeech-1.19,maven=yes,bindir=target

 Auto Update Mode:None
 # Uses tags
--- a/metadata/com.dririan.RingyDingyDingy.txt
+++ b/metadata/com.dririan.RingyDingyDingy.txt
@ -25,6 +25,7 @@ Build Version:0.7.1,701,v0.7.1
 Build Version:0.7.2,702,v0.7.2
 Build Version:0.7.3,703,v0.7.3
 Build Version:0.7.4,704,v0.7.4
+Build Version:0.7.5,705,v0.7.5

 Auto Update Mode:None
 Update Check Mode:RepoManifest
--- a/metadata/com.namelessdev.mpdroid.txt
+++ b/metadata/com.namelessdev.mpdroid.txt
@ -22,8 +22,10 @@ cd ../MPDroid && cp -r ../lastfm-java/src/net/ src/
 Build Version:1.02,24,e244b51aaa,subdir=MPDroid,update=.;../ActionBarSherlock
 Build Version:1.03.1,26,8758a34,subdir=MPDroid,update=.;../ActionBarSherlock
 Build Version:1.05,30,5438917,subdir=MPDroid,update=.;../ActionBarSherlock;../JMPDComm
-Build Version:1.06,31,9508bb7f79,subdir=MPDroid,update=.;../ActionBarSherlock;../JMPDComm,init=\
-rm -rf Screenshots/ Website/ icons/ JmDMS/ LastFM-java/
+Build Version:1.06,31,9508bb7f79,subdir=MPDroid,update=.;../ActionBarSherlock;\
+../JMPDComm,init=rm -rf Screenshots/ Website/ icons/ JmDMS/ LastFM-java/
+Build Version:1.06 beta 2,33,109cfe14,subdir=MPDroid,update=.;../ActionBarSherlock;\
+../JMPDComm,init=rm -rf Screenshots/ Website/ icons/ 

 Auto Update Mode:None
 # Device-variable on Market
--- a/metadata/com.uploadedlobster.PwdHash.txt
+++ b/metadata/com.uploadedlobster.PwdHash.txt
@ -19,6 +19,7 @@ Build Version:1.3.0,9,1.3.0
 Build Version:1.3.1,10,1.3.1
 Build Version:1.3.2,11,1.3.2
 Build Version:1.3.3,13,1.3.3
+Build Version:1.3.5,15,1.3.5

 Auto Update Mode:None
 Update Check Mode:Tags
--- a/metadata/com.write.Quill.txt
+++ b/metadata/com.write.Quill.txt
@ -46,10 +46,15 @@ Build Version:10.3,37,b70f53dfdd78,buildjni=yes,target=android-15,\
 srclibs=Color-Picker@5d697049fb;File-Picker@496178901f2b,prebuild=\
 sed -i 's@\(android.library.reference.1=\).*@\1$$Color-Picker$$@' project.properties && \
 sed -i 's@\(android.library.reference.2=\).*@\1$$File-Picker$$@' project.properties && rm -rf libs/*
+Build Version:10.6,40,257,\
+srclibs=Color-Picker-2@45ee6554a;File-Picker@7,prebuild=\
+sed -i 's@\(reference.1=\).*@\1$$Color-Picker-2$$@' project.properties && \
+sed -i 's@\(reference.2=\).*@\1$$File-Picker$$@' project.properties && \
+rm -rf libs/*,buildjni=yes

-# Use Color-Picker-2 next time
 Auto Update Mode:None
-Update Check Mode:Market
+# Also on gplay
+Update Check Mode:RepoManifest
 Current Version:10.6
 Current Version Code:40

--- a/metadata/de.onyxbits.remotekeyboard.txt
+++ b/metadata/de.onyxbits.remotekeyboard.txt
@ -18,6 +18,8 @@ Repo:https://github.com/onyxbits/remotekeyboard

 Build Version:1.1,2,v1.1,extlibs=android/android-support-v4.jar;\
 commons-logging/commons-logging-1.1.3.jar,prebuild=rm custom_rules.xml
+Build Version:1.2,3,v1.2,extlibs=android/android-support-v4.jar;\
+commons-logging/commons-logging-1.1.3.jar,prebuild=rm custom_rules.xml

 Auto Update Mode:None
 Update Check Mode:Tags
--- a/metadata/dentex.youtube.downloader.txt
+++ b/metadata/dentex.youtube.downloader.txt
@ -65,6 +65,11 @@ update=.;../android-filechooser;../dentex.youtube.downloader.strings,prebuild=\
 mkdir -p ../dentex.youtube.downloader.strings/src ../android-filechooser/libs/ && \
 rm -rf libs/armeabi* && tar xvf ../FFmpeg_and_lame_sources/liblame.tar.gz && \
 mv liblame/jni . && mv libs/bugs*.jar ../android-filechooser/libs/,buildjni=yes
+Build Version:2.3.2,53,2.3.2,subdir=dentex.youtube.downloader,\
+update=.;../android-filechooser;../dentex.youtube.downloader.strings,prebuild=\
+mkdir -p ../dentex.youtube.downloader.strings/src ../android-filechooser/libs/ && \
+rm -rf libs/armeabi* && tar xvf ../FFmpeg_and_lame_sources/liblame.tar.gz && \
+mv liblame/jni . && mv libs/bugs*.jar ../android-filechooser/libs/,buildjni=yes

 Auto Update Mode:None
 Update Check Mode:Tags
--- a/metadata/github.daneren2005.dsub.txt
+++ b/metadata/github.daneren2005.dsub.txt
@ -56,6 +56,12 @@ mv libs/*v4.jar $$DragSort$$/libs/ && \
 sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
 sed -i 's@\(reference.2=\).*@\1$$DragSort$$@' project.properties && \
 cd ../ && mv subsonic-android sa && rm -rf subsonic-* repo && mv sa subsonic-android
+Build Version:4.0.5,54,4.0.5,subdir=subsonic-android,\
+srclibs=ActionBarSherlock@c0d437c;DragSort@d39db07,prebuild=\
+mv libs/*v4.jar $$DragSort$$/libs/ && \
+sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
+sed -i 's@\(reference.2=\).*@\1$$DragSort$$@' project.properties && \
+cd ../ && mv subsonic-android sa && rm -rf subsonic-* repo && mv sa subsonic-android

 Auto Update Mode:None
 Update Check Mode:Tags
--- a/metadata/net.czlee.debatekeeper.txt
+++ b/metadata/net.czlee.debatekeeper.txt
@ -25,6 +25,7 @@ Build Version:0.10,14,release-0.10,extlibs=desk_bell.ogg,\
 srclibs=NumberPicker-Novak@b4e2c5d51,prebuild=\
 sed -i 's@\(.1=\).*@\1$$NumberPicker-Novak$$@' project.properties && \
 mkdir -p res/raw && mv libs/desk_bell.ogg res/raw 
+Build Version:0.11-dev,15,!not a release

 Auto Update Mode:None
 Update Check Mode:Tags
--- a/metadata/org.bombusmod.txt
+++ b/metadata/org.bombusmod.txt
@ -18,6 +18,7 @@ Build Version:0.8.1304,1304,1304,forceversion=yes,forcevercode=yes,\
 extlibs=antenna/antenna-bin-1.2.1-beta.jar,subdir=android,prebuild=\
 mv libs/antenna*.jar . && ant antenna-preprocess && \
 sed -i 's/${bombus.raw-revision}/-/g' AndroidManifest.xml
+Build Version:0.8.1306,1306,!not a release

 # Use this setup next time
 #Build Version:0.8.1312,1312,1312,\
--- a/metadata/org.fdroid.k9.txt
+++ b/metadata/org.fdroid.k9.txt
@ -5,13 +5,14 @@ Source Code:https://github.com/k9mail/k-9
 Issue Tracker:http://code.google.com/p/k9mail/issues/list

 Auto Name:K-9 Mail
-Name:K-9 Mail
+Name:K-9 Mail~
 Summary:Email client
 Description:
 '''N.B''' This package has a different name to the developer builds of K-9 — 
-therefore, they can be installed alongside each other.
+therefore, they could be installed alongside each other.
 However, be warned that apps found elsewhere that integrate with K-9 may not 
-work with our versions.
+work with our versions. 
+The '~' has been appended to the app name for differentiation.

 E-mail client supporting multiple accounts, POP3, IMAP and Push IMAP.
 Can do encryption if [[org.thialfihar.android.apg]] is installed; stay tuned: 
@ -25,7 +26,7 @@ If you would like to contribute financially to k9mail, consider
 donating to the local SPCA
 (societies for the prevention of cruelty to animals).

-[https://github.com/k9mail/k-9/wiki/ReleaseNotes Major version release notes]; 
+[https://github.com/k9mail/k-9/wiki/ReleaseNotes Major version notes]; 
 [https://github.com/k9mail/k-9/raw/master/res/raw/changelog.xml Changelog]
 .

@ -119,7 +120,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.401-fdroid,17038,4.401,forceversion=yes,\
+Build Version:4.401-fdroid,17038,!4.401,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=\
@ -137,46 +138,44 @@ 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,\
+# use the build-beta script from the master branch instead
+Build Version:4.403,17040,4.403,\
+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 && \
+library/project.properties,patch=packageid-temp.patch,prebuild=\
+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=\
+mkdir -p tests/res/ && unzip libs/htmlcleaner-2.2-all.zip && \
+cp -r $$Jutf7$$/src/main/java/com/ src/  && \
+tar xzf libs/jzlib-1.0.7.tar.gz && mv jzlib-1.0.7/com/jcraft src/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.xxx-fdroid,18002,!template for next version at fea29dab,\
-forceversion=yes,srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
+Build Version:4.502,18002,4.502,\
+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,patch=packageid.patch,prebuild=./tools/build-beta && \
+library/project.properties,patch=packageid-temp.patch,prebuild=\
+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 && mkdir -p src/com/ && 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=\
+mkdir -p tests/res/ && unzip libs/htmlcleaner-2.2-all.zip && \
+cp -r $$Jutf7$$/src/main/java/com/ src/  && \
+tar xzf libs/jzlib-1.0.7.tar.gz && mv jzlib-1.0.7/com/jcraft src/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

-# Should think about providing maintenance updates for 4.400 
+# Should think about providing maintenance updates for 4.400 when 4.600 arrives
 # K9 have their own fork of jzlib and jutf7 that won't change very often
 Auto Update Mode:None
 # RM/4.4-MAINT would work but the package ID is different
 Update Check Mode:None
-Current Version:4.401
-Current Version Code:17038
+Current Version:4.403
+Current Version Code:17040

--- a/metadata/org.fdroid.k9/packageid-temp.patch
+++ b/metadata/org.fdroid.k9/packageid-temp.patch
@ -0,0 +1,104 @@
+diff --git a/tools/build-beta b/tools/build-beta
+index 129f1a0..8b0905d 100644
+--- a/tools/build-beta
+++ b/tools/build-beta
+@@ -1,16 +1,83 @@
+-BETA_PACKAGE=com.fsck.k9beta
+-BETA_PATH=com/fsck/k9beta
+-BETA_PROJ_NAME="K9 Beta"
+-perl -pi -e"s|\@string/app_name|\@string/beta_app_name|g" AndroidManifest.xml
+-perl -pi -e"s|com/fsck/k9/R.java|$BETA_PATH/R.java|g" build.xml
+-find src/com/fsck res -type f |xargs -n 1 perl -pi -e"s/com.fsck.k9(?=\W)/$BETA_PACKAGE/g"
+-perl -pi -e"s|com.fsck.k9|$BETA_PACKAGE|g" AndroidManifest.xml
+-mv src/com/fsck/k9 src/$BETA_PATH
+-perl -pi -e"s|K9|$BETA_PROJ_NAME|g" build.xml
+-ant $@
+-mv src/$BETA_PATH src/com/fsck/k9
+-perl -pi -e"s|$BETA_PACKAGE|com.fsck.k9|g" AndroidManifest.xml
+-perl -pi -e"s|$BETA_PATH/R.java|com/fsck.k9/R.java|g" build.xml
+-find src/com/fsck res -type f |xargs -n 1 perl -pi -e"s/$BETA_PACKAGE(?=\W)/com.fsck.k9/g"
+-perl -pi -e"s|$BETA_PROJ_NAME|K9|g" build.xml
+-perl -pi -e"s|\@string/beta_app_name|\@string/app_name|g" AndroidManifest.xml
+#!/bin/bash
+
+# The MIT License
+#
+# Copyright 2012 Ashley Willis <ashley.github@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# Based off original tools/build-beta by Jesse Vincent.
+
+# Works on OS X and Linux.
+
+# Temporarily rename an Android project for building.
+# Set the first 5 or 6 DIST_* and BETA_* to whatever you are going from and to.
+# Set PROJECT_DIR to the absolute path pf the main project.
+# Set TEST_DIR to the absolute path of the test project.
+# Then run this script with the same arguments you'd pass to ant. It can be
+# run from either $PROJECT_DIR or $TEST_DIR. It might require tweaks
+# depending on how your project is laid out.
+
+PROJECT_DIR=.
+TEST_DIR=${PROJECT_DIR}/tests
+
+DIST_TLD=com
+DIST_DOMAIN=fsck
+DIST_PROJECT=k9
+DIST_LOGTAG=k9
+DIST_PROJ_NAME=K9
+DIST_APP_NAME='\@string/app_name'
+
+BETA_TLD=org
+BETA_DOMAIN=fdroid
+BETA_PROJECT=k9
+BETA_LOGTAG=k9
+BETA_PROJ_NAME='K9'
+BETA_APP_NAME='K-9 Mail~'
+
+# Nothing below here should need to be changed.
+
+DIST_PACKAGE="${DIST_TLD}.${DIST_DOMAIN}.${DIST_PROJECT}"
+DIST_PATH="${DIST_TLD}/${DIST_DOMAIN}/${DIST_PROJECT}"
+
+BETA_PACKAGE="${BETA_TLD}.${BETA_DOMAIN}.${BETA_PROJECT}"
+BETA_PATH="${BETA_TLD}/${BETA_DOMAIN}/${BETA_PROJECT}"
+
+# convert to beta project:
+perl -pi -e"s|${DIST_APP_NAME}|${BETA_APP_NAME}|g" ${PROJECT_DIR}/AndroidManifest.xml
+perl -pi -e"s|${DIST_PACKAGE}|${BETA_PACKAGE}|g" ${PROJECT_DIR}/AndroidManifest.xml ${TEST_DIR}/AndroidManifest.xml
+perl -pi -e"s|${DIST_PROJ_NAME}|${BETA_PROJ_NAME}|g" ${PROJECT_DIR}/build.xml ${TEST_DIR}/build.xml
+perl -pi -e"s|LOG_TAG = \"${DIST_LOGTAG}\"|LOG_TAG = \"${BETA_LOGTAG}\"|" ${PROJECT_DIR}/src/${DIST_PATH}/${DIST_PROJ_NAME}.java
+find ${PROJECT_DIR}/src/${DIST_TLD}/${DIST_DOMAIN} ${PROJECT_DIR}/res ${TEST_DIR}/src/${DIST_TLD}/${DIST_DOMAIN} ${TEST_DIR}/res \
+        -type f -print0 | xargs -0 perl -pi -e"s/${DIST_PACKAGE}(?=\W)/${BETA_PACKAGE}/g"
+if [[ "${DIST_PROJECT}" != "${BETA_PROJECT}" ]]; then
+    mv ${PROJECT_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}/${DIST_PROJECT} ${PROJECT_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}/${BETA_PROJECT}
+    mv ${TEST_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}/${DIST_PROJECT} ${TEST_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}/${BETA_PROJECT}
+fi
+if [[ "${DIST_DOMAIN}" != "${BETA_DOMAIN}" ]]; then
+    mv ${PROJECT_DIR}/src/${DIST_TLD}/${DIST_DOMAIN} ${PROJECT_DIR}/src/${DIST_TLD}/${BETA_DOMAIN}
+    mv ${TEST_DIR}/src/${DIST_TLD}/${DIST_DOMAIN} ${TEST_DIR}/src/${DIST_TLD}/${BETA_DOMAIN}
+fi
+if [[ "${DIST_TLD}" != "${BETA_TLD}" ]]; then
+    mv ${PROJECT_DIR}/src/${DIST_TLD} ${PROJECT_DIR}/src/${BETA_TLD}
+    mv ${TEST_DIR}/src/${DIST_TLD} ${TEST_DIR}/src/${BETA_TLD}
+fi
+
+MYEXIT=$?
+
--- a/metadata/org.fdroid.k9/packageid.patch
+++ b/metadata/org.fdroid.k9/packageid.patch
@ -16,8 +16,8 @@ index 8061ec9..01b0725 100755
 +BETA_DOMAIN=fdroid
 +BETA_PROJECT=k9
 +BETA_LOGTAG=k9
-+BETA_PROJ_NAME='K9~'
-+BETA_APP_NAME='K-9~'
+BETA_PROJ_NAME='K9'
+BETA_APP_NAME='K-9 Mail~'
 
 # Nothing below here should need to be changed.
 
--- a/metadata/org.geometerplus.fbreader.plugin.local_opds_scanner.txt
+++ b/metadata/org.geometerplus.fbreader.plugin.local_opds_scanner.txt
@ -0,0 +1,25 @@
+Category:Reading
+License:GPLv2+
+Web Site:http://www.fbreader.org/FBReaderJ/
+Source Code:https://github.com/geometer/FBReaderJ-plugin-local-opds-scanner
+Issue Tracker:https://github.com/geometer/FBReaderJ-plugin-local-opds-scanner/issues
+Donate:http://www.fbreader.org/donation/make.php
+
+Auto Name:FBReader local OPDS scanner
+Summary:Discovery of local opds libraries
+Description:
+Allows automatic discovery of opds shares made discoverable by zeroconf (avahi,
+Bonjour)
+.
+
+Repo Type:git
+Repo:https://github.com/geometer/FBReaderJ-plugin-local-opds-scanner.git
+
+# Not an official release, but has bugfixes and no official release for 1-year+
+Build Version:1.1-fd,101001,9a239a014a272d3b1d642,forceversion=yes
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.1
+Current Version Code:101001
+
--- a/metadata/org.geometerplus.zlibrary.ui.android.txt
+++ b/metadata/org.geometerplus.zlibrary.ui.android.txt
@ -71,11 +71,20 @@ Build Version:1.7.8-Froyo,107084,1.7.8,forceversion=yes,buildjni=yes,prebuild=\
 mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
 Build Version:1.7.8-Honeycomb,107085,1.7.8-ics,forceversion=yes,buildjni=yes,prebuild=\
 mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
+Build Version:1.8.2-Donut,108020,9bec0ff445e66a,forceversion=yes,buildjni=yes,\
+update=third-party/AmbilWarna;.,\
+prebuild=mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
+Build Version:1.8.2-Froyo,108021,0f02d4e9232227,forceversion=yes,buildjni=yes,\
+update=third-party/AmbilWarna;.,\
+prebuild= mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;
+Build Version:1.8.2-Honeycomb+,108022,1112df415d,forceversion=yes,buildjni=yes,\
+update=third-party/AmbilWarna;.,\
+prebuild=mkdir res/drawable && find icons -iname "*.*" -exec cp {} res/drawable \;

 Auto Update Mode:None
 #Cross reference tags and website
 Update Check Mode:None
-Current Version:1.7.8
-#Use Honeycomb
-Current Version Code:107085
+Current Version:1.8.2
+#Use Honeycomb+
+Current Version Code:108022

--- a/metadata/org.jfedor.frozenbubble.txt
+++ b/metadata/org.jfedor.frozenbubble.txt
@ -23,6 +23,7 @@ Build Version:1.13,14,25,buildjni=yes
 Build Version:1.14,15,30,buildjni=yes
 Build Version:1.15,16,32,buildjni=yes
 Build Version:1.16,17,40,buildjni=yes
+Build Version:1.17,18,49,buildjni=yes

 Auto Update Mode:None
 Update Check Mode:RepoManifest
--- a/metadata/org.mumod.android.txt
+++ b/metadata/org.mumod.android.txt
@ -30,6 +30,7 @@ Repo:https://github.com/kromonos/Mustard-Mod.git
 Build Version:0.4.0.17,168,05b41e1f17,prebuild=\
 sed -i '53\,60d' res/layout/account_create.xml && \
 sed -i '50\,55d' src/org/mumod/android/activity/Login.java
+Build Version:0.4.0.19,174,!not a release

 Auto Update Mode:None
 # See website for CV; also on Play
--- a/metadata/org.sixgun.ponyexpress.txt
+++ b/metadata/org.sixgun.ponyexpress.txt
@ -19,6 +19,7 @@ Build Version:0.4.2,8,38eb1f2141225a95c8a96fedfbdfcf34beeeeb9b
 Build Version:0.4.3,9,0.4.3
 Build Version:1.0,11,efc427322038febb25d6ca909bf8c4157f685839
 Build Version:1.1,12,1.1,target=android-10
+Build Version:1.1_,14,!not a release

 Auto Update Mode:None
 Update Check Mode:RepoManifest
--- a/stats/known_apks.txt
+++ b/stats/known_apks.txt
@ -1818,12 +1818,6 @@ org.fdroid.fdroid_46.apk org.fdroid.fdroid 2013-05-31
 org.fdroid.fdroid_8.apk org.fdroid.fdroid 2011-01-17
 org.fdroid.fdroid_9.apk org.fdroid.fdroid 2011-01-30
 org.fdroid.k9_16025.apk org.fdroid.k9 2013-06-30
-org.fdroid.k9_17031.apk org.fdroid.k9 2013-05-04
-org.fdroid.k9_17032.apk org.fdroid.k9 2013-05-10
-org.fdroid.k9_17036.apk org.fdroid.k9 2013-06-25
-org.fdroid.k9_17037.apk org.fdroid.k9 2013-06-27
-org.fdroid.k9_17038.apk org.fdroid.k9 2013-06-29
-org.fdroid.k9_18002.apk org.fdroid.k9 2013-05-25
 org.fdroid.superuser_1013.apk org.fdroid.superuser 2013-03-07
 org.fdroid.superuser_1016.apk org.fdroid.superuser 2013-03-30
 org.fdroid.superuser_1017.apk org.fdroid.superuser 2013-04-12