This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mpj.
commit b492a8d57ff7d8fa9c7763d051e9a90c96154edf Author: Emmanuel Bourg <[email protected]> Date: Mon Jun 29 14:49:30 2015 +0000 Fixed the build failure caused by the update of commons-codec --- debian/changelog | 7 +++++++ debian/patches/use_debian_packaged_jars.patch | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c1e0a7f..dbe2bcc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mpj (0.42+dfsg-2) unstable; urgency=medium + + * Team upload. + * Fixed the build failure caused by the update of commons-codec + + -- Emmanuel Bourg <[email protected]> Mon, 29 Jun 2015 16:48:07 +0200 + mpj (0.42+dfsg-1) unstable; urgency=medium * New upstream version (adapted patch) diff --git a/debian/patches/use_debian_packaged_jars.patch b/debian/patches/use_debian_packaged_jars.patch index e1bd313..fab7951 100644 --- a/debian/patches/use_debian_packaged_jars.patch +++ b/debian/patches/use_debian_packaged_jars.patch @@ -12,7 +12,7 @@ Description: Use Debian packaged libraries <javac srcdir="${src.dir}" - classpath="lib/wrapper.jar:lib/org.mortbay.jetty.jar:lib/log4j-1.2.11.jar:lib/commons-cli-1.2.jar:lib\commons-codec-1.8.jar:lib\commons-io-2.4.jar" -+ classpath="/usr/share/java/wrapper.jar:/usr/share/java/log4j-1.2.jar:/usr/share/java/commons-cli-1.2.jar:/usr/share/java/commons-codec-1.9.jar:/usr/share/java/commons-io-2.4.jar" ++ classpath="/usr/share/java/wrapper.jar:/usr/share/java/log4j-1.2.jar:/usr/share/java/commons-cli.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-io.jar" sourcepath="${src.dir}" debug="true" /> @@ -103,7 +103,7 @@ Description: Use Debian packaged libraries value="runtime.daemon.MPJDaemon" /> <attribute name="Class-path" - value="log4j-1.2.11.jar commons-codec-1.8.jar commons-io-2.4.jar runtimecommon.jar "/> -+ value="log4j-1.2.jar commons-codec-1.8.jar commons-io-2.4.jar runtimecommon.jar "/> ++ value="log4j-1.2.jar commons-codec.jar commons-io.jar runtimecommon.jar "/> </manifest> </jar> @@ -139,7 +139,7 @@ Description: Use Debian packaged libraries <javadoc destdir="${doc.dir}/javadocs" - classpath="${lib.dir}/org.mortbay.jetty.jar:${lib.dir}/javax.servlet.jar:${lib.dir}/wrapper.jar:${lib.dir}/log4j-1.2.11.jar;${lib.dir}/commons-cli-1.2.jar"> -+ classpath="${lib.dir}/javax.servlet.jar:${lib.dir}/wrapper.jar:${lib.dir}/log4j-1.2.jar;${lib.dir}/commons-cli-1.2.jar"> ++ classpath="${lib.dir}/javax.servlet.jar:${lib.dir}/wrapper.jar:${lib.dir}/log4j-1.2.jar;${lib.dir}/commons-cli.jar"> <fileset dir="${mpi.dir}" defaultexcludes="yes"> <include name="**/Cartcomm.java"/> <include name="**/CartParms.java"/> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mpj.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
