update K-9 (org.fdroid.k9) to 4.400; disable com.fsck.k9

metadata/com.fsck.k9.txt

@@ -1,3 +1,4 @@
+Disabled:Use org.fdroid.k9 instead
 Category:Internet
 License:Apache2
 Web Site:http://code.google.com/p/k9mail/
@@ -20,10 +21,6 @@ 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.
-
-Current development versions are based on the Android 4 email client. When that
-becomes stable we will probably only offer a source-built version with
-a different package name.
 .
 
 Repo Type:git

metadata/com.paranoid.ParanoidWallpapers.txt

@@ -10,6 +10,7 @@ Summary:Wallpapers from a custom ROM
 Description:
 Pick from 9 wallpapers that come with the Paranoid Android ROM 
 or choose one of seven solid-(ish) colours.
+The wallpapers are designed more for high resolution screens.
 There is no launcher icon: instead they are made available via the 
 system wallpaper picker.
 .

metadata/org.fdroid.k9.txt

@@ -5,25 +5,23 @@ Source Code:https://github.com/k9mail/k-9
 Issue Tracker:http://code.google.com/p/k9mail/issues/list
 
 Auto Name:K-9 Mail
-Summary:Beta version of K-9
+Summary:Email client
 Description:
-4.3xx and 4.5xx are betas for 4.400 and 4.600 respectively. 
-There isn't a huge difference between the two, so better to stick with 4.5xx 
-if you already have it installed even though the stable release 
-will be further away.
+'''N.B''' This package has a different name to the developer builds of K-9 — 
+therefore, they can be installed alongside this.
 
 E-mail client supporting multiple accounts, POP3, IMAP and Push IMAP.
 Packed with features and highly configurable.
-Import of settings from [[com.fsck.k9]] is possible so that all
-that's required to setup the app is to enter the account passwords,
-but a file manager will need to be already installed.
-These versions are based on the Android 4 email client ;
-when it becomes stable we will probably only publish this package.
-Both K-9 and this can co-exist easily.
+Can do encryption if [[org.thialfihar.android.apg]] is installed ; stay tuned: 
+more GPG clients are coming soon.
 
-If you would like to contribute financially to k9mail, please consider
+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).
+(societies for the prevention of cruelty to animals).
 
 [https://github.com/k9mail/k-9/raw/master/res/raw/changelog.xml Changelog]
 .
@@ -31,7 +29,7 @@ donating to the local SPCA
 Repo Type:git
 Repo:https://github.com/k9mail/k-9.git
 
-Build Version:4.330-fdroid,17031,4.330,\
+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=\
@@ -49,7 +47,7 @@ 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,\
+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=\
@@ -67,7 +65,7 @@ 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,\
+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=\
@@ -86,6 +84,25 @@ $$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.502-fdroid,18002,4.502,\
 forceversion=yes,srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
 update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\
@@ -105,10 +122,11 @@ $$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 
 # K9 have their own fork of jzlib and jutf7 that won't change very often
 Auto Update Mode:None
 # Tags would work but the package ID is different
 Update Check Mode:None
-Current Version:4.393
-Current Version Code:17036
+Current Version:4.400
+Current Version Code:17037