From 571613cd5452e2772b893c783bbab202ff4f401c Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Sat, 29 Jun 2013 16:32:57 +0100
Subject: [PATCH] Update K-9 Mail (org.fdroid.k9) to 4.201-fdroid (16025)

---
 metadata/org.fdroid.k9.txt | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/metadata/org.fdroid.k9.txt b/metadata/org.fdroid.k9.txt
index 969cfa8e28..3c27696f9c 100644
--- a/metadata/org.fdroid.k9.txt
+++ b/metadata/org.fdroid.k9.txt
@@ -9,11 +9,10 @@ Name:K-9 Mail
 Summary:Email client
 Description:
 '''N.B''' This package has a different name to the developer builds of K-9 — 
-therefore, they can be installed alongside this.
+therefore, they can be installed alongside each other.
 
 E-mail client supporting multiple accounts, POP3, IMAP and Push IMAP.
-Packed with features and highly configurable.
-Can do encryption if [[org.thialfihar.android.apg]] is installed ; stay tuned: 
+Can do encryption if [[org.thialfihar.android.apg]] is installed; stay tuned: 
 more GPG clients are coming soon.
 
 Settings and account configurations can be exported so that they can be imported
@@ -30,6 +29,20 @@ donating to the local SPCA
 Repo Type:git
 Repo:https://github.com/k9mail/k-9.git
 
+# 4.2-MAINT branch
+Build Version:4.201-fdroid,16025,7834cdd8ca,\
+forceversion=yes,srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,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* ../../tests,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;\
@@ -85,7 +98,7 @@ $$MVN3$$ package -f HtmlCleaner/pom.xml && \
 mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
 rm -rf HtmlCleaner
 
-Build Version:4.400,17037,4.400,\
+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=\
@@ -136,7 +149,7 @@ 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=\
+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