This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository janino.
commit ab52528bb00ab95e901fe18d7900af7110882641 Author: Emmanuel Bourg <[email protected]> Date: Mon Oct 6 13:32:16 2014 +0200 Modified 02-remove-nullanalysis-annotations.patch to work around a line ending issue --- debian/changelog | 2 ++ .../patches/02-remove-nullanalysis-annotations.patch | 19 +++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index c84e260..1d86347 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ janino (2.7.0-2) UNRELEASED; urgency=medium instead of a strong dependency of janino * Accept java6-runtime-headless as an alternative JRE * Standards-Version updated to 3.9.6 (no changes) + * Modified 02-remove-nullanalysis-annotations.patch to work around a line + ending issue preventing the patch from applying properly when building. -- Emmanuel Bourg <[email protected]> Mon, 06 Oct 2014 12:32:50 +0200 diff --git a/debian/patches/02-remove-nullanalysis-annotations.patch b/debian/patches/02-remove-nullanalysis-annotations.patch index e79f8bd..d818877 100644 --- a/debian/patches/02-remove-nullanalysis-annotations.patch +++ b/debian/patches/02-remove-nullanalysis-annotations.patch @@ -2,15 +2,6 @@ Description: Removes the use of the de.unkrig.commons.nullanalysis annotations which aren't provided with the upstream sources. Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed ---- a/commons-compiler-jdk/src/org/codehaus/commons/compiler/jdk/package-info.java -+++ b/commons-compiler-jdk/src/org/codehaus/commons/compiler/jdk/package-info.java -@@ -27,5 +27,5 @@ - /** - * Main package of the plugin. - */ [email protected] package org.codehaus.commons.compiler.jdk; -+package org.codehaus.commons.compiler.jdk; - --- a/janino-dist/build.xml +++ b/janino-dist/build.xml @@ -88,21 +88,6 @@ @@ -35,7 +26,15 @@ Forwarded: not-needed <delete dir="build/bin-commons-compiler-jdk"/> <mkdir dir="build/bin-commons-compiler-jdk"/> <javac -@@ -128,7 +113,6 @@ +@@ -115,6 +100,7 @@ + debug="true" + debuglevel="lines,vars,source" + includeantruntime="false" ++ excludes="**/org/codehaus/commons/compiler/jdk/package-info.java" + > + <compilerarg value="-Xlint:none"/> + <compilerarg value="-Xlint:deprecation"/> +@@ -128,7 +114,6 @@ <attribute name="Implementation-URL" value="http://janino.net"/> </manifest> <fileset dir="build/bin-commons-compiler-jdk"/> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/janino.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
