This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository cmdreader.
commit 5ba205e4f57f32d64f2ebfaf2e9bd71d803afe3d Author: Emmanuel Bourg <[email protected]> Date: Fri Mar 30 23:48:29 2018 +0200 Fixed the build failure with Java 9 (Closes: #893182) --- debian/changelog | 1 + debian/patches/add_hamcrest_to_classpath.patch | 10 ++++------ debian/patches/add_mkdir_command.patch | 2 +- debian/patches/replace_ipp_with_ivy.patch | 14 ++++++-------- debian/patches/set_antruntime.patch | 8 ++++---- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index e8e8198..165d538 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ cmdreader (1.5-2) UNRELEASED; urgency=medium * Team upload. + * Fixed the build failure with Java 9 (Closes: #893182) * Standards-Version updated to 4.1.3 * Switch to debhelper level 11 diff --git a/debian/patches/add_hamcrest_to_classpath.patch b/debian/patches/add_hamcrest_to_classpath.patch index 7e1b349..9fc4358 100644 --- a/debian/patches/add_hamcrest_to_classpath.patch +++ b/debian/patches/add_hamcrest_to_classpath.patch @@ -1,9 +1,7 @@ -Index: cmdreader/build.xml -=================================================================== ---- cmdreader.orig/build.xml -+++ cmdreader/build.xml -@@ -108,6 +108,7 @@ and finally call CmdReader.of(ThatClass. - <javac destdir="build/prog" target="1.5" source="1.5" includeantruntime="false"> +--- a/build.xml ++++ b/build.xml +@@ -108,6 +108,7 @@ + <javac destdir="build/prog" target="1.8" source="1.8" encoding="ISO-8859-1" includeantruntime="false"> <src path="src" /> <classpath refid="build.path" /> + <classpath location="/usr/share/java/hamcrest-all.jar"/> diff --git a/debian/patches/add_mkdir_command.patch b/debian/patches/add_mkdir_command.patch index 040f980..7425f8a 100644 --- a/debian/patches/add_mkdir_command.patch +++ b/debian/patches/add_mkdir_command.patch @@ -7,6 +7,6 @@ Index: com.zwitserloot.cmdreader-1/build.xml <target name="compileTests" depends="compile, ensureTestDeps" description="Compiles test code"> + <mkdir dir="build/tests" /> - <javac destdir="build/tests" source="1.5" target="1.5"> + <javac destdir="build/tests" source="1.8" target="1.8" encoding="ISO-8859-1"> <src path="test" /> <classpath refid="test.path" /> diff --git a/debian/patches/replace_ipp_with_ivy.patch b/debian/patches/replace_ipp_with_ivy.patch index 0073393..5f90ec9 100644 --- a/debian/patches/replace_ipp_with_ivy.patch +++ b/debian/patches/replace_ipp_with_ivy.patch @@ -1,7 +1,5 @@ -Index: com.zwitserloot.cmdreader-1/build.xml -=================================================================== ---- com.zwitserloot.cmdreader-1.orig/build.xml -+++ com.zwitserloot.cmdreader-1/build.xml +--- a/build.xml ++++ b/build.xml @@ -19,7 +19,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -11,7 +9,7 @@ Index: com.zwitserloot.cmdreader-1/build.xml <description> com.zwitserloot.cmdreader is a library to read command line arguments for java. To use it, first build a class containing fields, with each field representing a command line option. -@@ -62,7 +62,7 @@ and finally call CmdReader.of(ThatClass. +@@ -62,7 +62,7 @@ <target name="ensure-ipp" depends="load-ipp, checkver-ipp" /> @@ -20,12 +18,12 @@ Index: com.zwitserloot.cmdreader-1/build.xml <ivy:configure file="buildScripts/ivysettings.xml" /> <property name="ivy.config" value="true" /> </target> -@@ -105,20 +105,20 @@ and finally call CmdReader.of(ThatClass. +@@ -105,20 +105,20 @@ <target name="compile" depends="ensureBuildDeps" description="Compiles program code"> <mkdir dir="build/prog" /> - <ivy:compile destdir="build/prog" target="1.5" source="1.5"> -+ <javac destdir="build/prog" target="1.5" source="1.5"> ++ <javac destdir="build/prog" target="1.8" source="1.8" encoding="ISO-8859-1"> <src path="src" /> <classpath refid="build.path" /> - </ivy:compile> @@ -34,7 +32,7 @@ Index: com.zwitserloot.cmdreader-1/build.xml <target name="compileTests" depends="compile, ensureTestDeps" description="Compiles test code"> - <ivy:compile destdir="build/tests" source="1.5" target="1.5"> -+ <javac destdir="build/tests" source="1.5" target="1.5"> ++ <javac destdir="build/tests" source="1.8" target="1.8" encoding="ISO-8859-1"> <src path="test" /> <classpath refid="test.path" /> <classpath> diff --git a/debian/patches/set_antruntime.patch b/debian/patches/set_antruntime.patch index 4b430ce..88585ac 100644 --- a/debian/patches/set_antruntime.patch +++ b/debian/patches/set_antruntime.patch @@ -6,8 +6,8 @@ Index: cmdreader/build.xml <target name="compile" depends="ensureBuildDeps" description="Compiles program code"> <mkdir dir="build/prog" /> -- <javac destdir="build/prog" target="1.5" source="1.5"> -+ <javac destdir="build/prog" target="1.5" source="1.5" includeantruntime="false"> +- <javac destdir="build/prog" target="1.8" source="1.8" encoding="ISO-8859-1"> ++ <javac destdir="build/prog" target="1.8" source="1.8" encoding="ISO-8859-1" includeantruntime="false"> <src path="src" /> <classpath refid="build.path" /> </javac> @@ -15,8 +15,8 @@ Index: cmdreader/build.xml <target name="compileTests" depends="compile, ensureTestDeps" description="Compiles test code"> <mkdir dir="build/tests" /> -- <javac destdir="build/tests" source="1.5" target="1.5"> -+ <javac destdir="build/tests" source="1.5" target="1.5" includeantruntime="false"> +- <javac destdir="build/tests" source="1.8" target="1.8" encoding="ISO-8859-1"> ++ <javac destdir="build/tests" source="1.8" target="1.8" encoding="ISO-8859-1" includeantruntime="false"> <src path="test" /> <classpath refid="test.path" /> <classpath> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/cmdreader.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
