From 9d383ee042a7a60c3104b9ee007f6bd243478a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 23 Aug 2013 14:26:01 +0200
Subject: [PATCH 01/18] Small yaacc typos

---
 metadata/de.yaacc.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata/de.yaacc.txt b/metadata/de.yaacc.txt
index 20f8695f80..ecb9e999e8 100644
--- a/metadata/de.yaacc.txt
+++ b/metadata/de.yaacc.txt
@@ -8,7 +8,7 @@ Name:Yaacc
 Auto Name:YAACC
 Summary:UPNP Client and Server
 Description:
-Allowes to play media from UPNP/DLNA devices in your network on your android device 
+Allows you to play media from UPNP/DLNA devices in your network on your android device 
 or any capable UPNP device in your network.
 It is also possible to start an UPNP server on your device in order to play media from your 
 device on any UPNP renderer in your network.

From dd7d3dcc20ac4508379719eda6706114f9901874 Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Fri, 23 Aug 2013 12:03:39 +0100
Subject: [PATCH 02/18] more WIP for Radiobeacon

---
 metadata/org.openbmap.txt | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/metadata/org.openbmap.txt b/metadata/org.openbmap.txt
index e072b34fc9..75359571b6 100644
--- a/metadata/org.openbmap.txt
+++ b/metadata/org.openbmap.txt
@@ -1,7 +1,5 @@
-# previously known as com.googlecode.androidcells
 Category:Internet
-# https://f-droid.org/forums/topic/android-cells-may-need-to-be-replaced/#post-8349 
-License:Unknown
+License:GPLv3
 Web Site:http://openbmap.org
 Source Code:https://code.google.com/p/openbmap
 Issue Tracker:http://sourceforge.net/projects/myposition/support
@@ -16,14 +14,20 @@ openBmap is a free and open map of wireless communicating objects.
 Collected data can be downloaded from the website and used for many purposes, 
 such as determining your own location without GPS or creating network coverage 
 maps.
+
+Hint: Use long-press on a session to upload it to the server.
+
+Status: Testing
 .
 
 Repo Type:git
 Repo:https://code.google.com/p/openbmap
 
-Build Version:1.0,1,!not production ready according to source code page; no license
+Build Version:1.0,1,!jars not yet verified; license not explicit at fe1f5fe76b,subdir=android,\
+init=rm -rf bin/ && sed -i '/proguard/d' project.properties
 
 Auto Update Mode:None
+# apk are in bin/
 Update Check Mode:RepoManifest
 Current Version:1.0
 Current Version Code:1

From 67b782c3553fb82cddff4a5fbe0aff6795666bcc Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Fri, 23 Aug 2013 15:18:40 +0100
Subject: [PATCH 03/18] new app Launch App Ops

---
 metadata/com.adstrosoftware.launchappops.txt | 25 ++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 metadata/com.adstrosoftware.launchappops.txt

diff --git a/metadata/com.adstrosoftware.launchappops.txt b/metadata/com.adstrosoftware.launchappops.txt
new file mode 100644
index 0000000000..310605a4ce
--- /dev/null
+++ b/metadata/com.adstrosoftware.launchappops.txt
@@ -0,0 +1,25 @@
+Category:System
+License:Apache2
+Web Site:
+Source Code:https://github.com/adstro/launch-app-ops
+Issue Tracker:https://github.com/adstro/launch-app-ops/issues
+
+Auto Name:Launch App Ops
+Summary:Show a hidden screen
+Description:
+In Android 4.3 there is a new activity/screen, not accessible from settings, 
+called App Ops, where you can manage permissions for different apps.
+This app simply allows you to launch this activity.
+.
+
+Repo Type:git
+Repo:https://github.com/adstro/launch-app-ops.git
+
+Build Version:1.0,1,6c1b72946,subdir=app,gradle=yes,\
+prebuild=sed -i 's/18.0.1/18.0.1/g' build.gradle
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest
+Current Version:1.0
+Current Version Code:1
+

From b43eebf68977843defec5156ffd7de493d3d558f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 23 Aug 2013 16:44:25 +0200
Subject: [PATCH 04/18] WIP org.adaway 2.5

---
 metadata/org.adaway.txt                 |  3 ++
 metadata/org.adaway/no-signing-44.patch | 40 +++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 metadata/org.adaway/no-signing-44.patch

diff --git a/metadata/org.adaway.txt b/metadata/org.adaway.txt
index ec4d2e0e29..9c96f0dafa 100644
--- a/metadata/org.adaway.txt
+++ b/metadata/org.adaway.txt
@@ -74,6 +74,9 @@ find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysec
 cp android-libs/Donations/ant-templates/other/DonationsConfig.java \
 android-libs/Donations/src/org/donations/,buildjni=yes
 
+Build Version:2.5,44,!gradle wip v2.5,subdir=AdAway,buildjni=yes,gradle=yes,preassemble=renameExecutables,\
+patch=no-signing-44.patch,prebuild=mv ../libraries libraries
+
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:2.5
diff --git a/metadata/org.adaway/no-signing-44.patch b/metadata/org.adaway/no-signing-44.patch
new file mode 100644
index 0000000000..460c406811
--- /dev/null
+++ b/metadata/org.adaway/no-signing-44.patch
@@ -0,0 +1,40 @@
+diff --git a/AdAway/build.gradle b/AdAway/build.gradle
+index 378ce1c..951466d 100644
+--- a/AdAway/build.gradle
++++ b/AdAway/build.gradle
+@@ -16,28 +16,6 @@ android {
+         targetSdkVersion 17
+     }
+ 
+-    /*
+-     * To sign release build, create file gradle.properties in .gradle/ with this content:
+-     *
+-     * signingStoreLocation=/home/key.store
+-     * signingStorePassword=xxx
+-     * signingKeyAlias=alias
+-     * signingKeyPassword=xxx
+-     */
+-    signingConfigs {
+-        myConfig {
+-            storeFile file(signingStoreLocation)
+-            storePassword signingStorePassword
+-            keyAlias signingKeyAlias
+-            keyPassword signingKeyPassword
+-        }
+-    }
+-
+-    buildTypes {
+-        release {
+-            signingConfig signingConfigs.myConfig
+-        }
+-    }
+ }
+ 
+ /**
+@@ -65,4 +43,4 @@ task renameExecutables(type: Copy) {
+ }
+ 
+ 
+-build.dependsOn renameExecutables
+\ No newline at end of file
++build.dependsOn renameExecutables

From f42da9b8071292cf4d5b68eb7bef1e7610cc5189 Mon Sep 17 00:00:00 2001
From: Quentin Loos <contact@quentinloos.be>
Date: Fri, 23 Aug 2013 19:05:58 +0200
Subject: [PATCH 05/18] Add new app : Manille

---
 metadata/be.quentinloos.manille.txt | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 metadata/be.quentinloos.manille.txt

diff --git a/metadata/be.quentinloos.manille.txt b/metadata/be.quentinloos.manille.txt
new file mode 100644
index 0000000000..9aeb749e43
--- /dev/null
+++ b/metadata/be.quentinloos.manille.txt
@@ -0,0 +1,22 @@
+Category:Games
+License:GPLv3
+Web Site:http://quentinloos.be/projets/manille
+Source Code:https://github.com/Kent1/Manille
+Issue Tracker:https://github.com/Kent1/Manille/issues
+
+Auto Name:Manille
+Summary:Un carnet de points pour la manille
+Description:
+Manille est une application Android dont le but est d’utiliser son smartphone comme carnet de points pour le célèbre jeu de cartes, la manille.
+Fini de griffonner le verso d’un dessous verre en carton Jupiler, cette application deviendra indispensable chez tous les passionnés de manille.
+.
+
+Repo Type:git
+Repo:https://github.com/Kent1/Manille.git
+
+Build Version:1.0,1,c995252ee8d927e16827d73f6b3f2002906d4f2b,gradle=yes
+
+Auto Update Mode:Version v%c
+Update Check Mode:Tags
+Current Version:1.0
+Current Version Code:1

From d91c0f247c6daf3df3235365ed5c7fa2cac6e92d Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Fri, 23 Aug 2013 22:06:17 +0100
Subject: [PATCH 06/18] fix AUM for Manille

---
 metadata/be.quentinloos.manille.txt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/metadata/be.quentinloos.manille.txt b/metadata/be.quentinloos.manille.txt
index 9aeb749e43..addadc0d35 100644
--- a/metadata/be.quentinloos.manille.txt
+++ b/metadata/be.quentinloos.manille.txt
@@ -7,8 +7,10 @@ Issue Tracker:https://github.com/Kent1/Manille/issues
 Auto Name:Manille
 Summary:Un carnet de points pour la manille
 Description:
-Manille est une application Android dont le but est d’utiliser son smartphone comme carnet de points pour le célèbre jeu de cartes, la manille.
-Fini de griffonner le verso d’un dessous verre en carton Jupiler, cette application deviendra indispensable chez tous les passionnés de manille.
+Manille est une application Android dont le but est d’utiliser son smartphone 
+comme carnet de points pour le célèbre jeu de cartes, la manille.
+Fini de griffonner le verso d’un dessous verre en carton Jupiler, cette 
+application deviendra indispensable chez tous les passionnés de manille.
 .
 
 Repo Type:git
@@ -16,7 +18,8 @@ Repo:https://github.com/Kent1/Manille.git
 
 Build Version:1.0,1,c995252ee8d927e16827d73f6b3f2002906d4f2b,gradle=yes
 
-Auto Update Mode:Version v%c
+Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:1.0
 Current Version Code:1
+

From 1d3be7ad5434da5cb3e3330e6e2edc5cd3740cad Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Sat, 24 Aug 2013 11:25:30 +0100
Subject: [PATCH 07/18] remove changelog URL from F-Droid; purge test builds;
 fix urls

---
 metadata/org.fdroid.fdroid.txt | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/metadata/org.fdroid.fdroid.txt b/metadata/org.fdroid.fdroid.txt
index 725a12eba4..62e58f3cbc 100644
--- a/metadata/org.fdroid.fdroid.txt
+++ b/metadata/org.fdroid.fdroid.txt
@@ -1,8 +1,9 @@
 Category:System
 License:GPLv3+
-Web Site:http://f-droid.org
-Source Code:http://gitorious.org/f-droid/fdroidclient
-Issue Tracker:http://f-droid.org/repository/issues
+Web Site:https://f-droid.org
+Source Code:https://gitorious.org/f-droid/fdroidclient
+Issue Tracker:https://f-droid.org/repository/issues
+Donate:https://f-droid.org
 FlattrID:343053
 Bitcoin:15u8aAPK4jJ5N8wpWJ5gutAyyeHtKX5i18
 
@@ -25,8 +26,6 @@ but there are many good reasons for using a client/repository setup:
 Please note that while the client itself is FOSS and well inspected by the public, the
 apps themselves may not be. You install them at your own risk. By default, apps which
 may have undesirable behaviour i.e. anti-features, are hidden from view.
-
-[http://f-droid.org/posts/category/news Changelog]
 .
 
 Repo Type:git
@@ -63,8 +62,8 @@ Build Version:0.43,43,!sdk doesn't like tzm (at f2109e4e0bf1597c625221d8d2d10050
 Build Version:0.44,44,!nasty upgrade bug 0.44,target=android-15
 Build Version:0.45,45,0.45,target=android-15
 Build Version:0.46,46,0.46,target=android-15
-Build Version:0.47-test,47,0.47-test,target=android-17
-Build Version:0.48-test,48,0.48-test,target=android-17
+Build Version:0.47-test,47,!0.47-test,target=android-17
+Build Version:0.48-test,48,!0.48-test,target=android-17
 Build Version:0.50,50,0.50
 
 Auto Update Mode:None

From 156bec4b19302f085c05b427935f07c6cf5b035c Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Sat, 24 Aug 2013 11:55:07 +0100
Subject: [PATCH 08/18] Mapsforge srclib

---
 srclibs/Mapsforge.txt | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 srclibs/Mapsforge.txt

diff --git a/srclibs/Mapsforge.txt b/srclibs/Mapsforge.txt
new file mode 100644
index 0000000000..6d1d5e32b6
--- /dev/null
+++ b/srclibs/Mapsforge.txt
@@ -0,0 +1,4 @@
+# Source details (the only mandatory fields)
+Repo Type:git
+Repo:https://code.google.com/p/mapsforge
+

From ceca16432bedba0fcb0b5d37244be34e81badd17 Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Sat, 24 Aug 2013 11:55:17 +0100
Subject: [PATCH 09/18] fix and activate Radiobeacon

---
 metadata/org.openbmap.txt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/metadata/org.openbmap.txt b/metadata/org.openbmap.txt
index 75359571b6..dede43fcdc 100644
--- a/metadata/org.openbmap.txt
+++ b/metadata/org.openbmap.txt
@@ -1,5 +1,5 @@
 Category:Internet
-License:GPLv3
+License:AGPLv3
 Web Site:http://openbmap.org
 Source Code:https://code.google.com/p/openbmap
 Issue Tracker:http://sourceforge.net/projects/myposition/support
@@ -23,8 +23,12 @@ Status: Testing
 Repo Type:git
 Repo:https://code.google.com/p/openbmap
 
-Build Version:1.0,1,!jars not yet verified; license not explicit at fe1f5fe76b,subdir=android,\
-init=rm -rf bin/ && sed -i '/proguard/d' project.properties
+Build Version:1.0,1,fe1f5fe76b,subdir=android,\
+init=rm -rf bin/ && sed -i '/proguard/d' project.properties,\
+srclibs=Mapsforge@0f71a427bd50,\
+build=$$MVN3$$ clean package -DskipTests -f $$Mapsforge$$/pom.xml && \
+      mv $$Mapsforge$$/mapsforge-map/target/\
+mapsforge-map-0.3.1-SNAPSHOT-jar-with-dependencies.jar libs/
 
 Auto Update Mode:None
 # apk are in bin/

From 614ae4e1b0b89c59386e102a12ec323ac38335c5 Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Sat, 24 Aug 2013 12:08:23 +0100
Subject: [PATCH 10/18] notes for updating Ghost Commander

---
 metadata/com.ghostsq.commander.txt | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/metadata/com.ghostsq.commander.txt b/metadata/com.ghostsq.commander.txt
index 8cd85b1602..218e8da850 100644
--- a/metadata/com.ghostsq.commander.txt
+++ b/metadata/com.ghostsq.commander.txt
@@ -1,8 +1,6 @@
 Category:System
 License:GPLv3
 Web Site:http://sites.google.com/site/ghostcommander1/
-#There is something wrong here
-#Source Code:http://sourceforge.net/projects/ghostcommander/develop
 Source Code:https://ghostcommander.svn.sourceforge.net/viewvc/ghostcommander
 Issue Tracker:http://sourceforge.net/tracker/?group_id=311417
 Donate:http://sourceforge.net/donate/index.php?group_id=311417
@@ -40,14 +38,15 @@ Build Version:1.40,160,302,\
 prebuild=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml
 Build Version:1.40.1,163,307
 Build Version:1.40.2,164,314
-Build Version:1.41,180,!352 but need to check dex usage and add option to ignore in scanner
-Build Version:1.42,190,!368 but need to check dex usage and add option to ignore in scanner
 # DexClassLoader seems to be used for the samba/sftp plugins
 Build Version:1.43.3b1,210,407,\
 scanignore=build/com.ghostsq.commander/src/com/ghostsq/commander/adapters/CA.java
 
+# http://sourceforge.net/p/gc-ai1/code is supposed to build GC & plugins
+#  but some files are currently missing. see 
+#  https://f-droid.org/forums/topic/sftp-plugin-for-ghost-commander
 Auto Update Mode:None
-#Update Check Mode:Market
+# also on gplay; apks on website
 Update Check Mode:None
 Current Version:1.50.1
 Current Version Code:214

From 1547ca2b77f1e366d85306bddcfa1c01c77f7b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sat, 24 Aug 2013 13:43:55 +0200
Subject: [PATCH 11/18] Update org.fdroid.dashclock.k9 to 1.3

---
 metadata/org.fdroid.dashclock.k9.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/metadata/org.fdroid.dashclock.k9.txt b/metadata/org.fdroid.dashclock.k9.txt
index 72e69c471d..3ae250c782 100644
--- a/metadata/org.fdroid.dashclock.k9.txt
+++ b/metadata/org.fdroid.dashclock.k9.txt
@@ -29,6 +29,10 @@ 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.3-fdroid,4,release-v1.3,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
 Current Version:1.3

From 2a1d71ceada0baa2798566c23682a3e2c4f0626e Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Sat, 24 Aug 2013 12:28:22 +0100
Subject: [PATCH 12/18] update Bitcoin apps; change donation address

---
 metadata/de.schildbach.wallet.txt      | 19 +++++++++++++------
 metadata/de.schildbach.wallet_test.txt | 16 ++++++++++++----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/metadata/de.schildbach.wallet.txt b/metadata/de.schildbach.wallet.txt
index 555b5b00ed..04cd5b6988 100644
--- a/metadata/de.schildbach.wallet.txt
+++ b/metadata/de.schildbach.wallet.txt
@@ -3,7 +3,7 @@ License:GPLv3
 Web Site:http://code.google.com/p/bitcoin-wallet/
 Source Code:http://code.google.com/p/bitcoin-wallet/source/list?name=prod
 Issue Tracker:http://code.google.com/p/bitcoin-wallet/issues/list
-Bitcoin:1GQs8ma4QktseTyhMh1FgPhC7KjoM9HH46
+Bitcoin:1HkX6X8EakdsgAysL93oKrWiXGPbFiG1xV
 
 Auto Name:Bitcoin
 Summary:Store digital currency
@@ -17,7 +17,7 @@ Description:
 * Manages blockchain on your device
 * System notifications for Bitcoin connectivity and received coins
 * App widget for Bitcoin balance 
-* Export private keys to local storage encrypted with a password
+* Back up private keys to local storage encrypted with a password
 
 A few tens of MiB must be downloaded to set up the blockchain and a couple
 more per month subsequently to keep it updated.
@@ -88,13 +88,20 @@ build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet-origin/pom.xml,\
 maven=yes,\
 bindir=wallet/target
 
+Build Version:3.18,139,a78c08d4254e,\
+srclibs=BitcoinJWallet@1134572f61,\
+prebuild=sed -i '30\,33d' pom.xml && cp -r $$BitcoinJWallet$$/ . && \
+         rm -rf market/,\
+build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet/pom.xml,\
+maven=yes,\
+bindir=wallet/target
+
 # Build from prod (production) branch which cherry picks some old commits and commits after tags
 # Use specific commit instead of git fetch origin && git checkout origin/prod
 # See wallet/README or git log for info about which BitcoinJ branch/tag to use
 Auto Update Mode:None
-# RM/Tags don't work
-#Update Check Mode:Market
+# RM/Tags don't work; also on gplay
 Update Check Mode:None
-Current Version:3.15
-Current Version Code:136
+Current Version:3.18
+Current Version Code:139
 
diff --git a/metadata/de.schildbach.wallet_test.txt b/metadata/de.schildbach.wallet_test.txt
index 266a857d17..059d393620 100644
--- a/metadata/de.schildbach.wallet_test.txt
+++ b/metadata/de.schildbach.wallet_test.txt
@@ -3,9 +3,9 @@ License:GPLv3
 Web Site:http://code.google.com/p/bitcoin-wallet/
 Source Code:http://code.google.com/p/bitcoin-wallet/source/checkout
 Issue Tracker:http://code.google.com/p/bitcoin-wallet/issues/list
-Bitcoin:1GQs8ma4QktseTyhMh1FgPhC7KjoM9HH46
+Bitcoin:1HkX6X8EakdsgAysL93oKrWiXGPbFiG1xV
 
-Summary:Testing version of Bitcoin Wallet
+Summary:Testing version of Bitcoin
 Description:
 A bitcoin wallet, allowing you to store, send and receive bitcoins on your
 device, both via QR codes and NFC. When run for the first time,
@@ -71,11 +71,19 @@ build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet-origin/pom.xml,\
 maven=yes,\
 bindir=wallet/target
 
+Build Version:3.18-test,139,v3.18,\
+srclibs=BitcoinJWallet@v0.10.1,\
+prebuild=sed -i '30\,33d' pom.xml && cp -r $$BitcoinJWallet$$/ . && \
+         rm -rf market/,\
+build=$$MVN3$$ clean install -DskipTests -f BitcoinJWallet/pom.xml,\
+maven=yes,\
+bindir=wallet/target
+
 # Do other wallet app first: can use tags here because security is less important
 # Don't forget the version name though!
 Auto Update Mode:None
 # Just follow main wallet app
 Update Check Mode:Static
-Current Version:3.15-test
-Current Version Code:135
+Current Version:3.18-test
+Current Version Code:139
 

From 7b7b24bf387866f23e91b0d99db9814b88072ada Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Sat, 24 Aug 2013 12:42:16 +0100
Subject: [PATCH 13/18] use f-droid.org/about for the donation url

---
 metadata/org.fdroid.fdroid.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata/org.fdroid.fdroid.txt b/metadata/org.fdroid.fdroid.txt
index 62e58f3cbc..306f35e6d6 100644
--- a/metadata/org.fdroid.fdroid.txt
+++ b/metadata/org.fdroid.fdroid.txt
@@ -3,7 +3,7 @@ License:GPLv3+
 Web Site:https://f-droid.org
 Source Code:https://gitorious.org/f-droid/fdroidclient
 Issue Tracker:https://f-droid.org/repository/issues
-Donate:https://f-droid.org
+Donate:https://f-droid.org/about
 FlattrID:343053
 Bitcoin:15u8aAPK4jJ5N8wpWJ5gutAyyeHtKX5i18
 

From b876eb4e1e54718cf666f91c327f5581df8fef44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sat, 24 Aug 2013 13:53:22 +0200
Subject: [PATCH 14/18] Re-add changelog uri and re-enable test builds on
 org.fdroid.fdroid

Changelog uri is fine. Ciaran just forgot to tag the 0.50 post under "news".

No other test builds have ever been disabled. I don't see why these should be
any different, and there's no explanation about that in the commit
description.
---
 metadata/de.jdsoft.law.txt     | 9 +++++++--
 metadata/org.fdroid.fdroid.txt | 6 ++++--
 metadata/org.ligi.fast.txt     | 2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/metadata/de.jdsoft.law.txt b/metadata/de.jdsoft.law.txt
index 3f1474b7f8..4df5152a17 100644
--- a/metadata/de.jdsoft.law.txt
+++ b/metadata/de.jdsoft.law.txt
@@ -39,8 +39,13 @@ update=.;\
 extern/actionbarsherlock;extern/android-async-http;\
 extern/viewPageIndicator;extern/AmazingListView
 
+Build Version:0.7,10,v0.7,target=android-17,submodules=yes,update=.;\
+extern/Android-ViewPagerIndicator/library;extern/AmazingListView;\
+extern/android-async-http;extern/ActionBarSherlock/actionbarsherlock;\
+extern/UnifiedPreference/library
+
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:0.6
-Current Version Code:9
+Current Version:0.7
+Current Version Code:10
 
diff --git a/metadata/org.fdroid.fdroid.txt b/metadata/org.fdroid.fdroid.txt
index 306f35e6d6..20c3dbb57f 100644
--- a/metadata/org.fdroid.fdroid.txt
+++ b/metadata/org.fdroid.fdroid.txt
@@ -26,6 +26,8 @@ but there are many good reasons for using a client/repository setup:
 Please note that while the client itself is FOSS and well inspected by the public, the
 apps themselves may not be. You install them at your own risk. By default, apps which
 may have undesirable behaviour i.e. anti-features, are hidden from view.
+
+[http://f-droid.org/posts/category/news Changelog]
 .
 
 Repo Type:git
@@ -62,8 +64,8 @@ Build Version:0.43,43,!sdk doesn't like tzm (at f2109e4e0bf1597c625221d8d2d10050
 Build Version:0.44,44,!nasty upgrade bug 0.44,target=android-15
 Build Version:0.45,45,0.45,target=android-15
 Build Version:0.46,46,0.46,target=android-15
-Build Version:0.47-test,47,!0.47-test,target=android-17
-Build Version:0.48-test,48,!0.48-test,target=android-17
+Build Version:0.47-test,47,0.47-test,target=android-17
+Build Version:0.48-test,48,0.48-test,target=android-17
 Build Version:0.50,50,0.50
 
 Auto Update Mode:None
diff --git a/metadata/org.ligi.fast.txt b/metadata/org.ligi.fast.txt
index 2e26f7a4ea..490bda8032 100644
--- a/metadata/org.ligi.fast.txt
+++ b/metadata/org.ligi.fast.txt
@@ -4,7 +4,7 @@ Web Site:https://github.com/ligi/FAST/
 Source Code:https://github.com/ligi/FAST
 Issue Tracker:https://github.com/ligi/FAST/issues
 
-Auto Name:FAST App Search Tool
+Auto Name:
 Summary:Find apps just by typing
 Description:
 Find your apps without needing to scroll through lists. It can display icons or

From dad7b3cb423d7a375cdbe5b227a7c09d4834ce5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sat, 24 Aug 2013 13:59:49 +0200
Subject: [PATCH 15/18] Did not mean to commit all changes...

---
 metadata/de.jdsoft.law.txt | 9 ++-------
 metadata/org.ligi.fast.txt | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/metadata/de.jdsoft.law.txt b/metadata/de.jdsoft.law.txt
index 4df5152a17..3f1474b7f8 100644
--- a/metadata/de.jdsoft.law.txt
+++ b/metadata/de.jdsoft.law.txt
@@ -39,13 +39,8 @@ update=.;\
 extern/actionbarsherlock;extern/android-async-http;\
 extern/viewPageIndicator;extern/AmazingListView
 
-Build Version:0.7,10,v0.7,target=android-17,submodules=yes,update=.;\
-extern/Android-ViewPagerIndicator/library;extern/AmazingListView;\
-extern/android-async-http;extern/ActionBarSherlock/actionbarsherlock;\
-extern/UnifiedPreference/library
-
 Auto Update Mode:None
 Update Check Mode:Tags
-Current Version:0.7
-Current Version Code:10
+Current Version:0.6
+Current Version Code:9
 
diff --git a/metadata/org.ligi.fast.txt b/metadata/org.ligi.fast.txt
index 490bda8032..2e26f7a4ea 100644
--- a/metadata/org.ligi.fast.txt
+++ b/metadata/org.ligi.fast.txt
@@ -4,7 +4,7 @@ Web Site:https://github.com/ligi/FAST/
 Source Code:https://github.com/ligi/FAST
 Issue Tracker:https://github.com/ligi/FAST/issues
 
-Auto Name:
+Auto Name:FAST App Search Tool
 Summary:Find apps just by typing
 Description:
 Find your apps without needing to scroll through lists. It can display icons or

From 60009b5ba1e0222c4011c00f6846f9b1ff3c1c80 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sat, 24 Aug 2013 21:28:25 +0300
Subject: [PATCH 16/18] OsmAnd: Fix broken link to download zlib during build.

Also submitted upstream:
https://github.com/osmandapp/OsmAnd-core/pull/24
https://github.com/osmandapp/OsmAnd-tools/pull/57
---
 build/extlib/osmand-zlib-url_145.patch | 15 +++++++++++++++
 metadata/net.osmand.plus.txt           |  5 +++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 build/extlib/osmand-zlib-url_145.patch

diff --git a/build/extlib/osmand-zlib-url_145.patch b/build/extlib/osmand-zlib-url_145.patch
new file mode 100644
index 0000000000..15b7c0687d
--- /dev/null
+++ b/build/extlib/osmand-zlib-url_145.patch
@@ -0,0 +1,15 @@
+Only latest release appears to be hosted on http://zlib.net/
+
+diff --git a/externals/zlib/configure.sh b/externals/zlib/configure.sh
+index e6d4103..c35f74c 100755
+--- a/externals/zlib/configure.sh
++++ b/externals/zlib/configure.sh
+@@ -16,7 +16,7 @@ fi
+ 
+ # Download
+ echo "Zlib Downloading new upstream..."
+-curl -L http://zlib.net/zlib-1.2.7.tar.bz2 > $SRCLOC/upstream.tar.bz2 || { echo "Failed to download!" 1>&2; exit; }
++curl -L http://sourceforge.net/projects/libpng/files/zlib/1.2.7/zlib-1.2.7.tar.bz2/download > $SRCLOC/upstream.tar.bz2 || { echo "Failed to download!" 1>&2; exit; }
+ 
+ # Extract
+ echo "Zlib Extracting upstream..."
diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt
index 2dd84fa363..45d71cf88c 100644
--- a/metadata/net.osmand.plus.txt
+++ b/metadata/net.osmand.plus.txt
@@ -97,14 +97,15 @@ forcevercode=yes,\
 rm=SherlockBar/build.xml,\
 encoding=utf-8,\
 srclibs=tools@bfee93a8d;core@r1.1.4;resources@836be71481,\
-extlibs=perms-osmand_145.diff,\
+extlibs=perms-osmand_145.diff;osmand-zlib-url_145.patch,\
 patch=remove_analytics_android_145.diff,\
 prebuild=rm ../../core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \
          sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
          $$SDK$$/tools/android update project -p ../SherlockBar && \
          sed -i 's/app_version">[^<]*/app_version">1.5-ARM/' \
            res/values/no_translate.xml && sed -i '/keys/d' ant.properties && \
-         cd ../../core/ && git apply ../android/OsmAnd/libs/perms-osmand_145.diff,\
+         cd ../../core/ && git apply ../android/OsmAnd/libs/perms-osmand_145.diff && \
+         git apply ../android/OsmAnd/libs/osmand-zlib-url_145.patch,\
 build=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,\

From 12f86cc401d9ed532831bb43279ce63963729f3c Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sat, 24 Aug 2013 22:28:29 +0300
Subject: [PATCH 17/18] OsmAnd: Don't use branch name as build rev, that's
 moving target.

Instead, I took source tarball as provided on,
https://f-droid.org/repository/browse/?fdid=net.osmand.plus , and
matched that with revisions on r1.5 branch to find out which exact revision
was used to the current version shipped by F-Droid. So, the build now
100% reproducible, and we can know which changes will go in if we make
fresher build from that branch.
---
 metadata/net.osmand.plus.txt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt
index 45d71cf88c..61d4f090e5 100644
--- a/metadata/net.osmand.plus.txt
+++ b/metadata/net.osmand.plus.txt
@@ -56,7 +56,8 @@ cp ../DataExtractionOSM/build/OsmAndMapCreator.jar libs/ && \
 zip -d libs/OsmAndMapCreator.jar net/osmand/LogUtil.class && \
 cp -r ../DataExtractionOSM/build/lib/ libs/
 
-Build Version:1.5-MIPS,143,r1.5,subdir=OsmAnd,\
+# branch r1.5
+Build Version:1.5-MIPS,143,c7f352da989,subdir=OsmAnd,\
 forcevercode=yes,\
 rm=SherlockBar/build.xml,\
 encoding=utf-8,\
@@ -74,7 +75,8 @@ build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_MIPS_ONLY=true ./ndk-build.
       ant build -f ../OsmAnd-java/build.xml,\
 buildjni=no
 
-Build Version:1.5-X86,144,r1.5,subdir=OsmAnd,\
+# branch r1.5
+Build Version:1.5-X86,144,c7f352da989,subdir=OsmAnd,\
 forcevercode=yes,\
 rm=SherlockBar/build.xml,\
 encoding=utf-8,\
@@ -92,7 +94,8 @@ build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_X86_ONLY=true ./ndk-build.s
       ant build -f ../OsmAnd-java/build.xml,\
 buildjni=no
 
-Build Version:1.5-ARM,145,r1.5,subdir=OsmAnd,\
+# branch r1.5
+Build Version:1.5-ARM,145,c7f352da989,subdir=OsmAnd,\
 forcevercode=yes,\
 rm=SherlockBar/build.xml,\
 encoding=utf-8,\

From efa8366d8cd5323c992553141a5c82af43b9f5a1 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sat, 24 Aug 2013 23:54:35 +0300
Subject: [PATCH 18/18] OsmAnd: Actually use revision from r1.5 branch.

Previous revision was same source state, but in master.
---
 metadata/net.osmand.plus.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt
index 61d4f090e5..3c2125ed44 100644
--- a/metadata/net.osmand.plus.txt
+++ b/metadata/net.osmand.plus.txt
@@ -57,7 +57,7 @@ zip -d libs/OsmAndMapCreator.jar net/osmand/LogUtil.class && \
 cp -r ../DataExtractionOSM/build/lib/ libs/
 
 # branch r1.5
-Build Version:1.5-MIPS,143,c7f352da989,subdir=OsmAnd,\
+Build Version:1.5-MIPS,143,0eb598d815c,subdir=OsmAnd,\
 forcevercode=yes,\
 rm=SherlockBar/build.xml,\
 encoding=utf-8,\
@@ -76,7 +76,7 @@ build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_MIPS_ONLY=true ./ndk-build.
 buildjni=no
 
 # branch r1.5
-Build Version:1.5-X86,144,c7f352da989,subdir=OsmAnd,\
+Build Version:1.5-X86,144,0eb598d815c,subdir=OsmAnd,\
 forcevercode=yes,\
 rm=SherlockBar/build.xml,\
 encoding=utf-8,\
@@ -95,7 +95,7 @@ build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_X86_ONLY=true ./ndk-build.s
 buildjni=no
 
 # branch r1.5
-Build Version:1.5-ARM,145,c7f352da989,subdir=OsmAnd,\
+Build Version:1.5-ARM,145,0eb598d815c,subdir=OsmAnd,\
 forcevercode=yes,\
 rm=SherlockBar/build.xml,\
 encoding=utf-8,\