This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository jnlp-servlet.
commit 83fb448a4b126f3d915a4a727f73bca944b9a10a Author: Markus Koschany <[email protected]> Date: Thu Oct 26 19:01:02 2017 +0200 Add java9.patch and support Java 9. Closes: #873984 Thanks: Chris West for the report. --- debian/patches/build.patch | 15 ++++++++++----- debian/patches/java9.patch | 21 +++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/debian/patches/build.patch b/debian/patches/build.patch index 86f79e3..dff8e63 100644 --- a/debian/patches/build.patch +++ b/debian/patches/build.patch @@ -1,8 +1,13 @@ -Description: Fix the classpath for building in Debian. - The fix is only needed in Debian, no changes required upstream. -Forwarded: not-needed -Author: Andrew Ross <[email protected]> +From: Debian Java Maintainers <[email protected]> +Date: Thu, 26 Oct 2017 19:00:36 +0200 +Subject: build +--- + GNUmakefile | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/GNUmakefile b/GNUmakefile +index 1138a4d..2c99898 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -2,7 +2,8 @@ @@ -15,7 +20,7 @@ Author: Andrew Ross <[email protected]> # environment variable TMPDIR should point to tmp directory # environment variable SDK_HOME should point to SDK directory SDK_HOME = $(JAVA_HOME) -@@ -72,7 +73,7 @@ +@@ -72,7 +73,7 @@ servlet-resource: jardiff-jar: $(ECHO) 'Main-Class:' jnlp.sample.jardiff.JarDiff > $(TMPDIR)/jardiff.manifest diff --git a/debian/patches/java9.patch b/debian/patches/java9.patch new file mode 100644 index 0000000..c80b719 --- /dev/null +++ b/debian/patches/java9.patch @@ -0,0 +1,21 @@ +From: Markus Koschany <[email protected]> +Date: Thu, 26 Oct 2017 19:00:50 +0200 +Subject: java9 + +--- + GNUmakefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/GNUmakefile b/GNUmakefile +index 2c99898..74b002e 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -7,7 +7,7 @@ TMPDIR = . + # environment variable TMPDIR should point to tmp directory + # environment variable SDK_HOME should point to SDK directory + SDK_HOME = $(JAVA_HOME) +-JAVAC = $(SDK_HOME)/bin/javac -source 1.5 -target 1.5 ++JAVAC = $(SDK_HOME)/bin/javac -source 1.8 -target 1.8 + JAR = $(SDK_HOME)/bin/jar + CLASSDESTDIR = classes + MKDIR = mkdir -p diff --git a/debian/patches/series b/debian/patches/series index 5879227..d081d40 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ build.patch +java9.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jnlp-servlet.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
