diff --git a/metadata/ch.rrelmy.android.locationcachemap.txt b/metadata/ch.rrelmy.android.locationcachemap.txt
index 32c00b3465..e22e4473b5 100644
--- a/metadata/ch.rrelmy.android.locationcachemap.txt
+++ b/metadata/ch.rrelmy.android.locationcachemap.txt
@@ -1,3 +1,4 @@
+#NonFreeDep can be removed with the Manifest patch below
AntiFeatures:NonFreeDep
Category:System
License:GPLv3
@@ -24,6 +25,10 @@ Repo:https://github.com/rrelmy/LocationCacheMap.git
Build Version:0.6,6,2a1c44
+#Attempting to view your track on the map if you don't have Google maps installed, will crash the app
+#Build Version:0.6,6,2a1c44,prebuild=\
+#sed -i 's///g' AndroidManifest.xml
+
Update Check Mode:RepoManifest
Current Version:0.6
Current Version Code:6
diff --git a/metadata/com.aripuca.tracker.txt b/metadata/com.aripuca.tracker.txt
index a06c716ba4..467b44a6ae 100644
--- a/metadata/com.aripuca.tracker.txt
+++ b/metadata/com.aripuca.tracker.txt
@@ -1,3 +1,4 @@
+#NonFreeDep can be removed with the Manifest patch below
AntiFeatures:NonFreeDep
Category:Navigation
License:Apache2
@@ -21,6 +22,10 @@ Repo:https://code.google.com/p/aripuca-tracker/
Build Version:1.2.3,18,da67eb2d1d6e,target=Google Inc.:Google APIs:10
Build Version:1.2.4,19,v. 1.2.4,target=Google Inc.:Google APIs:10
+#Attempting the view the track on map will crash the app
+#Build Version:1.2.4,19,v. 1.2.4,target=Google Inc.:Google APIs:10,prebuild=\
+#sed -i 's///g' AndroidManifest.xml
+
Auto Update Mode:None
Update Check Mode:Market
Current Version:1.2.4
diff --git a/metadata/com.bvcode.ncopter.txt b/metadata/com.bvcode.ncopter.txt
index d5387feabd..034d42ac97 100644
--- a/metadata/com.bvcode.ncopter.txt
+++ b/metadata/com.bvcode.ncopter.txt
@@ -1,4 +1,3 @@
-AntiFeatures:NonFreeDep
Category:Games
License:GPLv3
Web Site:http://code.google.com/p/copter-gcs
@@ -11,7 +10,7 @@ Provides a GCS for the ArduCopter/ArduPirate family of copters. Status readouts,
PID tuning, calibration (Transmitter and sensors) and sensor readouts. Very useful for tuning in the field.
Note that a Bluetooth to APM link is required. Visit the website for details.
-#check this
+'''check this'''
N.B It isn't possible to view the photos on a map because Google Maps is the only map source and
f-droid can't supply an API key to use it.
.
@@ -24,7 +23,8 @@ Repo:https://code.google.com/p/copter-gcs/
#Build Version:Copter-GCS,9,4ab9b7a66d8d,subdir=copter-gcs,buildjni=no,\
#prebuild=wget http://copter-gcs.googlecode.com/files/jMAVLink.zip && unzip jMAVLink.zip && \
#rm -f jMAVLink.zip && rm -rf release && ndk-build && ndk-build -C jMAVLink && \
-#cp jMAVLink/libs/armeabi/jMAVLink.so libs/armeabi/ && rm -rf jMAVLink
+#cp jMAVLink/libs/armeabi/jMAVLink.so libs/armeabi/ && rm -rf jMAVLink && \
+#sed -i 's///g' AndroidManifest.xml
Update Check Mode:Market
Current Version:Copter-GCS
diff --git a/metadata/com.gmail.charleszq.txt b/metadata/com.gmail.charleszq.txt
index 452f7f66a7..2d6c097676 100644
--- a/metadata/com.gmail.charleszq.txt
+++ b/metadata/com.gmail.charleszq.txt
@@ -1,3 +1,4 @@
+#NonFreeDep can be removed with the Manifest patch below
AntiFeatures:NonFreeDep
Category:Multimedia
License:Apache2
@@ -18,6 +19,10 @@ Repo:http://flickr-viewer-for-honeycomb.googlecode.com/svn/trunk/
#forced API 16 as I don't have API 13
Build Version:1.2.8,19,402,target=Google Inc.:Google APIs:16
+#Attempting to view geotagged photos on the map if you don't have Google maps installed, will crash the app
+#Build Version:1.2.8,19,402,target=Google Inc.:Google APIs:16,prebuild=\
+#sed -i 's/android:required="true"/android:required="false"/g' AndroidManifest.xml
+
Update Check Mode:Market
Current Version:1.2.8
Current Version Code:19
diff --git a/metadata/com.showmehills.txt b/metadata/com.showmehills.txt
index cabbf5733c..3eb35b74e0 100644
--- a/metadata/com.showmehills.txt
+++ b/metadata/com.showmehills.txt
@@ -1,3 +1,4 @@
+#NonFreeDep can be removed with the Manifest patch below
#NonFreeDep because it requires google maps, Tracking because acra is enabled
#by default, although it can be turned off in preferences
AntiFeatures:NonFreeDep,Tracking
@@ -35,6 +36,13 @@ mkdir src && \
echo "sdk.dir=$$SDK$$" >local.properties && \
echo "sdk.dir=$$SDK$$" >../ShowMeX/local.properties
+#Attempting to view the peaks on the map if you don't have Google maps installed, will crash the app
+#Build Version:0.24,24,v0.24,update=no,subdir=ShowMe/ShowMeHills,prebuild=\
+#mkdir src && \
+#echo "sdk.dir=$$SDK$$" >local.properties && \
+#echo "sdk.dir=$$SDK$$" >../ShowMeX/local.properties && \
+#sed -i 's///g' AndroidManifest.xml
+
Auto Update Mode:None
Update Check Mode:Market
Current Version:0.24
diff --git a/metadata/net.codechunk.speedofsound.txt b/metadata/net.codechunk.speedofsound.txt
index c15ec6e7c9..29c642e137 100644
--- a/metadata/net.codechunk.speedofsound.txt
+++ b/metadata/net.codechunk.speedofsound.txt
@@ -1,3 +1,4 @@
+#NonFreeDep can be removed with the Manifest patch below
AntiFeatures:NonFreeDep
Category:Multimedia
License:GPLv2
@@ -22,6 +23,11 @@ Repo:https://github.com/jpeddicord/speedofsound.git
Build Version:0.8.1,8,8dc2de2691b10101f65d9495db6d8c19d3a9f62f,subdir=speedofsound,\
update=.;../actionbarsherlock,target=Google Inc.:Google APIs:15
+#Opening the maps if Google Maps is not installed, crashes the app
+#Build Version:0.8.1,8,8dc2de2691b10101f65d9495db6d8c19d3a9f62f,subdir=speedofsound,\
+#update=.;../actionbarsherlock,target=Google Inc.:Google APIs:15,prebuild=\
+#sed -i 's///g' AndroidManifest.xml
+
Update Check Mode:Tags
Current Version:0.8.1
Current Version Code:8
diff --git a/metadata/net.luniks.android.inetify.txt b/metadata/net.luniks.android.inetify.txt
index d143468374..bf207608cb 100644
--- a/metadata/net.luniks.android.inetify.txt
+++ b/metadata/net.luniks.android.inetify.txt
@@ -1,3 +1,4 @@
+#NonFreeDep can be removed with the Manifest patch below
AntiFeatures:NonFreeDep
Category:Internet
License:Apache2
@@ -22,6 +23,11 @@ Repo:http://inetify.googlecode.com/svn/trunk/
Build Version:2.0.3,16,311,subdir=inetify/inetify-app,update=force,extlibs=android/android-support-v4.jar
+#Attempting to view the map if you don't have Google maps installed, will cause the app to crash
+#Build Version:2.0.3,16,311,subdir=inetify/inetify-app,\
+#update=force,extlibs=android/android-support-v4.jar,prebuild=\
+#sed -i 's///g' AndroidManifest.xml
+
Update Check Mode:Market
Current Version:2.0.3
Current Version Code:16
diff --git a/metadata/org.mixare.txt b/metadata/org.mixare.txt
index d8ce753703..2124b0d68d 100644
--- a/metadata/org.mixare.txt
+++ b/metadata/org.mixare.txt
@@ -1,4 +1,4 @@
-#Google maps
+#NonFreeDep can be removed with the Manifest patch below, but the OSM still may not work
AntiFeatures:NonFreeDep
Category:Navigation
License:GPLv3
@@ -25,6 +25,10 @@ Build Version:0.8.2,23,!b17820b40d59 but need to resolve build issue - now has l
Build Version:0.9.2,26,6450ce9af6,prebuild=rm -f plugins/mixare-library/build.xml && \
$$SDK$$/tools/android update project -p plugins/mixare-library/
+#Build Version:0.9.2,26,6450ce9af6,init=rm plugins/mixare-library/build.xml,\
+#update=.;plugins/mixare-library,prebuild=\
+#sed -i 's///g' AndroidManifest.xml
+
Update Check Mode:Market
Current Version:0.9.2
Current Version Code:26
diff --git a/metadata/org.zeitgeist.movement.txt b/metadata/org.zeitgeist.movement.txt
index f969d4ad0d..f4127c2bdf 100644
--- a/metadata/org.zeitgeist.movement.txt
+++ b/metadata/org.zeitgeist.movement.txt
@@ -1,3 +1,4 @@
+#NonFreeDep may be removed by applying the patch below
AntiFeatures:NonFreeDep
Category:Internet
License:GPLv3
@@ -17,12 +18,19 @@ f-droid can't supply an API key to use it. If you need to use Google Maps instal
from the website.
.
-#use svn as there are a lot of revisions and repo includes media files
Repo Type:svn
-Repo:https://tzm-android.svn.sourceforge.net/svnroot/tzm-android
+#Repo url used for first two builds: contains lots of useless stuff
+#Repo:https://tzm-android.svn.sourceforge.net/svnroot/tzm-android
+Repo:https://tzm-android.svn.sourceforge.net/svnroot/tzm-android/TZM-Android
-Build Version:1.2.3,24,303,subdir=TZM-Android,target=Google Inc.:Google APIs:16
-Build Version:1.2.4,25,316,subdir=TZM-Android,target=Google Inc.:Google APIs:16
+#Commented out because the Repo url has changed
+#Build Version:1.2.3,24,303,subdir=TZM-Android,target=Google Inc.:Google APIs:16
+#Build Version:1.2.4,25,316,subdir=TZM-Android,target=Google Inc.:Google APIs:16
+
+#'''N.B no space after slash'''. The app will crash if maps are opened and Google maps not installed
+#The app doesn't seem to work unless cellular is working!
+#Build Version:1.2.4,25,316,target=Google Inc.:Google APIs:16,prebuild=\
+#sed -i 's///g' AndroidManifest.xml
Update Check Mode:Market
Current Version:1.2.4