rename com.fsck.k9_beta to org.fdroid.k9. Will be used for next stable/beta release, built from source. Still WIP

This commit is contained in:
David Black 2013-04-10 20:35:52 +01:00
parent 2cb70a7656
commit 70cd754ec2
3 changed files with 25 additions and 106 deletions

View file

@ -6,31 +6,26 @@ Issue Tracker:http://code.google.com/p/k9mail/issues/list
Summary:Full-featured email client Summary:Full-featured email client
Description: Description:
E-mail client supporting multiple accounts, POP3, IMAP and Push IMAP. Packed with E-mail client supporting multiple accounts, POP3, IMAP and Push IMAP.
features and highly configurable. Import and export of settings is possible so that all that's Packed with
features and highly configurable.
Import and export of settings is possible so that all that's
required to setup the app after a wipe is to enter the account passwords. required to setup the app after a wipe is to enter the account passwords.
If you would like to contribute financially to k9mail, please consider donating to the local SPCA If you would like to contribute financially to k9mail, please consider
donating to the local SPCA
(Societies for the prevention of cruelty to animals). (Societies for the prevention of cruelty to animals).
We leave this app as a developer build to minimize the disruption to users a signature switch We leave this app as a developer build to minimize the disruption to users a
would cause. Building the app from source is very straightforward though. Stable releases are 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. numbered x.even and they are maintained in their own git branches.
. .
Repo Type:git Repo Type:git
Repo:https://github.com/k9mail/k-9.git Repo:https://github.com/k9mail/k-9.git
Build Version:4.330,17031,!might need some revision 4.330,target=android-17,update=.;plugins/HoloColorPicker;\
plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,prebuild=\
rm -f libs/jzlib*.jar libs/htmlcleaner*.jar libs/jutf*.jar && \
unzip libs/htmlcleaner-2.2-all.zip && $$MVN3$$ install -f HtmlCleaner/pom.xml && \
mv HtmlCleaner/target/htmlcleaner-2.2.jar libs/ && rm -rf HtmlCleaner && cd src/com/ && \
svn co https://jutf7.svn.sourceforge.net/svnroot/jutf7/trunk/src/main/java/com/beetstra/ && \
wget http://www.jcraft.com/jzlib/jzlib-1.0.7.tar.gz && tar -xf jzlib-1.0.7.tar.gz && \
mv jzlib-1.0.7/com/* . && rm -rf jzlib* && cd ../.. && $$SDK$$/tools/android \
update lib-project -p plugins/Android-PullToRefresh/library/ -t android-17
#Device variable version #Device variable version
Update Check Mode:None Update Check Mode:None
Current Version:4.201 Current Version:4.201

View file

@ -1,77 +0,0 @@
diff --git a/custom_rules.xml b/custom_rules.xml
new file mode 100644
index 0000000..c5a7b4d
--- /dev/null
+++ b/custom_rules.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Change Package ID" >
+ <import file="${sdk.dir}/tools/ant/build.xml" />
+ <target name="-package-resources" depends="-crunch">
+ <do-only-if-not-library elseText="Library project: do not package resources..." >
+ <exec executable="${aapt}" failonerror="true">
+ <arg value="package" />
+ <arg value="-f" />
+ <arg value="-M" />
+ <arg path="AndroidManifest.xml" />
+ <arg value="-A" />
+ <arg path="${asset.absolute.dir}" />
+ <arg value="-F" />
+ <arg path="${out.absolute.dir}/${resource.package.file.name}" />
+ <arg value="-I" />
+ <arg path="${android.jar}" />
+ <arg value="-S" />
+ <arg path="${resource.absolute.dir}" />
+ <arg value="-S" />
+ <arg path="${android.library.reference.1}/res" />
+ <arg value="-S" />
+ <arg path="${android.library.reference.2}/res" />
+ <arg value="-S" />
+ <arg path="${android.library.reference.3}/res" />
+ <arg value="-S" />
+ <arg path="${android.library.reference.4}/res" />
+ <arg value="--extra-packages" />
+ <arg value="com.actionbarsherlock" />
+ <arg value="--extra-packages" />
+ <arg value="com.handmark.pulltorefresh.library" />
+ <arg value="--extra-packages" />
+ <arg value="com.larswerkman.colorpicker" />
+ <arg value="--extra-packages" />
+ <arg value="de.cketti.library.changelog" />
+ <arg value="--auto-add-overlay" />
+ <arg value="--rename-manifest-package" />
+ <arg value="com.fsck.k9_beta" />
+ </exec>
+ </do-only-if-not-library>
+ </target>
+</project>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 465fc70..32d6d9c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -391,14 +391,14 @@ otherwise it would make K-9 start at the wrong time
</service>
<provider
android:name=".provider.AttachmentProvider"
- android:authorities="com.fsck.k9.attachmentprovider"
+ android:authorities="com.fsck.k9_beta.attachmentprovider"
android:multiprocess="true"
android:grantUriPermissions="true"
android:readPermission="com.fsck.k9.permission.READ_ATTACHMENT"
/>
<provider
android:name=".provider.MessageProvider"
- android:authorities="com.fsck.k9.messageprovider"
+ android:authorities="com.fsck.k9_beta.messageprovider"
android:multiprocess="true"
android:grantUriPermissions="true"
android:readPermission="com.fsck.k9.permission.READ_MESSAGES"
@@ -406,7 +406,7 @@ otherwise it would make K-9 start at the wrong time
/>
<provider
android:name=".provider.EmailProvider"
- android:authorities="com.fsck.k9.provider.email"
+ android:authorities="com.fsck.k9_beta.provider.email"
android:exported="false"
/>

View file

@ -6,34 +6,35 @@ Issue Tracker:http://code.google.com/p/k9mail/issues/list
Summary:Full-featured email client Summary:Full-featured email client
Description: Description:
E-mail client supporting multiple accounts, POP3, IMAP and Push IMAP. Packed with E-mail client supporting multiple accounts, POP3, IMAP and Push IMAP.
features and highly configurable. Import and export of settings is possible so that all that's Packed with
features and highly configurable.
Import and export of settings is possible so that all that's
required to setup the app after a wipe is to enter the account passwords. required to setup the app after a wipe is to enter the account passwords.
If you would like to contribute financially to k9mail, please consider donating to the local SPCA If you would like to contribute financially to k9mail, please consider
donating to the local SPCA
(Societies for the prevention of cruelty to animals). (Societies for the prevention of cruelty to animals).
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.
. .
Repo Type:git Repo Type:git
Repo:https://github.com/k9mail/k-9.git Repo:https://github.com/k9mail/k-9.git
Build Version:4.330,17031,!WIP 4.330,patch=package-id.patch,update=.;plugins/HoloColorPicker;\ # use script in tools/ or https://github.com/ashleywillis/auto-avd/blob/master/build-cb.sh
plugins/ckChangeLog/library;plugins/ActionBarSherlock/library,prebuild=\ Build Version:4.330-fdroid,17031,!need to change package id 4.330,\
echo "android.jar=$$SDK$$/platforms/android-17/android.jar" >> ant.properties && \ forceversion=yes,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=\
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/ && \ unzip libs/htmlcleaner-2.2-all.zip && cd src/com/ && \
svn co https://jutf7.svn.sourceforge.net/svnroot/jutf7/trunk/src/main/java/com/beetstra/ && \ svn co -r20 https://jutf7.svn.sourceforge.net/svnroot/\
jutf7/trunk/src/main/java/com/beetstra/ && \
wget http://www.jcraft.com/jzlib/jzlib-1.0.7.tar.gz && tar -xf jzlib-1.0.7.tar.gz && \ wget http://www.jcraft.com/jzlib/jzlib-1.0.7.tar.gz && tar -xf jzlib-1.0.7.tar.gz && \
mv jzlib-1.0.7/com/* . && rm -rf jzlib*,build=\ mv jzlib-1.0.7/com/* . && rm -rf 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
Update Check Mode:None Update Check Mode:Static
Current Version:4.201
Current Version Code:16025