debian/changelog

+java-gnome (4.1.3-8) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 10 (Closes: #898221)
+  * Standards-Version updated to 4.1.4
+  * Use salsa.debian.org Vcs-* URLs
+  * Removed the duplicate Section field in debian/control
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 16 May 2018 16:02:36 +0200
+
 java-gnome (4.1.3-7) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -25,9 +25,9 @@ Build-Depends:
  python,
  xfonts-base,
  xvfb
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/java-gnome.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/java-gnome.git
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/java-gnome.git
+Vcs-Browser: https://salsa.debian.org/java-team/java-gnome
 Homepage: http://java-gnome.sourceforge.net/
 
 Package: libjava-gnome-java
@@ -48,7 +48,6 @@ Description: Java-gnome language bindings project
  This package contains the necessary JAR file.
 
 Package: libjava-gnome-jni
-Section: java
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libjava-gnome-java (<< 4.0.11)

debian/patches/07_java10_compatibility.patch

+--- a/configure
++++ b/configure
+@@ -417,6 +417,8 @@
+ 
+ 
+ sub check_jni_header_generator(\$$$$) {
++	return
++
+ 	my $scalarref = $_[0];
+ 	my $item = $_[1];
+ 	my $program = $_[2];
+@@ -2066,13 +2068,6 @@
+ HERE
+ 
+ 
+-if ($javah) {
+-	print CONFIG "JAVAH=$javah\n";
+-	print CONFIG "JAVAH_CMD=JAVAH    \n";
+-} else {
+-	bail "failed", "No JNI header generator detected.";
+-}
+-
+ if ($jar) {
+ 	print CONFIG "JAR=$jar\n";
+ 	print CONFIG "JAR_CMD=JAR      \n";
+--- a/build/faster
++++ b/build/faster
+@@ -347,6 +347,7 @@
+ 
+ def compileJavaCode(outputDir, classpath, sourcepath, sources):
+ 	cmd = config['JAVAC'] + " "
++	cmd += "-h tmp/include "
+ 	cmd += "-d " + outputDir
+ 	if classpath:
+ 		cmd += " -classpath " + classpath
+@@ -612,7 +613,6 @@
+ 
+ 	makeJarFile()
+ 
+-	generateHeaderFiles()
+ 	compileBindingsObjects()
+ 	linkSharedLibrary()
+ 
+--- a/src/bindings/org/gnome/glib/GBoxed.c
++++ b/src/bindings/org/gnome/glib/GBoxed.c
+@@ -34,7 +34,6 @@
+ #include <glib.h>
+ #include <glib-object.h>
+ #include <jni.h>
+-#include "org_gnome_glib_GBoxed.h"
+ 
+ /*
+  * Implements
+--- a/src/generator/com/operationaldynamics/codegen/TypeGenerator.java
++++ b/src/generator/com/operationaldynamics/codegen/TypeGenerator.java
+@@ -161,6 +161,9 @@
+         out.print(objectType.bindingsClass);
+         out.print(" extends Plumbing\n{\n");
+ 
++        // Add at least one @Native field to ensure a native header is generated for this class
++        out.print("@java.lang.annotation.Native static final byte _JAVAH_HELPER_ = 0;\n");
++
+         out.print("    ");
+         out.print("private ");
+         out.print(objectType.bindingsClass);

debian/patches/series

@@ -4,3 +4,4 @@
 04_translations.patch
 05_ppc64el_configure.patch
 06_disable_java_check.patch
+07_java10_compatibility.patch

debian/rules

@@ -22,6 +22,3 @@ override_dh_auto_build-arch:
 	$(DEB_MAKE_ENVVARS) dh_auto_build -- all
 
 override_dh_auto_test:
-
-get-orig-source:
-	uscan --force-download --rename