This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libcofoja-java.
commit 6f9f0c0cdae4c36f9301a8a7ad39820c1236e05f Author: Emmanuel Bourg <[email protected]> Date: Tue Apr 15 09:49:23 2014 +0200 Refreshed the patches --- debian/changelog | 5 ++- .../01-remove-version-from-generated-jar.patch | 2 +- debian/patches/02-set-source-encoding.patch | 51 ---------------------- debian/patches/series | 1 - 4 files changed, 5 insertions(+), 54 deletions(-) diff --git a/debian/changelog b/debian/changelog index 213ba5c..2bee740 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ -cofoja (1.0~r139-3) UNRELEASED; urgency=medium +cofoja (1.1~r150-1) UNRELEASED; urgency=medium * Team upload. + * New upstream release + - Removed the patch setting the source encoding for javac (fixed upstream) + - Refreshed 01-remove-version-from-generated-jar.patch * Compile Cofoja's own contracts * Enabled the unit tests * Removed debian/local.properties, use Ant command line arguments instead diff --git a/debian/patches/01-remove-version-from-generated-jar.patch b/debian/patches/01-remove-version-from-generated-jar.patch index f26067b..9e73b2d 100644 --- a/debian/patches/01-remove-version-from-generated-jar.patch +++ b/debian/patches/01-remove-version-from-generated-jar.patch @@ -6,7 +6,7 @@ Last-Updated: 2013-04-10 Fowarded: no --- a/build.xml +++ b/build.xml -@@ -129,13 +129,13 @@ +@@ -132,13 +132,13 @@ <equals arg1="${snapshot}" arg2="true" /> </condition> <property name="cofoja.jar" diff --git a/debian/patches/02-set-source-encoding.patch b/debian/patches/02-set-source-encoding.patch deleted file mode 100644 index 9c3b191..0000000 --- a/debian/patches/02-set-source-encoding.patch +++ /dev/null @@ -1,51 +0,0 @@ -Description: Force encoding to UTF-8 -Author: Colin Watson <[email protected]> -Forwarded: no -Last-Update: 2013-04-30 ---- a/build.xml -+++ b/build.xml -@@ -93,7 +93,7 @@ - <mkdir dir="${obj.dir}/tmp@{stage}" /> - <mkdir dir="${obj.dir}/stage@{stage}" /> - <javac srcdir="${src.dir}" destdir="${obj.dir}/tmp@{stage}" -- debug="true" includeantruntime="false"> -+ debug="true" includeantruntime="false" encoding="UTF-8"> - <classpath refid="base.class.path" /> - <compilerarg value="-processorpath" /> - <compilerarg value="@{bootstrappath}:${asm.jar}" /> -@@ -148,7 +148,7 @@ - <mkdir dir="${obj.dir}/bare" /> - <javac srcdir="${src.dir}" destdir="${obj.dir}/bare" - debug="${debug}" -- includeantruntime="false"> -+ includeantruntime="false" encoding="UTF-8"> - <classpath refid="base.class.path" /> - </javac> - </target> -@@ -165,7 +165,7 @@ - <requirejar property="bootstrap.jar" /> - <mkdir dir="${obj.dir}/build" /> - <javac srcdir="${build.dir}" destdir="${obj.dir}/build" -- debug="true" includeantruntime="false"> -+ debug="true" includeantruntime="false" encoding="UTF-8"> - <classpath> - <path refid="base.class.path" /> - <pathelement path="${java.class.path}" /> -@@ -202,7 +202,7 @@ - <requirejar property="junit.jar" /> - <mkdir dir="${obj.dir}/test" /> - <javac srcdir="${test.dir}" destdir="${obj.dir}/test" -- debug="true" includeantruntime="false"> -+ debug="true" includeantruntime="false" encoding="UTF-8"> - <classpath> - <path refid="test.class.path" /> - <pathelement path="${obj.dir}/stage2" /> -@@ -216,7 +216,7 @@ - - <target name="buildtest2" depends="buildtest1,stage2"> - <javac srcdir="${test.dir}" destdir="${obj.dir}/test" -- debug="true" includeantruntime="false"> -+ debug="true" includeantruntime="false" encoding="UTF-8"> - <classpath> - <path refid="test.class.path" /> - <pathelement path="${obj.dir}/stage2" /> diff --git a/debian/patches/series b/debian/patches/series index 0c5d7f2..46d9b3c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 01-remove-version-from-generated-jar.patch -02-set-source-encoding.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcofoja-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
