From 9b0f44f733585e8ca2c5b8b35407a02b12a6e617 Mon Sep 17 00:00:00 2001 From: David Black Date: Sun, 30 Jun 2013 18:58:37 +0100 Subject: [PATCH] disable dashclock k9 apps ;replace with one new package ... reasons are to do with fact that our k-9 build has a different package name and any extensions we have published thus far only work with the developer build. To help people using both packages we fork the package name for the dashclock k9 app and remove the less fully featured one, for simplicity. --- metadata/com.grapefruitopia.dashclock.k9.txt | 16 ++++----- metadata/de.cketti.dashclock.k9.txt | 19 +++++----- metadata/org.fdroid.dashclock.k9.txt | 32 +++++++++++++++++ .../org.fdroid.dashclock.k9/packageid.patch | 36 +++++++++++++++++++ 4 files changed, 83 insertions(+), 20 deletions(-) create mode 100644 metadata/org.fdroid.dashclock.k9.txt create mode 100644 metadata/org.fdroid.dashclock.k9/packageid.patch diff --git a/metadata/com.grapefruitopia.dashclock.k9.txt b/metadata/com.grapefruitopia.dashclock.k9.txt index 12d8fb40d9..59a368c8cd 100644 --- a/metadata/com.grapefruitopia.dashclock.k9.txt +++ b/metadata/com.grapefruitopia.dashclock.k9.txt @@ -1,3 +1,4 @@ +Disabled:Use org.fdroid.dashclock.k9 instead Category:Wallpaper License:Apache2 Web Site: @@ -10,8 +11,9 @@ Summary:Display email info on the lockscreen Description: [[net.nurik.roman.dashclock]] extension that displays the number of unread emails from [[org.fdroid.k9]]. -'''Only works with our K-9 package.''' -Marking messages as read only works for v4.4xx of K-9. +'''Only works with our Official K-9 package.''' +Marking messages as read in K-9 only reliably updates the unread count +for v4.4xx of K-9. . Repo Type:git @@ -21,13 +23,9 @@ Build Version:1.1.0.1,1101,!3ded5013c3,srclibs=DashClock@v1.2,rm=libs/dashclock- echo 'source.dir=src;$$DashClock$$/api/src' >> project.properties Build Version:1.1.1.0,1110,!042f693,srclibs=DashClock@v1.2,rm=libs/dashclock-api-r1.1.jar,prebuild=\ echo 'source.dir=src;$$DashClock$$/api/src' >> project.properties -Build Version:1.1.1.1,1111,042f693,srclibs=DashClock@v1.2,\ -rm=libs/dashclock-api-r1.1.jar,prebuild=\ -find . -type f -print0 | xargs -0 sed -i 's/com.fsck.k9/org.fdroid.k9/g' && \ -cp -r $$DashClock$$/api/src/com src/ Auto Update Mode:None -Update Check Mode:None -Current Version:1.1.1.1 -Current Version Code:1111 +Update Check Mode:Static +Current Version:1.1.1.0 +Current Version Code:1110 diff --git a/metadata/de.cketti.dashclock.k9.txt b/metadata/de.cketti.dashclock.k9.txt index bacf447349..6d6b150863 100644 --- a/metadata/de.cketti.dashclock.k9.txt +++ b/metadata/de.cketti.dashclock.k9.txt @@ -1,29 +1,26 @@ +Disabled:Use org.fdroid.dashclock.k9 instead Category:Wallpaper License:Apache2 Web Site: Source Code:https://github.com/cketti/DashClock_K-9 Issue Tracker:https://github.com/cketti/DashClock_K-9/issues -Name:DashClock: K-9 Unread #1 +Name:DashClock: K-9 Unread (Official) Auto Name:K-9 Mail DashClock Extension Summary:Display email info on the lockscreen Description: [[net.nurik.roman.dashclock]] extension that displays the number of -unread emails from [[org.fdroid.k9]], from your choice of accounts. -'''Only works with our K-9 package.''' -Marking messages as read only works for v4.4xx of K-9. +unread emails from [[org.fdroid.k9]]. +'''Only works with our Official K-9 package.''' +Marking messages as read in K-9 only reliably updates the unread count +for v4.4xx of K-9. . Repo Type:git Repo:https://github.com/cketti/DashClock_K-9.git -Build Version:1.0,1,release-v1.0 -Build Version:1.0.1,2,release-v1.0,prebuild=\ -find . -type f -print0 | xargs -0 sed -i 's/com.fsck.k9/org.fdroid.k9/g' +Build Version:1.0,1,!will only work with com.fsck.k9 at release-v1.0 Auto Update Mode:None -# Tags -Update Check Mode:None -Current Version:1.0.1 -Current Version Code:2 +Update Check Mode:Static diff --git a/metadata/org.fdroid.dashclock.k9.txt b/metadata/org.fdroid.dashclock.k9.txt new file mode 100644 index 0000000000..9b69bdd13d --- /dev/null +++ b/metadata/org.fdroid.dashclock.k9.txt @@ -0,0 +1,32 @@ +Category:Wallpaper +License:Apache2 +Web Site: +Source Code:https://github.com/cketti/DashClock_K-9 +Issue Tracker:https://github.com/cketti/DashClock_K-9/issues + +Name:DashClock: K-9 Unread Count +Auto Name:K-9 Mail DashClock Extension +Summary:Display email info on the lockscreen +Description: +[[net.nurik.roman.dashclock]] extension that displays the number of +unread emails from [[org.fdroid.k9]], from your choice of accounts. + +'''Only works with our K-9 package. The package name for this has +been changed, so you can install the official build too and have it work +with the official build of K-9.''' + +Marking messages as read in K-9 only reliably updates the unread count +for v4.4xx of K-9. +. + +Repo Type:git +Repo:https://github.com/cketti/DashClock_K-9.git + +Build Version:1.0-fdroid,1,release-v1.0,forceversion=yes,patch=packageid.patch,\ +prebuild=find . -type f -print0 | xargs -0 sed -i 's/com.fsck.k9/org.fdroid.k9/g' + +Auto Update Mode:None +Update Check Mode:None +Current Version:1.0.1 +Current Version Code:2 + diff --git a/metadata/org.fdroid.dashclock.k9/packageid.patch b/metadata/org.fdroid.dashclock.k9/packageid.patch new file mode 100644 index 0000000000..4bba29c1f1 --- /dev/null +++ b/metadata/org.fdroid.dashclock.k9/packageid.patch @@ -0,0 +1,36 @@ +diff --git a/ant.properties b/ant.properties +new file mode 100644 +index 0000000..19d5431 +--- /dev/null ++++ b/ant.properties +@@ -0,0 +1 @@ ++android.jar=/home/gerry/android-sdk-linux/platforms/android-17/android.jar +diff --git a/build.xml b/build.xml +index 820fcd0..278fd07 100644 +--- a/build.xml ++++ b/build.xml +@@ -88,5 +88,23 @@ + --> + + +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +