missytake/fdroiddata
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

update K-9 Mail~ (org.fdroid.k9) to 4.403 (17040); change BV a bit

Browse source
This commit is contained in:
David Black 2013-07-02 11:41:07 +01:00
parent 4052c43615
commit f5dd4e766c
4 changed files with 131 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
metadata/org.fdroid.k9.txt
View file

@ -5,13 +5,14 @@ Source Code:https://github.com/k9mail/k-9
Issue Tracker:http://code.google.com/p/k9mail/issues/list Issue Tracker:http://code.google.com/p/k9mail/issues/list
Auto Name:K-9 Mail Auto Name:K-9 Mail
Name:K-9 Mail Name:K-9 Mail~
Summary:Email client Summary:Email client
Description: Description:
'''N.B''' This package has a different name to the developer builds of K-9 — '''N.B''' This package has a different name to the developer builds of K-9 —
therefore, they can be installed alongside each other. therefore, they could be installed alongside each other.
However, be warned that apps found elsewhere that integrate with K-9 may not However, be warned that apps found elsewhere that integrate with K-9 may not
work with our versions. work with our versions.
The '~' has been appended to the app name for differentiation.
E-mail client supporting multiple accounts, POP3, IMAP and Push IMAP. E-mail client supporting multiple accounts, POP3, IMAP and Push IMAP.
Can do encryption if [[org.thialfihar.android.apg]] is installed; stay tuned: Can do encryption if [[org.thialfihar.android.apg]] is installed; stay tuned:
@ -25,7 +26,7 @@ If you would like to contribute financially to k9mail, consider
donating to the local SPCA 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/wiki/ReleaseNotes Major version release 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] [https://github.com/k9mail/k-9/raw/master/res/raw/changelog.xml Changelog]
. .
@ -119,7 +120,7 @@ rm -rf ../../libs/jzlib* ../../libs/htmlcleaner*.zip jzlib*,build=\
$$MVN3$$ package -f HtmlCleaner/pom.xml && \ $$MVN3$$ package -f HtmlCleaner/pom.xml && \
mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \ mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
rm -rf HtmlCleaner rm -rf HtmlCleaner
Build Version:4.401-fdroid,17038,4.401,forceversion=yes,\ Build Version:4.401-fdroid,17038,!4.401,forceversion=yes,\
srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\ srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\ update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\
plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,init=\ plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,init=\
@ -137,46 +138,44 @@ rm -rf ../../libs/jzlib* ../../libs/htmlcleaner*.zip jzlib*,build=\
$$MVN3$$ package -f HtmlCleaner/pom.xml && \ $$MVN3$$ package -f HtmlCleaner/pom.xml && \
mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \ mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
rm -rf HtmlCleaner rm -rf HtmlCleaner
# use the build-beta script from the master branch instead
Build Version:4.502-fdroid,18002,4.502,\ Build Version:4.403,17040,4.403,\
forceversion=yes,srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\ srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\ update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\
plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,init=\ plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,init=\
sed -i 's@\(target=\).*@\1android-17@' plugins/Android-PullToRefresh/\ sed -i 's@\(target=\).*@\1android-17@' plugins/Android-PullToRefresh/\
library/project.properties,prebuild=\ library/project.properties,patch=packageid-temp.patch,prebuild=\
sed -i 's/com\/fsck\/k9beta/org\/fdroid\/k9/g;\ chmod +x tools/build-beta && ./tools/build-beta && \
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 && \ rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
unzip libs/htmlcleaner-2.2-all.zip && cd src/com/ && \ mkdir -p tests/res/ && unzip libs/htmlcleaner-2.2-all.zip && \
cp -r ../../$$Jutf7$$/src/main/java/com/beetstra . && \ cp -r $$Jutf7$$/src/main/java/com/ src/ && \
tar xzf ../../libs/jzlib-1.0.7.tar.gz && mv jzlib-1.0.7/com/* . && \ 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=\ rm -rf libs/jzlib* libs/htmlcleaner*.zip jzlib*,build=\
$$MVN3$$ package -f HtmlCleaner/pom.xml && \ $$MVN3$$ package -f HtmlCleaner/pom.xml && \
mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \ mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
rm -rf HtmlCleaner rm -rf HtmlCleaner
Build Version:4.xxx-fdroid,18002,!template for next version at fea29dab,\ # note the slightlydifferent patch
forceversion=yes,srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\ Build Version:4.502,18002,!use for next beta tag at b7cf3e421abbc,\
srclibs=Jutf7@20,extlibs=jzlib/jzlib-1.0.7.tar.gz,\
update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\ update=.;plugins/HoloColorPicker;plugins/Android-PullToRefresh/library;\
plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,init=\ plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,init=\
sed -i 's@\(target=\).*@\1android-17@' plugins/Android-PullToRefresh/\ sed -i 's@\(target=\).*@\1android-17@' plugins/Android-PullToRefresh/\
library/project.properties,patch=packageid.patch,prebuild=./tools/build-beta && \ library/project.properties,patch=packageid.patch,prebuild=./tools/build-beta && \
rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \ rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
unzip libs/htmlcleaner-2.2-all.zip && mkdir -p src/com/ && cd src/com/ && \ mkdir -p tests/res/ && unzip libs/htmlcleaner-2.2-all.zip && \
cp -r ../../$$Jutf7$$/src/main/java/com/beetstra . && \ cp -r $$Jutf7$$/src/main/java/com/ src/ && \
tar xzf ../../libs/jzlib-1.0.7.tar.gz && mv jzlib-1.0.7/com/* . && \ 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=\ rm -rf libs/jzlib* libs/htmlcleaner*.zip jzlib*,build=\
$$MVN3$$ package -f HtmlCleaner/pom.xml && \ $$MVN3$$ package -f HtmlCleaner/pom.xml && \
mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \ mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && \
rm -rf HtmlCleaner rm -rf HtmlCleaner
# Should think about providing maintenance updates for 4.400 # 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 # K9 have their own fork of jzlib and jutf7 that won't change very often
Auto Update Mode:None Auto Update Mode:None
# RM/4.4-MAINT would work but the package ID is different # RM/4.4-MAINT would work but the package ID is different
Update Check Mode:None Update Check Mode:None
Current Version:4.401 Current Version:4.403
Current Version Code:17038 Current Version Code:17040

104
metadata/org.fdroid.k9/packageid-temp.patch Normal file
View file

@ -0,0 +1,104 @@
diff --git a/tools/build-beta b/tools/build-beta
index 129f1a0..8b0905d 100644
--- a/tools/build-beta
+++ b/tools/build-beta
@@ -1,16 +1,83 @@
-BETA_PACKAGE=com.fsck.k9beta
-BETA_PATH=com/fsck/k9beta
-BETA_PROJ_NAME="K9 Beta"
-perl -pi -e"s|\@string/app_name|\@string/beta_app_name|g" AndroidManifest.xml
-perl -pi -e"s|com/fsck/k9/R.java|$BETA_PATH/R.java|g" build.xml
-find src/com/fsck res -type f |xargs -n 1 perl -pi -e"s/com.fsck.k9(?=\W)/$BETA_PACKAGE/g"
-perl -pi -e"s|com.fsck.k9|$BETA_PACKAGE|g" AndroidManifest.xml
-mv src/com/fsck/k9 src/$BETA_PATH
-perl -pi -e"s|K9|$BETA_PROJ_NAME|g" build.xml
-ant $@
-mv src/$BETA_PATH src/com/fsck/k9
-perl -pi -e"s|$BETA_PACKAGE|com.fsck.k9|g" AndroidManifest.xml
-perl -pi -e"s|$BETA_PATH/R.java|com/fsck.k9/R.java|g" build.xml
-find src/com/fsck res -type f |xargs -n 1 perl -pi -e"s/$BETA_PACKAGE(?=\W)/com.fsck.k9/g"
-perl -pi -e"s|$BETA_PROJ_NAME|K9|g" build.xml
-perl -pi -e"s|\@string/beta_app_name|\@string/app_name|g" AndroidManifest.xml
+#!/bin/bash
+
+# The MIT License
+#
+# Copyright 2012 Ashley Willis <ashley.github@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# Based off original tools/build-beta by Jesse Vincent.
+
+# Works on OS X and Linux.
+
+# Temporarily rename an Android project for building.
+# Set the first 5 or 6 DIST_* and BETA_* to whatever you are going from and to.
+# Set PROJECT_DIR to the absolute path pf the main project.
+# Set TEST_DIR to the absolute path of the test project.
+# Then run this script with the same arguments you'd pass to ant. It can be
+# run from either $PROJECT_DIR or $TEST_DIR. It might require tweaks
+# depending on how your project is laid out.
+
+PROJECT_DIR=.
+TEST_DIR=${PROJECT_DIR}/tests
+
+DIST_TLD=com
+DIST_DOMAIN=fsck
+DIST_PROJECT=k9
+DIST_LOGTAG=k9
+DIST_PROJ_NAME=K9
+DIST_APP_NAME='\@string/app_name'
+
+BETA_TLD=org
+BETA_DOMAIN=fdroid
+BETA_PROJECT=k9
+BETA_LOGTAG=k9
+BETA_PROJ_NAME='K9'
+BETA_APP_NAME='K-9 Mail~'
+
+# Nothing below here should need to be changed.
+
+DIST_PACKAGE="${DIST_TLD}.${DIST_DOMAIN}.${DIST_PROJECT}"
+DIST_PATH="${DIST_TLD}/${DIST_DOMAIN}/${DIST_PROJECT}"
+
+BETA_PACKAGE="${BETA_TLD}.${BETA_DOMAIN}.${BETA_PROJECT}"
+BETA_PATH="${BETA_TLD}/${BETA_DOMAIN}/${BETA_PROJECT}"
+
+# convert to beta project:
+perl -pi -e"s|${DIST_APP_NAME}|${BETA_APP_NAME}|g" ${PROJECT_DIR}/AndroidManifest.xml
+perl -pi -e"s|${DIST_PACKAGE}|${BETA_PACKAGE}|g" ${PROJECT_DIR}/AndroidManifest.xml ${TEST_DIR}/AndroidManifest.xml
+perl -pi -e"s|${DIST_PROJ_NAME}|${BETA_PROJ_NAME}|g" ${PROJECT_DIR}/build.xml ${TEST_DIR}/build.xml
+perl -pi -e"s|LOG_TAG = \"${DIST_LOGTAG}\"|LOG_TAG = \"${BETA_LOGTAG}\"|" ${PROJECT_DIR}/src/${DIST_PATH}/${DIST_PROJ_NAME}.java
+find ${PROJECT_DIR}/src/${DIST_TLD}/${DIST_DOMAIN} ${PROJECT_DIR}/res ${TEST_DIR}/src/${DIST_TLD}/${DIST_DOMAIN} ${TEST_DIR}/res \
+ -type f -print0 | xargs -0 perl -pi -e"s/${DIST_PACKAGE}(?=\W)/${BETA_PACKAGE}/g"
+if [[ "${DIST_PROJECT}" != "${BETA_PROJECT}" ]]; then
+ mv ${PROJECT_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}/${DIST_PROJECT} ${PROJECT_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}/${BETA_PROJECT}
+ mv ${TEST_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}/${DIST_PROJECT} ${TEST_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}/${BETA_PROJECT}
+fi
+if [[ "${DIST_DOMAIN}" != "${BETA_DOMAIN}" ]]; then
+ mv ${PROJECT_DIR}/src/${DIST_TLD}/${DIST_DOMAIN} ${PROJECT_DIR}/src/${DIST_TLD}/${BETA_DOMAIN}
+ mv ${TEST_DIR}/src/${DIST_TLD}/${DIST_DOMAIN} ${TEST_DIR}/src/${DIST_TLD}/${BETA_DOMAIN}
+fi
+if [[ "${DIST_TLD}" != "${BETA_TLD}" ]]; then
+ mv ${PROJECT_DIR}/src/${DIST_TLD} ${PROJECT_DIR}/src/${BETA_TLD}
+ mv ${TEST_DIR}/src/${DIST_TLD} ${TEST_DIR}/src/${BETA_TLD}
+fi
+
+MYEXIT=$?
+

4
metadata/org.fdroid.k9/packageid.patch
View file

@ -16,8 +16,8 @@ index 8061ec9..01b0725 100755
+BETA_DOMAIN=fdroid +BETA_DOMAIN=fdroid
+BETA_PROJECT=k9 +BETA_PROJECT=k9
+BETA_LOGTAG=k9 +BETA_LOGTAG=k9
+BETA_PROJ_NAME='K9~' +BETA_PROJ_NAME='K9'
+BETA_APP_NAME='K-9~' +BETA_APP_NAME='K-9 Mail~'
# Nothing below here should need to be changed. # Nothing below here should need to be changed.

6
stats/known_apks.txt
View file

@ -1817,12 +1817,6 @@ org.fdroid.fdroid_46.apk org.fdroid.fdroid 2013-05-31
org.fdroid.fdroid_8.apk org.fdroid.fdroid 2011-01-17 org.fdroid.fdroid_8.apk org.fdroid.fdroid 2011-01-17
org.fdroid.fdroid_9.apk org.fdroid.fdroid 2011-01-30 org.fdroid.fdroid_9.apk org.fdroid.fdroid 2011-01-30
org.fdroid.k9_16025.apk org.fdroid.k9 2013-06-30 org.fdroid.k9_16025.apk org.fdroid.k9 2013-06-30
org.fdroid.k9_17031.apk org.fdroid.k9 2013-05-04
org.fdroid.k9_17032.apk org.fdroid.k9 2013-05-10
org.fdroid.k9_17036.apk org.fdroid.k9 2013-06-25
org.fdroid.k9_17037.apk org.fdroid.k9 2013-06-27
org.fdroid.k9_17038.apk org.fdroid.k9 2013-06-29
org.fdroid.k9_18002.apk org.fdroid.k9 2013-05-25
org.fdroid.superuser_1013.apk org.fdroid.superuser 2013-03-07 org.fdroid.superuser_1013.apk org.fdroid.superuser 2013-03-07
org.fdroid.superuser_1016.apk org.fdroid.superuser 2013-03-30 org.fdroid.superuser_1016.apk org.fdroid.superuser 2013-03-30
org.fdroid.superuser_1017.apk org.fdroid.superuser 2013-04-12 org.fdroid.superuser_1017.apk org.fdroid.superuser 2013-04-12