From 70cd754ec24e017b951b49b507904a83e30f350a Mon Sep 17 00:00:00 2001 From: David Black Date: Wed, 10 Apr 2013 20:35:52 +0100 Subject: [PATCH] rename com.fsck.k9_beta to org.fdroid.k9. Will be used for next stable/beta release, built from source. Still WIP --- metadata/com.fsck.k9.txt | 25 +++--- metadata/com.fsck.k9_beta/package-id.patch | 77 ------------------- ...com.fsck.k9_beta.txt => org.fdroid.k9.txt} | 29 +++---- 3 files changed, 25 insertions(+), 106 deletions(-) delete mode 100644 metadata/com.fsck.k9_beta/package-id.patch rename metadata/{com.fsck.k9_beta.txt => org.fdroid.k9.txt} (52%) diff --git a/metadata/com.fsck.k9.txt b/metadata/com.fsck.k9.txt index 1f9cd6f841..b4d8a5ff18 100644 --- a/metadata/com.fsck.k9.txt +++ b/metadata/com.fsck.k9.txt @@ -6,31 +6,26 @@ Issue Tracker:http://code.google.com/p/k9mail/issues/list Summary:Full-featured email client Description: -E-mail client supporting multiple accounts, POP3, IMAP and Push IMAP. Packed with -features and highly configurable. Import and export of settings is possible so that all that's +E-mail client supporting multiple accounts, POP3, IMAP and Push IMAP. +Packed with +features and highly configurable. +Import and export of settings is possible so that all that's required to setup the app after a wipe is to enter the account passwords. -If you would like to contribute financially to k9mail, please consider donating to the local SPCA +If you would like to contribute financially to k9mail, please consider +donating to the local SPCA (Societies for the prevention of cruelty to animals). -We leave this app as a developer build to minimize the disruption to users a signature switch -would cause. Building the app from source is very straightforward though. Stable releases are +We leave this app as a developer build to minimize the disruption to users a +signature switch +would cause. Building the app from source is very straightforward though. +Stable releases are numbered x.even and they are maintained in their own git branches. . Repo Type:git Repo:https://github.com/k9mail/k-9.git -Build Version:4.330,17031,!might need some revision 4.330,target=android-17,update=.;plugins/HoloColorPicker;\ -plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,prebuild=\ -rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \ -unzip libs/htmlcleaner-2.2-all.zip && $$MVN3$$ install -f HtmlCleaner/pom.xml && \ -mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && rm -rf HtmlCleaner && cd src/com/ && \ -svn co https://jutf7.svn.sourceforge.net/svnroot/jutf7/trunk/src/main/java/com/beetstra/ && \ -wget http://www.jcraft.com/jzlib/jzlib-1.0.7.tar.gz && tar -xf jzlib-1.0.7.tar.gz && \ -mv jzlib-1.0.7/com/* . && rm -rf jzlib* && cd ../.. && $$SDK$$/tools/android \ -update lib-project -p plugins/Android-PullToRefresh/library/ -t android-17 - #Device variable version Update Check Mode:None Current Version:4.201 diff --git a/metadata/com.fsck.k9_beta/package-id.patch b/metadata/com.fsck.k9_beta/package-id.patch deleted file mode 100644 index 5478384467..0000000000 --- a/metadata/com.fsck.k9_beta/package-id.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/custom_rules.xml b/custom_rules.xml -new file mode 100644 -index 0000000..c5a7b4d ---- /dev/null -+++ b/custom_rules.xml -@@ -0,0 +1,41 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/AndroidManifest.xml b/AndroidManifest.xml -index 465fc70..32d6d9c 100644 ---- a/AndroidManifest.xml -+++ b/AndroidManifest.xml -@@ -391,14 +391,14 @@ otherwise it would make K-9 start at the wrong time - - - - - diff --git a/metadata/com.fsck.k9_beta.txt b/metadata/org.fdroid.k9.txt similarity index 52% rename from metadata/com.fsck.k9_beta.txt rename to metadata/org.fdroid.k9.txt index d97197a5c5..0540be439e 100644 --- a/metadata/com.fsck.k9_beta.txt +++ b/metadata/org.fdroid.k9.txt @@ -6,34 +6,35 @@ Issue Tracker:http://code.google.com/p/k9mail/issues/list Summary:Full-featured email client Description: -E-mail client supporting multiple accounts, POP3, IMAP and Push IMAP. Packed with -features and highly configurable. Import and export of settings is possible so that all that's +E-mail client supporting multiple accounts, POP3, IMAP and Push IMAP. +Packed with +features and highly configurable. +Import and export of settings is possible so that all that's required to setup the app after a wipe is to enter the account passwords. -If you would like to contribute financially to k9mail, please consider donating to the local SPCA +If you would like to contribute financially to k9mail, please consider +donating to the local SPCA (Societies for the prevention of cruelty to animals). - -We leave this app as a developer build to minimize the disruption to users a signature switch -would cause. Building the app from source is very straightforward though. Stable releases are -numbered x.even and they are maintained in their own git branches. . Repo Type:git Repo:https://github.com/k9mail/k-9.git -Build Version:4.330,17031,!WIP 4.330,patch=package-id.patch,update=.;plugins/HoloColorPicker;\ -plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,prebuild=\ -echo "android.jar=$$SDK$$/platforms/android-17/android.jar" >> ant.properties && \ +# use script in tools/ or https://github.com/ashleywillis/auto-avd/blob/master/build-cb.sh +Build Version:4.330-fdroid,17031,!need to change package id 4.330,\ +forceversion=yes,update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\ +plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,init=\ +sed -i 's@\(target=\).*@\1android-17@' plugins/Android-PullToRefresh/\ +library/project.properties,prebuild=\ rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \ unzip libs/htmlcleaner-2.2-all.zip && cd src/com/ && \ -svn co https://jutf7.svn.sourceforge.net/svnroot/jutf7/trunk/src/main/java/com/beetstra/ && \ +svn co -r20 https://jutf7.svn.sourceforge.net/svnroot/\ +jutf7/trunk/src/main/java/com/beetstra/ && \ wget http://www.jcraft.com/jzlib/jzlib-1.0.7.tar.gz && tar -xf jzlib-1.0.7.tar.gz && \ mv jzlib-1.0.7/com/* . && rm -rf jzlib*,build=\ $$MVN3$$ package -f HtmlCleaner/pom.xml && \ mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \ rm -rf HtmlCleaner -Update Check Mode:None -Current Version:4.201 -Current Version Code:16025 +Update Check Mode:Static