debian/ant.properties

 timestamp = 19991231
 user.name = Debian
+servletapi.lib=/usr/share/java/servlet-api-3.1.jar

debian/changelog

+hsqldb (2.4.1-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 11 (Closes: #913052)
+  * Replaced use-system-servlet.jar.patch with a build property
+  * Standards-Version updated to 4.2.1
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Tue, 06 Nov 2018 23:33:09 +0100
+
 hsqldb (2.4.1-1) unstable; urgency=medium
 
   * New upstream version 2.4.1.

debian/control

@@ -11,9 +11,9 @@ Build-Depends:
  javahelper,
  libservlet3.1-java,
  maven-repo-helper
-Standards-Version: 4.1.4
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/hsqldb.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/hsqldb.git
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/hsqldb.git
+Vcs-Browser: https://salsa.debian.org/java-team/hsqldb
 Homepage: http://hsqldb.org/
 
 Package: libhsqldb-java

debian/patches/java11-compatibility.patch

+Description: Fixes the compatibility with Java 11
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/hsqldb/src/org/hsqldb/jdbc/JDBCSQLXML.java
++++ b/hsqldb/src/org/hsqldb/jdbc/JDBCSQLXML.java
+@@ -58,8 +58,6 @@
+ import java.util.zip.GZIPInputStream;
+ import java.util.zip.GZIPOutputStream;
+ 
+-import javax.xml.bind.util.JAXBResult;
+-import javax.xml.bind.util.JAXBSource;
+ import javax.xml.parsers.DocumentBuilder;
+ import javax.xml.parsers.DocumentBuilderFactory;
+ import javax.xml.parsers.FactoryConfigurationError;
+@@ -1462,7 +1460,12 @@
+     protected <T extends Source>T getSourceImpl(
+             Class<T> sourceClass) throws SQLException {
+ 
+-        if (JAXBSource.class.isAssignableFrom(sourceClass)) {
++        Class jaxbSourceClass = null;
++        try {
++            jaxbSourceClass = Class.forName("javax.xml.bind.util.JAXBSource");
++        } catch (Exception e) {
++        }
++        if (jaxbSourceClass != null && jaxbSourceClass.isAssignableFrom(sourceClass)) {
+ 
+             // Must go first presently, since JAXBSource extends SAXSource
+             // (purely as an implementation detail) and it's not possible
+@@ -1683,7 +1686,12 @@
+         setWritable(false);
+         setReadable(true);
+ 
+-        if (JAXBResult.class.isAssignableFrom(resultClass)) {
++        Class jaxbResultClass = null;
++        try {
++            jaxbResultClass = Class.forName("javax.xml.bind.util.JAXBResult");
++        } catch (Exception e) {
++        }
++        if (jaxbResultClass != null && jaxbResultClass.isAssignableFrom(resultClass)) {
+ 
+             // Must go first presently, since JAXBResult extends SAXResult
+             // (purely as an implementation detail) and it's not possible

debian/patches/series

-use-system-servlet.jar.patch
+java11-compatibility.patch

debian/patches/use-system-servlet.jar.patch

-From: Markus Koschany <apo@debian.org>
-Date: Wed, 16 Sep 2015 22:07:22 +0200
-Subject: use system servlet.jar
-
----
- hsqldb/build/build.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hsqldb/build/build.xml b/hsqldb/build/build.xml
-index ae8b37b..07fcefd 100644
---- a/hsqldb/build/build.xml
-+++ b/hsqldb/build/build.xml
-@@ -57,7 +57,7 @@
-    <property name="build.optimize" value="false"/>
-    <!-- N.b. Compilation optimization only has effect with JDK 1.1 and 1.2 -->
- 
--   <property name="servletapi.lib" value="lib/servlet-2_3-fcs-classfiles.zip"/>
-+   <property name="servletapi.lib" value="/usr/share/java/servlet-api-3.1.jar"/>
-    <property name="junit38.lib" value="lib/junit.jar"/>
-    <property name='jflex.lib' value='lib/JFlex.jar'/>
- 

debian/rules

@@ -29,6 +29,3 @@ override_jh_classpath:
 	jh_classpath
 	jh_classpath -plibhsqldb-java --classpath=/usr/share/java/servlet-api-3.1.jar \
 		hsqldb/lib/hsqldb.jar
-
-get-orig-source:
-	uscan --verbose --download-current-version --force-download --repack --compression xz

debian/watch

 version=4
-opts=dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/ \
+opts=repack,compression=xz,dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/ \
 http://sf.net/hsqldb/hsqldb-(.+)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz)