From 8391bf4ac68a02ad13abd519f0a1b253e6b23532 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Tue, 10 Jan 2012 13:20:27 +0000 Subject: [PATCH 1/8] Metadata: new ShareMyPosition, and aCal current version update --- metadata/com.morphoss.acal.txt | 4 ++-- metadata/net.sylvek.sharemyposition.txt | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/metadata/com.morphoss.acal.txt b/metadata/com.morphoss.acal.txt index 81b42fa956..0ded171ef0 100644 --- a/metadata/com.morphoss.acal.txt +++ b/metadata/com.morphoss.acal.txt @@ -27,5 +27,5 @@ Build Version:1.32,34,r1.32,target=android-8 Build Version:1.33,35,r1.33,target=android-8 Build Version:1.34,36,r1.34,target=android-8 -Market Version:1.33 -Market Version Code:35 +Market Version:1.34 +Market Version Code:36 diff --git a/metadata/net.sylvek.sharemyposition.txt b/metadata/net.sylvek.sharemyposition.txt index 01a010b961..fcb8cc340e 100644 --- a/metadata/net.sylvek.sharemyposition.txt +++ b/metadata/net.sylvek.sharemyposition.txt @@ -14,13 +14,14 @@ The recipient is sent a link to a web service. (The source for the web service is in the same repository as the client). . -Repo Type:svn -Repo:http://sharemyposition.googlecode.com/svn/trunk/ +Repo Type:git-svn #Note - deliberately pulling from trunk, not trunk/ShareMyPosition-android, #even though that would be more efficient, in order to preserve the #corresponding source for the web service in our source tarball. +Repo:http://sharemyposition.googlecode.com/svn/trunk/ Build Version:1.0.11,16,64,subdir=ShareMyPosition-android +Build Version:1.1.0-beta3,20,70,subdir=ShareMyPosition-android,target=android-11,prebuild=mv lib libs -Market Version:1.1.0-beta1 -Market Version Code:18 +Market Version:1.1.0-beta3 +Market Version Code:20 From aad880ed951f5912458c33918c9b55f713bda255 Mon Sep 17 00:00:00 2001 From: Nicolas Raoul Date: Tue, 10 Jan 2012 21:59:09 +0900 Subject: [PATCH 2/8] Ignore logs directory --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ccbb9b7d6b..c8ac960789 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ config.py repo/ +logs/ built/ build/ build_*/ From 043442331b2a88bd7ebb92cf4a4767a458302319 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Tue, 10 Jan 2012 15:24:02 +0000 Subject: [PATCH 3/8] Metadata: some formatting fixes --- metadata/An.stop.txt | 3 ++- metadata/com.funambol.androidsync.txt | 2 +- metadata/com.jadn.cc.txt | 3 ++- metadata/goo.TeaTimer.txt | 5 +++-- metadata/ru.gelin.android.weather.notification.txt | 7 ++++--- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/metadata/An.stop.txt b/metadata/An.stop.txt index b2b7c43b44..5d17306ff3 100644 --- a/metadata/An.stop.txt +++ b/metadata/An.stop.txt @@ -5,7 +5,8 @@ Web Site:http://code.google.com/p/anstop/ Source Code:http://code.google.com/p/anstop/source/checkout Issue Tracker:http://code.google.com/p/anstop/issues/list Summary:A simple stopwatch -Description:A simple stopwatch, that also supports lap timing and a countdown +Description: +A simple stopwatch, that also supports lap timing and a countdown timer. . diff --git a/metadata/com.funambol.androidsync.txt b/metadata/com.funambol.androidsync.txt index 7a31a9e8b9..c66e7893a6 100644 --- a/metadata/com.funambol.androidsync.txt +++ b/metadata/com.funambol.androidsync.txt @@ -5,7 +5,7 @@ Web Site:http://www.funambol.com Source Code:https://android-client.forge.funambol.org/source/browse/android-client/ Issue Tracker: Summary:Funambol sync client -Description:Sync Client +Description: Funambol sync client. . Repo Type:svn diff --git a/metadata/com.jadn.cc.txt b/metadata/com.jadn.cc.txt index fad0aa7ead..d78ff2b0b1 100644 --- a/metadata/com.jadn.cc.txt +++ b/metadata/com.jadn.cc.txt @@ -5,7 +5,8 @@ Source Code:http://github.com/bherrmann7/Car-Cast/ Issue Tracker:https://github.com/bherrmann7/Car-Cast/issues Donate:https://market.android.com/details?id=com.jadn.ccpro Summary:A podcast downloader and player. -Description:Car Cast is a simple audio podcast downloader and player. +Description: +Car Cast is a simple audio podcast downloader and player. Optimized for use in a daily commute, it features big buttons, large text, remembers last played location. 1. Subscribe to podcasts diff --git a/metadata/goo.TeaTimer.txt b/metadata/goo.TeaTimer.txt index 5f704e2ef6..1dd09158d2 100644 --- a/metadata/goo.TeaTimer.txt +++ b/metadata/goo.TeaTimer.txt @@ -4,8 +4,9 @@ Category:Office Web Site:http://solidsushi.com/lab/teatimer Source Code:http://github.com/ralphleon/TeaTimer Issue Tracker:https://github.com/ralphleon/TeaTimer/issues -Summary:A Simple Tea Timer for Android -Description:A straight-forward tea timer +Summary:Simple Tea Timer +Description: +A straight-forward tea timer . Repo Type:git diff --git a/metadata/ru.gelin.android.weather.notification.txt b/metadata/ru.gelin.android.weather.notification.txt index b7689b3753..326f9c6345 100644 --- a/metadata/ru.gelin.android.weather.notification.txt +++ b/metadata/ru.gelin.android.weather.notification.txt @@ -3,9 +3,10 @@ Category:Internet Web Site:https://code.google.com/p/weather-notification-android/ Source Code:https://code.google.com/p/weather-notification-android/source/browse/ Issue Tracker:https://code.google.com/p/weather-notification-android/issues/list -Summary: Displays the air temperature and other weather conditions in the Android notification bar. -Description:Simple application which displays the air temperature -and other weather conditions in the Android notification bar. +Summary:Weather info in notification bar +Description: +Simple application which displays the air temperature +and other weather conditions in the notification bar. The air temperature is always visible like a system clock. . From 4069fe19412392a0da75001f006ed055c11f8f81 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Tue, 10 Jan 2012 15:24:21 +0000 Subject: [PATCH 4/8] Metadata: updated Wordpress version info --- metadata/org.wordpress.android.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata/org.wordpress.android.txt b/metadata/org.wordpress.android.txt index 47471fe892..0e1810873b 100644 --- a/metadata/org.wordpress.android.txt +++ b/metadata/org.wordpress.android.txt @@ -21,5 +21,5 @@ Repo:http://android.svn.wordpress.org/trunk/ Build Version:1.3.9,31,202,prebuild=mkdir libs && mv *.jar libs && sed -i "s@checkStats(accounts.size());@// MY PRIVACY > YOUR STATS@" src/org/wordpress/android/wpAndroid.java,encoding=utf-8 Build Version:1.4.1,33,228,prebuild=mkdir libs && mv *.jar libs && sed -i "s@checkStats(accounts.size());@// MY PRIVACY > YOUR STATS@" src/org/wordpress/android/wpAndroid.java,encoding=utf-8 -Market Version:2.0.2 -Market Version Code:40 +Market Version:2.0.3 +Market Version Code:42 From 5a30fe5e51c4da0377b61fd39308cd989c7bb79e Mon Sep 17 00:00:00 2001 From: Dominik Date: Tue, 10 Jan 2012 18:55:18 +0100 Subject: [PATCH 5/8] AdAway version 1.19 --- metadata/org.adaway.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/metadata/org.adaway.txt b/metadata/org.adaway.txt index 16037a47ea..bf5763e2c9 100644 --- a/metadata/org.adaway.txt +++ b/metadata/org.adaway.txt @@ -18,6 +18,7 @@ Requires Root:yes Build Version:1.12,13,ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9,subdir=org_adaway/,buildjni=yes Build Version:1.15,16,4128e59da2eac5c2904c7c7568d298ca51e79540,subdir=org_adaway/,buildjni=yes,patch=defprop.patch Build Version:1.18,19,0b9985398b9eef7baf6aadd0dbb12002bc199d2e,subdir=org_adaway/,buildjni=yes,patch=defprop.patch +Build Version:1.19,20,ab27f4dab5f3ea5e228cfb4a6b0e1fbf53695f22,subdir=org_adaway/,buildjni=yes -Market Version:1.18 -Market Version Code:19 +Market Version:1.19 +Market Version Code:20 From 3aa4d293d1f909fc518a43f265807a608d2911a5 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Tue, 10 Jan 2012 18:07:59 +0000 Subject: [PATCH 6/8] Metadata: syntax correction --- metadata/org.adaway.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/org.adaway.txt b/metadata/org.adaway.txt index bf5763e2c9..27327b560f 100644 --- a/metadata/org.adaway.txt +++ b/metadata/org.adaway.txt @@ -13,7 +13,7 @@ Blocks advertisements via the /etc/hosts file. Supports automatic updates. Repo Type:git Repo:git://gitorious.org/adaway/adaway.git -Requires Root:yes +Requires Root:Yes Build Version:1.12,13,ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9,subdir=org_adaway/,buildjni=yes Build Version:1.15,16,4128e59da2eac5c2904c7c7568d298ca51e79540,subdir=org_adaway/,buildjni=yes,patch=defprop.patch From a3e273c08a4c0816ed8fcf2143cbe68077cc0baf Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Tue, 10 Jan 2012 18:11:20 +0000 Subject: [PATCH 7/8] Metadata: adaway needs default properties patch --- metadata/org.adaway.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/org.adaway.txt b/metadata/org.adaway.txt index 27327b560f..67392449bc 100644 --- a/metadata/org.adaway.txt +++ b/metadata/org.adaway.txt @@ -18,7 +18,7 @@ Requires Root:Yes Build Version:1.12,13,ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9,subdir=org_adaway/,buildjni=yes Build Version:1.15,16,4128e59da2eac5c2904c7c7568d298ca51e79540,subdir=org_adaway/,buildjni=yes,patch=defprop.patch Build Version:1.18,19,0b9985398b9eef7baf6aadd0dbb12002bc199d2e,subdir=org_adaway/,buildjni=yes,patch=defprop.patch -Build Version:1.19,20,ab27f4dab5f3ea5e228cfb4a6b0e1fbf53695f22,subdir=org_adaway/,buildjni=yes +Build Version:1.19,20,ab27f4dab5f3ea5e228cfb4a6b0e1fbf53695f22,subdir=org_adaway/,buildjni=yes,patch=defprop.patch Market Version:1.19 Market Version Code:20 From 591da153cddc89df7e5227e62792c020bb61afc8 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Tue, 10 Jan 2012 18:57:07 +0000 Subject: [PATCH 8/8] Improved metadata handling Two main points: Firstly, there is no longer a random mapping between app['key'] and a corresponding field in the metadata file - the key and field are now the same. Secondly, more information (including comments) is retrieved from the metadata, to facilitate being able to re-write it which is necessary for various support utilities.