From 578debe39652890e269e12ff457e9cd1d806c452 Mon Sep 17 00:00:00 2001
From: F-Droid Builder <admin@f-droid.org>
Date: Sun, 22 Jun 2014 02:02:45 +0100
Subject: [PATCH] Update K-9 Mail to 4.804 (20005)

---
 metadata/com.fsck.k9.txt | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/metadata/com.fsck.k9.txt b/metadata/com.fsck.k9.txt
index 2429ae6801..0c5764fbb5 100644
--- a/metadata/com.fsck.k9.txt
+++ b/metadata/com.fsck.k9.txt
@@ -29,8 +29,8 @@ Repo:https://github.com/k9mail/k-9.git
 
 Build:4.201,16025
     commit=7834cdd8ca
-    extlibs=jzlib/jzlib-1.0.7.tar.gz
     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 && \
@@ -46,10 +46,8 @@ Build:4.201,16025
 
 Build:4.409,17046
     commit=4.409
-    target=android-17
-    update=.,plugins/HoloColorPicker,plugins/Android-PullToRefresh/library,plugins/ckChangeLog/library,plugins/ActionBarSherlock/library
-    extlibs=jzlib/jzlib-1.0.7.tar.gz
     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 && \
@@ -59,14 +57,16 @@ Build:4.409,17046
         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*
+    update=.,plugins/HoloColorPicker,plugins/Android-PullToRefresh/library,plugins/ckChangeLog/library,plugins/ActionBarSherlock/library
+    target=android-17
     build=$$MVN3$$ package -f HtmlCleaner/pom.xml && \
         mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/
 
 Build:4.802,20003
     commit=4.802
+    srclibs=Jutf7@20
     rm=libs/jzlib-1.0.7.jar,libs/htmlcleaner-2.2.jar,libs/jutf7-1.0.1-SNAPSHOT.jar,tests
     extlibs=jzlib/jzlib-1.0.7.tar.gz
-    srclibs=Jutf7@20
     prebuild=unzip libs/htmlcleaner-2.2-all.zip && \
         tar xzf libs/jzlib-1.0.7.tar.gz && \
         echo 'source.dir=src;$$Jutf7$$/src;jzlib-1.0.7' >> ant.properties && \
@@ -76,9 +76,21 @@ Build:4.802,20003
 
 Build:4.803,20004
     commit=4.803
+    srclibs=Jutf7@20
     rm=libs/jzlib-1.0.7.jar,libs/htmlcleaner-2.2.jar,libs/jutf7-1.0.1-SNAPSHOT.jar,tests
     extlibs=jzlib/jzlib-1.0.7.tar.gz
+    prebuild=unzip libs/htmlcleaner-2.2-all.zip && \
+        tar xzf libs/jzlib-1.0.7.tar.gz && \
+        echo 'source.dir=src;$$Jutf7$$/src;jzlib-1.0.7' >> ant.properties && \
+        rm libs/jzlib-1.0.7.tar.gz libs/htmlcleaner-2.2-all.zip
+    build=$$MVN3$$ package -f HtmlCleaner/pom.xml && \
+        mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/
+
+Build:4.804,20005
+    commit=4.804
     srclibs=Jutf7@20
+    rm=libs/jzlib-1.0.7.jar,libs/htmlcleaner-2.2.jar,libs/jutf7-1.0.1-SNAPSHOT.jar,tests
+    extlibs=jzlib/jzlib-1.0.7.tar.gz
     prebuild=unzip libs/htmlcleaner-2.2-all.zip && \
         tar xzf libs/jzlib-1.0.7.tar.gz && \
         echo 'source.dir=src;$$Jutf7$$/src;jzlib-1.0.7' >> ant.properties && \
@@ -88,6 +100,6 @@ Build:4.803,20004
 
 Auto Update Mode:Version %v
 Update Check Mode:RepoManifest/4.8-MAINT
-Current Version:4.803
-Current Version Code:20004
+Current Version:4.804
+Current Version Code:20005