From bb7060ad810b7aeb3c305eefd73a006003f06bc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 11 Sep 2013 14:01:57 +0200
Subject: [PATCH] Get rid of org.fdroid.k9; put com.fsck.k9 source builds in
 place

---
 metadata/com.fsck.k9.txt   |  70 +++++++++---
 metadata/org.fdroid.k9.txt | 215 ++-----------------------------------
 2 files changed, 63 insertions(+), 222 deletions(-)

diff --git a/metadata/com.fsck.k9.txt b/metadata/com.fsck.k9.txt
index 1859ca4a9d..0b03f07300 100644
--- a/metadata/com.fsck.k9.txt
+++ b/metadata/com.fsck.k9.txt
@@ -4,34 +4,76 @@ Web Site:http://code.google.com/p/k9mail/
 Source Code:https://github.com/k9mail/k-9
 Issue Tracker:http://code.google.com/p/k9mail/issues/list
 
-Name:K-9 Mail (dev)
 Auto Name:K-9 Mail
 Summary:Full-featured email client
 Description:
-This is the K-9 Mail development team's build. For a better update experience
-via F-Droid, we recommend switching to the F-Droid build: [[org.fdroid.k9]]. 
-You can install it alongside this version, and easily migrate your accounts 
-and settings.
-
 E-mail client supporting multiple accounts, POP3, IMAP and Push IMAP.
 Can do encryption if [[org.thialfihar.android.apg]] is installed.
 Settings and account configurations can be exported so that they can be imported
 easily if you are switching packages/signatures: a file manager will need to be 
 already installed to achieve this.
 
-If you would like to contribute financially to k9mail, consider 
-donating to the local SPCA (Societies for the prevention of cruelty to animals).
+If you would like to contribute financially to k9mail, consider donating to
+the local SPCA (Societies for the prevention of cruelty to animals).
 
-[https://github.com/k9mail/k-9/wiki/ReleaseNotes Major version notes] ; 
+[https://github.com/k9mail/k-9/wiki/ReleaseNotes Major version notes]
 [https://github.com/k9mail/k-9/raw/master/res/raw/changelog.xml Changelog]
 .
 
 Repo Type:git
 Repo:https://github.com/k9mail/k-9.git
 
-Auto Update Mode:None
-# Device variable version; Tags cover beta versions
-Update Check Mode:None
-Current Version:4.403
-Current Version Code:17040
+Build Version:4.201,16025,7834cdd8ca,\
+srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
+prebuild=\
+    chmod +x tools/build-beta && ./tools/build-beta && \
+    rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
+    mkdir -p tests/res/ && unzip libs/htmlcleaner-2.2-all.zip && \
+    cp -r $$Jutf7$$/src/main/java/com/ src/  && \
+    tar xzf libs/jzlib-1.0.7.tar.gz && mv jzlib-1.0.7/com/jcraft src/com/ && \
+    rm -rf libs/jzlib* libs/htmlcleaner*.zip jzlib*,\
+build=\
+    $$MVN3$$ package -f HtmlCleaner/pom.xml && \
+    mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
+    rm -rf HtmlCleaner
+Build Version:4.409,17046,4.409,target=android-17,\
+srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
+update=.;\
+    plugins/HoloColorPicker;\
+    plugins/Android-PullToRefresh/library;\
+    plugins/ckChangeLog/library;\
+    plugins/ActionBarSherlock/library,\
+prebuild=chmod +x tools/build-beta && ./tools/build-beta && \
+    rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
+    mkdir -p tests/res/ && unzip libs/htmlcleaner-2.2-all.zip && \
+    cp -r $$Jutf7$$/src/main/java/com/ src/ && \
+    tar xzf libs/jzlib-1.0.7.tar.gz && \
+    mv jzlib-1.0.7/com/jcraft src/com/ && \
+    rm -rf libs/jzlib* libs/htmlcleaner*.zip jzlib*,\
+build=$$MVN3$$ package -f HtmlCleaner/pom.xml && \
+    mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/
+#
+#Build Version:4.505,18005,4.505,\
+#srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
+#update=.;\
+#    plugins/HoloColorPicker;\
+#    plugins/Android-PullToRefresh/library;\
+#    plugins/ckChangeLog/library;\
+#    plugins/ActionBarSherlock/library,\
+#prebuild=\
+#    ./tools/build-beta && \
+#    rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
+#    mkdir -p tests/res/ && unzip libs/htmlcleaner-2.2-all.zip && \
+#    cp -r $$Jutf7$$/src/main/java/com/ src/  && \
+#    tar xzf libs/jzlib-1.0.7.tar.gz && mv jzlib-1.0.7/com/jcraft src/com/ && \
+#    rm -rf libs/jzlib* libs/htmlcleaner*.zip jzlib*,\
+#build=\
+#    $$MVN3$$ package -f HtmlCleaner/pom.xml && \
+#    mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
+#    rm -rf HtmlCleaner
+
+Auto Update Mode:None
+Update Check Mode:RepoManifest/4.4-MAINT
+Current Version:4.409
+Current Version Code:17046
 
diff --git a/metadata/org.fdroid.k9.txt b/metadata/org.fdroid.k9.txt
index 37a2e26699..ea040a6f0b 100644
--- a/metadata/org.fdroid.k9.txt
+++ b/metadata/org.fdroid.k9.txt
@@ -1,3 +1,5 @@
+# Keep it for ~1week to alert users who switched
+#Disabled:Replaced by original com.fsck.k9
 Category:Office
 License:Apache2
 Web Site:http://code.google.com/p/k9mail
@@ -5,185 +7,18 @@ Source Code:https://github.com/k9mail/k-9
 Issue Tracker:http://code.google.com/p/k9mail/issues/list
 
 Auto Name:K-9 Mail
-Name:K-9 Mail~
+Name:K-9 Mail (old)
 Summary:Full-featured email client
 Description:
-This package only contains versions built from source by F-Droid.
-There should be very little difference with the developer package.
-However, be warned that apps found elsewhere that integrate with K-9 may not 
-work with these versions. 
-
-E-mail client supporting multiple accounts, POP3, IMAP and Push IMAP.
-Can do encryption if [[org.thialfihar.android.apg]] is installed.
-Settings and account configurations can be exported so that they can be imported
-easily if you are switching packages/signatures: a file manager will need to be 
-already installed to achieve this.
-
-If you would like to contribute financially to k9mail, consider
-donating to the local SPCA (societies for the prevention of cruelty to animals).
-
-[https://github.com/k9mail/k-9/wiki/ReleaseNotes Major version notes] ; 
-[https://github.com/k9mail/k-9/raw/4.4-MAINT/res/raw/changelog.xml Changelog]
+This package has been deprecated in favour of the original [[com.fsck.k9]],
+since we are now able to build stable releases from source. Please switch to
+that one. You will be able to easily export your settings and then import them
+again, without needing to reconfigure anything.
 .
 
-# new changelog URL
-#[https://github.com/k9mail/k-9/raw/master/res/xml/changelog_master.xml Changelog]
-
 Repo Type:git
 Repo:https://github.com/k9mail/k-9.git
 
-# 4.2-MAINT branch
-Build Version:4.201,16025,7834cdd8ca,srclibs=Jutf7@20,\
-extlibs=jzlib/jzlib-1.0.7.tar.gz,patch=packageid-temp.patch,prebuild=\
-chmod +x tools/build-beta && ./tools/build-beta && \
-rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
-mkdir -p tests/res/ && unzip libs/htmlcleaner-2.2-all.zip && \
-cp -r $$Jutf7$$/src/main/java/com/ src/  && \
-tar xzf libs/jzlib-1.0.7.tar.gz && mv jzlib-1.0.7/com/jcraft src/com/ && \
-rm -rf libs/jzlib* libs/htmlcleaner*.zip jzlib*,build=\
-$$MVN3$$ package -f HtmlCleaner/pom.xml && \
-mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
-rm -rf HtmlCleaner
-
-Build Version:4.330-fdroid,17031,!4.330,\
-forceversion=yes,srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
-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=\
-sed -i 's/com\/fsck\/k9beta/org\/fdroid\/k9/g;\
-s/com.fsck.k9beta/org.fdroid.k9/g;11\,17d' tools/build-beta && \
-mkdir -p src/org/fdroid && chmod +x tools/build-beta && \
-./tools/build-beta && \
-rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
-unzip libs/htmlcleaner-2.2-all.zip && cd src/com/ && \
-cp -r ../../$$Jutf7$$/src/main/java/com/beetstra .  && \
-tar xzf ../../libs/jzlib-1.0.7.tar.gz && mv jzlib-1.0.7/com/* . && \
-rm -rf ../../libs/jzlib* ../../libs/htmlcleaner*.zip jzlib*,build=\
-$$MVN3$$ package -f HtmlCleaner/pom.xml && \
-mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
-rm -rf HtmlCleaner
-Build Version:4.331-fdroid,17032,!4.331,\
-forceversion=yes,srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
-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=\
-sed -i 's/com\/fsck\/k9beta/org\/fdroid\/k9/g;\
-s/com.fsck.k9beta/org.fdroid.k9/g;11\,17d' tools/build-beta && \
-mkdir -p src/org/fdroid && chmod +x tools/build-beta && \
-./tools/build-beta && \
-rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
-unzip libs/htmlcleaner-2.2-all.zip && cd src/com/ && \
-cp -r ../../$$Jutf7$$/src/main/java/com/beetstra .  && \
-tar xzf ../../libs/jzlib-1.0.7.tar.gz && mv jzlib-1.0.7/com/* . && \
-rm -rf ../../libs/jzlib* ../../libs/htmlcleaner*.zip jzlib*,build=\
-$$MVN3$$ package -f HtmlCleaner/pom.xml && \
-mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
-rm -rf HtmlCleaner
-Build Version:4.393-fdroid,17036,!4.393,\
-forceversion=yes,srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
-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=\
-sed -i 's/com\/fsck\/k9beta/org\/fdroid\/k9/g;\
-s/com.fsck.k9beta/org.fdroid.k9/g;11\,17d' tools/build-beta && \
-mkdir -p src/org/fdroid && chmod +x tools/build-beta && \
-./tools/build-beta && \
-rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
-unzip libs/htmlcleaner-2.2-all.zip && cd src/com/ && \
-cp -r ../../$$Jutf7$$/src/main/java/com/beetstra .  && \
-tar xzf ../../libs/jzlib-1.0.7.tar.gz && mv jzlib-1.0.7/com/* . && \
-rm -rf ../../libs/jzlib* ../../libs/htmlcleaner*.zip jzlib*,build=\
-$$MVN3$$ package -f HtmlCleaner/pom.xml && \
-mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
-rm -rf HtmlCleaner
-
-Build Version:4.400,17037,!4.400,\
-srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
-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=\
-sed -i 's/com\/fsck\/k9beta/org\/fdroid\/k9/g;\
-s/com.fsck.k9beta/org.fdroid.k9/g;11\,17d' tools/build-beta && \
-mkdir -p src/org/fdroid && chmod +x tools/build-beta && \
-./tools/build-beta && \
-rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
-unzip libs/htmlcleaner-2.2-all.zip && cd src/com/ && \
-cp -r ../../$$Jutf7$$/src/main/java/com/beetstra .  && \
-tar xzf ../../libs/jzlib-1.0.7.tar.gz && mv jzlib-1.0.7/com/* . && \
-rm -rf ../../libs/jzlib* ../../libs/htmlcleaner*.zip jzlib*,build=\
-$$MVN3$$ package -f HtmlCleaner/pom.xml && \
-mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
-rm -rf HtmlCleaner
-Build Version:4.401-fdroid,17038,!4.401,forceversion=yes,\
-srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
-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=\
-sed -i 's/com\/fsck\/k9beta/org\/fdroid\/k9/g;\
-s/com.fsck.k9beta/org.fdroid.k9/g;11\,17d' tools/build-beta && \
-mkdir -p src/org/fdroid && chmod +x tools/build-beta && \
-./tools/build-beta && \
-rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
-unzip libs/htmlcleaner-2.2-all.zip && cd src/com/ && \
-cp -r ../../$$Jutf7$$/src/main/java/com/beetstra .  && \
-tar xzf ../../libs/jzlib-1.0.7.tar.gz && mv jzlib-1.0.7/com/* . && \
-rm -rf ../../libs/jzlib* ../../libs/htmlcleaner*.zip jzlib*,build=\
-$$MVN3$$ package -f HtmlCleaner/pom.xml && \
-mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
-rm -rf HtmlCleaner
-# use the build-beta script from the master branch instead
-Build Version:4.403,17040,!4.403,\
-srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
-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,patch=packageid-temp.patch,prebuild=\
-chmod +x tools/build-beta && ./tools/build-beta && \
-rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
-mkdir -p tests/res/ && unzip libs/htmlcleaner-2.2-all.zip && \
-cp -r $$Jutf7$$/src/main/java/com/ src/  && \
-tar xzf libs/jzlib-1.0.7.tar.gz && mv jzlib-1.0.7/com/jcraft src/com/ && \
-rm -rf libs/jzlib* libs/htmlcleaner*.zip jzlib*,build=\
-$$MVN3$$ package -f HtmlCleaner/pom.xml && \
-mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
-rm -rf HtmlCleaner
-Build Version:4.404,17041,!4.404,\
-srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
-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,patch=packageid-temp.patch,prebuild=\
-chmod +x tools/build-beta && ./tools/build-beta && \
-rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
-mkdir -p tests/res/ && unzip libs/htmlcleaner-2.2-all.zip && \
-cp -r $$Jutf7$$/src/main/java/com/ src/  && \
-tar xzf libs/jzlib-1.0.7.tar.gz && mv jzlib-1.0.7/com/jcraft src/com/ && \
-rm -rf libs/jzlib* libs/htmlcleaner*.zip jzlib*,build=\
-$$MVN3$$ package -f HtmlCleaner/pom.xml && \
-mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
-rm -rf HtmlCleaner
-Build Version:4.407,17044,4.407,\
-init=sed -i 's@\(target=\).*@\1android-17@' plugins/Android-PullToRefresh/\
-library/project.properties,\
-update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\
-plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,\
-srclibs=Jutf7@20,\
-extlibs=jzlib/jzlib-1.0.7.tar.gz,\
-patch=packageid-temp.patch,\
-prebuild=chmod +x tools/build-beta && ./tools/build-beta && \
-         rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
-         mkdir -p tests/res/ && unzip libs/htmlcleaner-2.2-all.zip && \
-         cp -r $$Jutf7$$/src/main/java/com/ src/ && \
-         tar xzf libs/jzlib-1.0.7.tar.gz && \
-         mv jzlib-1.0.7/com/jcraft src/com/ && \
-         rm -rf libs/jzlib* libs/htmlcleaner*.zip jzlib*,\
-build=$$MVN3$$ package -f HtmlCleaner/pom.xml && \
-      mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/
 Build Version:4.409,17046,4.409,\
 init=sed -i 's@\(target=\).*@\1android-17@' plugins/Android-PullToRefresh/\
 library/project.properties,\
@@ -202,42 +37,6 @@ prebuild=chmod +x tools/build-beta && ./tools/build-beta && \
 build=$$MVN3$$ package -f HtmlCleaner/pom.xml && \
       mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/
 
-Build Version:4.502,18002,!4.502,\
-srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
-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,patch=packageid-temp.patch,prebuild=\
-chmod +x tools/build-beta && ./tools/build-beta && \
-rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
-mkdir -p tests/res/ && unzip libs/htmlcleaner-2.2-all.zip && \
-cp -r $$Jutf7$$/src/main/java/com/ src/  && \
-tar xzf libs/jzlib-1.0.7.tar.gz && mv jzlib-1.0.7/com/jcraft src/com/ && \
-rm -rf libs/jzlib* libs/htmlcleaner*.zip jzlib*,build=\
-$$MVN3$$ package -f HtmlCleaner/pom.xml && \
-mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
-rm -rf HtmlCleaner
-Build Version:4.505,18005,!4.505,\
-srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
-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,patch=packageid.patch,prebuild=\
-chmod +x tools/build-beta && ./tools/build-beta && \
-rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
-mkdir -p tests/res/ && unzip libs/htmlcleaner-2.2-all.zip && \
-cp -r $$Jutf7$$/src/main/java/com/ src/  && \
-tar xzf libs/jzlib-1.0.7.tar.gz && mv jzlib-1.0.7/com/jcraft src/com/ && \
-rm -rf libs/jzlib* libs/htmlcleaner*.zip jzlib*,build=\
-$$MVN3$$ package -f HtmlCleaner/pom.xml && \
-mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
-rm -rf HtmlCleaner
-
-# Should think about providing maintenance updates for 4.400 when 4.600 arrives
-# K9 have their own fork of jzlib and jutf7 that won't change very often
 Auto Update Mode:None
-# RM/4.4-MAINT would work but the package ID is different
 Update Check Mode:None
-Current Version:4.409
-Current Version Code:17046