From e583185f87e5102e7c06abf09754e51326154ecf Mon Sep 17 00:00:00 2001 From: Ivo Ugrina Date: Mon, 3 Oct 2011 23:01:32 +0200 Subject: [PATCH 1/7] units v1.0 --- metadata/info.staticfree.android.units.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/metadata/info.staticfree.android.units.txt b/metadata/info.staticfree.android.units.txt index b8b43ee8..a212a123 100644 --- a/metadata/info.staticfree.android.units.txt +++ b/metadata/info.staticfree.android.units.txt @@ -11,7 +11,9 @@ 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,target=android-10 -Market Version:0.9 -Market Version Code:8 + +Market Version:1.0 +Market Version Code:9 From c722f06a8a6a79f89ece725caa84cbfd7bdaf28c Mon Sep 17 00:00:00 2001 From: Ivo Ugrina Date: Fri, 7 Oct 2011 14:31:34 +0200 Subject: [PATCH 2/7] remove merge leftovers --- metadata/info.staticfree.android.units.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/metadata/info.staticfree.android.units.txt b/metadata/info.staticfree.android.units.txt index b826203e..0152e190 100644 --- a/metadata/info.staticfree.android.units.txt +++ b/metadata/info.staticfree.android.units.txt @@ -14,10 +14,5 @@ Build Version:0.8,7,8be8c10c67152783b6871a70d077a0758e5086ba Build Version:0.9,8,3cde1f8d6b822ddcee23f984fab53e7bad3817df Build Version:1.0,9,1db6cd055203bd2f15eaffd7a780db2ee22974af,target=android-10 - -<<<<<<< HEAD - -======= ->>>>>>> upstream/master Market Version:1.0 Market Version Code:9 From 6a29e51b468175849db7e7c29e879703b8f18a02 Mon Sep 17 00:00:00 2001 From: Ivo Ugrina Date: Sat, 8 Oct 2011 00:23:29 +0200 Subject: [PATCH 3/7] added antiNonFreeDep --- README | 1 + common.py | 1 + 2 files changed, 2 insertions(+) diff --git a/README b/README index 14ede1a3..f10a9a3c 100644 --- a/README +++ b/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== diff --git a/common.py b/common.py index d1d223ce..057ecc07 100644 --- a/common.py +++ b/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 From bbfd3bef467ccebd4adbd50e27cbbafeb26348f0 Mon Sep 17 00:00:00 2001 From: Ivo Ugrina Date: Sat, 8 Oct 2011 00:59:38 +0200 Subject: [PATCH 4/7] AntiFeatures:NonFreeNet to OpenGPSTracker and MyTracks --- metadata/com.google.android.maps.mytracks.txt | 1 + metadata/nl.sogeti.android.gpstracker.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/metadata/com.google.android.maps.mytracks.txt b/metadata/com.google.android.maps.mytracks.txt index 185b37f2..4c36162e 100644 --- a/metadata/com.google.android.maps.mytracks.txt +++ b/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 diff --git a/metadata/nl.sogeti.android.gpstracker.txt b/metadata/nl.sogeti.android.gpstracker.txt index aec00652..46ef6d8d 100644 --- a/metadata/nl.sogeti.android.gpstracker.txt +++ b/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 From 4a4c7055db34b110f56664f5a7ecfec30121a184 Mon Sep 17 00:00:00 2001 From: Ivo Ugrina Date: Sat, 8 Oct 2011 01:17:15 +0200 Subject: [PATCH 5/7] returned metadata for fdroid to original --- metadata/org.fdroid.fdroid.txt | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/metadata/org.fdroid.fdroid.txt b/metadata/org.fdroid.fdroid.txt index 3ba1686f..3d3f0820 100644 --- a/metadata/org.fdroid.fdroid.txt +++ b/metadata/org.fdroid.fdroid.txt @@ -1,15 +1,26 @@ -License: -Web Site:http://www.f-droid.org -Source Code:https://gitorious.org/f-droid/fdroidclient -Issue Tracker: -Donate: -Summary: +Use Built:Yes +License:GPLv2+ +Category:System +Web Site:http://f-droid.org/repository +Source Code:http://gitorious.org/f-droid/fdroidclient +Issue Tracker:http://f-droid.org/issues +Summary:FOSS application repository Description: - +FDroid is a... wait a minute. You're running it, how can you not know what +it is? . - Repo Type:git -Repo:https://git.gitorious.org/f-droid/fdroidclient.git +Repo:git://gitorious.org/f-droid/fdroidclient.git -Build Version:20111003,20111003,0ee3407 +#These ones are already in the repo as binaries... +#Build Version:0.12,3,651696a49be2cd7db5ce6a2fa8185e31f9a20035 +#Build Version:0.13,4,4f677285cc2cf0b7e7feb5c9acf61791bec15fbc +#Build Version:0.16,7,78325dad91a263437ca4ea1210bd494446c4d003 + +Build Version:0.17,8,c626ce5f6d3e10ae15942f01ff028be310cc695a +Build Version:0.18,9,a6c9ed8d06b19315df9ba9041324f78139f7d238 +Build Version:0.19,10,540b7d0522f4d67a4896697f7342e4c75b4cbf59 +Build Version:0.20,11,ddacfb856ad66c1c367e20c9cbecbfb15fe00813 +Build Version:0.21,12,49fa56aa6626a190f2d711120b69e435e9e615b1 +Build Version:0.22,13,a6a33c942495cc4c74a7cb6e968efe0e00815e68 From c21bd87634989f5f7d67e0b5d048479d601f4493 Mon Sep 17 00:00:00 2001 From: Ivo Ugrina Date: Sat, 8 Oct 2011 10:41:01 +0200 Subject: [PATCH 6/7] categorized ExternalIP --- metadata/org.kost.externalip.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/metadata/org.kost.externalip.txt b/metadata/org.kost.externalip.txt index 96e20d81..2aaa395b 100644 --- a/metadata/org.kost.externalip.txt +++ b/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 From 33cb249a713bd32ab84de4b17bc2e3c8db528da2 Mon Sep 17 00:00:00 2001 From: Ivo Ugrina Date: Sat, 8 Oct 2011 12:01:24 +0200 Subject: [PATCH 7/7] removed target=... from units v1.0 --- metadata/info.staticfree.android.units.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/info.staticfree.android.units.txt b/metadata/info.staticfree.android.units.txt index 0152e190..35a22b29 100644 --- a/metadata/info.staticfree.android.units.txt +++ b/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,target=android-10 +Build Version:1.0,9,1db6cd055203bd2f15eaffd7a780db2ee22974af Market Version:1.0 Market Version Code:9