Merge commit 'refs/merge-requests/34' of git://gitorious.org/f-droid/fdroidserver into merge-requests/34

README

@@ -207,6 +207,7 @@ the following values, describing an AntiFeature the application has:
   "Tracking" - the application tracks and reports your activity to somewhere
   "NonFreeNet" - the application promotes a non-Free network service
   "NonFreeAdd" - the application promotes non-Free add-ons
+  "NonFreeDep" - the application depends on another non-Free application (e.g. Google Maps)
 
 ==Disabled==
 

common.py

@@ -295,6 +295,7 @@ def parse_metadata(metafile, **kw):
                     if (part != "Ads" and
                         part != "Tracking" and
                         part != "NonFreeNet" and
+                        part != "NonFreeDep" and
                         part != "NonFreeAdd"):
                         print "Unrecognised antifeature '" + part + "' in " \
                             + metafile.name

metadata/com.google.android.maps.mytracks.txt

@@ -1,5 +1,6 @@
 Use Built:Yes
 License:Apache2
+AntiFeatures:NonFreeDep
 Category:Navigation
 Web Site:http://code.google.com/p/mytracks/
 Source Code:http://code.google.com/p/mytracks/source/checkout

metadata/com.ichi2.anki.txt

@@ -1,6 +1,6 @@
 Category:Games
-License:GPLv3+
-Web Site:http://ichi2.net/anki/wiki/AnkiDroid
+License:GPLv3
+Web Site:https://code.google.com/p/ankidroid/wiki/Index
 Source Code:http://github.com/nicolas-raoul/Anki-Android/
 Issue Tracker:http://code.google.com/p/ankidroid/issues
 Summary:A flashcard-based study aid

metadata/info.staticfree.android.units.txt

@@ -12,7 +12,7 @@ Repo Type:git
 Repo:git://staticfree.info/git/Units/
 Build Version:0.8,7,8be8c10c67152783b6871a70d077a0758e5086ba
 Build Version:0.9,8,3cde1f8d6b822ddcee23f984fab53e7bad3817df
-
+Build Version:1.0,9,1db6cd055203bd2f15eaffd7a780db2ee22974af
 
 Market Version:1.0
 Market Version Code:9

metadata/nl.sogeti.android.gpstracker.txt

@@ -1,4 +1,5 @@
 License:GPLv3
+AntiFeatures:NonFreeDep
 Category:Navigation
 Web Site:http://code.google.com/p/open-gpstracker/
 Source Code:http://code.google.com/p/open-gpstracker/source/checkout

metadata/org.kost.externalip.txt

@@ -1,4 +1,5 @@
 License:GPLv3
+Category:Internet
 Web Site:https://code.google.com/p/external-ip/
 Source Code:https://code.google.com/p/external-ip/source/checkout
 Issue Tracker:https://code.google.com/p/external-ip/issues/list