Control: tags -1 patch

Dear maintainer,

please find attached a patch that fixes the issue.

Regards,

Markus
diff -Nru cadencii-3.3.9+svn20110818.r1732/debian/changelog 
cadencii-3.3.9+svn20110818.r1732/debian/changelog
--- cadencii-3.3.9+svn20110818.r1732/debian/changelog   2016-08-16 
16:57:18.000000000 +0200
+++ cadencii-3.3.9+svn20110818.r1732/debian/changelog   2017-12-26 
16:19:45.000000000 +0100
@@ -1,3 +1,10 @@
+cadencii (3.3.9+svn20110818.r1732-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with Java 9. (Closes: #873972)
+
+ -- Markus Koschany <[email protected]>  Tue, 26 Dec 2017 16:19:45 +0100
+
 cadencii (3.3.9+svn20110818.r1732-5) unstable; urgency=low
 
   * make the build reproducible (Closes: #826677)
diff -Nru cadencii-3.3.9+svn20110818.r1732/debian/patches/java9.patch 
cadencii-3.3.9+svn20110818.r1732/debian/patches/java9.patch
--- cadencii-3.3.9+svn20110818.r1732/debian/patches/java9.patch 1970-01-01 
01:00:00.000000000 +0100
+++ cadencii-3.3.9+svn20110818.r1732/debian/patches/java9.patch 2017-12-26 
16:19:45.000000000 +0100
@@ -0,0 +1,23 @@
+From: Markus Koschany <[email protected]>
+Date: Tue, 26 Dec 2017 16:19:01 +0100
+Subject: java9
+
+Bug-Debian: https://bugs.debian.org/873972
+Forwarded: no
+---
+ Makefile.include | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.include b/Makefile.include
+index 9933ed8..588268e 100644
+--- a/Makefile.include
++++ b/Makefile.include
+@@ -268,7 +268,7 @@ jcadencii: first pp_cs2java.jar $(SRC_JCORLIB) 
$(SRC_JWINFORMS) $(SRC_JAPPUTIL)
+       $(CP) ./build/java/org/kbinani/cadencii/Cadencii.java 
./build/java/Cadencii.java
+       perl safe_rm.pl ./build/java/org/kbinani/cadencii/Cadencii.java 
$(TO_DEVNULL)
+       $(MAKE) jpostprocess
+-      $(JAVAC) ./build/java/Cadencii.java 
./build/java/org/kbinani/cadencii/*.java ./build/java/org/kbinani/*.java 
./build/java/org/kbinani/apputil/*.java ./build/java/org/kbinani/media/*.java 
./build/java/org/kbinani/vsq/*.java ./build/java/org/kbinani/cadencii/*.java 
./build/java/org/kbinani/componentmodel/*.java 
./build/java/org/kbinani/windows/forms/*.java 
./build/java/org/kbinani/xml/*.java -encoding UTF8 -target 1.5 -source 1.5
++      $(JAVAC) ./build/java/Cadencii.java 
./build/java/org/kbinani/cadencii/*.java ./build/java/org/kbinani/*.java 
./build/java/org/kbinani/apputil/*.java ./build/java/org/kbinani/media/*.java 
./build/java/org/kbinani/vsq/*.java ./build/java/org/kbinani/cadencii/*.java 
./build/java/org/kbinani/componentmodel/*.java 
./build/java/org/kbinani/windows/forms/*.java 
./build/java/org/kbinani/xml/*.java -encoding UTF8 -target 1.7 -source 1.7
+       cd ./build/java && jar cfm Cadencii.jar Cadencii.mf Cadencii.class 
org/kbinani/cadencii/*.class org/kbinani/*.class org/kbinani/apputil/*.class 
org/kbinani/media/*.class org/kbinani/vsq/*.class org/kbinani/cadencii/*.class 
org/kbinani/componentmodel/*.class org/kbinani/windows/forms/*.class 
org/kbinani/xml/*.class
+       perl copy_with_ext.pl ./Cadencii/resources/ ./build/java/resources/ 
.png $(TO_DEVNULL)
+       perl copy_with_ext.pl ./Cadencii/resources/ ./build/java/resources/ 
.txt $(TO_DEVNULL)
diff -Nru cadencii-3.3.9+svn20110818.r1732/debian/patches/series 
cadencii-3.3.9+svn20110818.r1732/debian/patches/series
--- cadencii-3.3.9+svn20110818.r1732/debian/patches/series      2016-08-16 
16:50:30.000000000 +0200
+++ cadencii-3.3.9+svn20110818.r1732/debian/patches/series      2017-12-26 
16:19:45.000000000 +0100
@@ -2,3 +2,4 @@
 02-vconnect.patch
 03-java8-compatibility.patch
 04-reproducible-build.patch
+java9.patch

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to