debian/changelog

-ring-clojure (1.6.2-2) UNRELEASED; urgency=medium
+ring-clojure (1.6.2-2) unstable; urgency=medium
 
+  [ Cyril Brulebois ]
   * Sort filenames for tests found using find, to ensure reproducible
     lists of test files, as order matters for successful test runs. This
     fixes the intermittent FTBFS due to test failures (Closes: #918437).
   * Update Vcs-{Browser,Git} to point to salsa (alioth's replacement).
 
- -- Cyril Brulebois <kibi@debian.org>  Fri, 08 Feb 2019 12:31:29 +0000
+  [ Apollon Oikonomopoulos ]
+  * Work around jh_classpath not being able to process jars in multiple
+    packages
+  * Bump Standards-Version to 4.3.0; no changes needed
+  * d/copyright: bump debian/ years
+  * Bump dh compat to 11; no changes needed
+
+ -- Apollon Oikonomopoulos <apoikos@debian.org>  Fri, 08 Feb 2019 22:32:59 +0200
 
 ring-clojure (1.6.2-1) unstable; urgency=medium
 

debian/compat

-10
+11

debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Apollon Oikonomopoulos <apoikos@debian.org>
 Build-Depends: clojure (>= 1.8),
-               debhelper (>= 10),
+               debhelper (>= 11),
                default-jdk,
                javahelper (>= 0.32),
                libring-codec-clojure,
@@ -17,7 +17,7 @@ Build-Depends: clojure (>= 1.8),
                libjetty9-java,
                markdown,
                maven-repo-helper (>= 1.5~)
-Standards-Version: 4.0.0
+Standards-Version: 4.3.0
 Vcs-Git: https://salsa.debian.org/java-team/ring-clojure.git
 Vcs-Browser: https://salsa.debian.org/java-team/ring-clojure
 Homepage: https://github.com/ring-clojure/ring

debian/copyright

@@ -37,7 +37,7 @@ License: BSD-3-Clause
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: debian/*
-Copyright: 2017 Apollon Oikonomopoulos <apoikos@debian.org>
+Copyright: 2017-2019 Apollon Oikonomopoulos <apoikos@debian.org>
 License: MIT/X11
 
 License: MIT/X11 

debian/libring-core-clojure.classpath

-/usr/share/java/ring-core.jar /usr/share/java/clojure.jar /usr/share/java/tools.reader.jar /usr/share/java/ring-codec.jar /usr/share/java/commons-io.jar /usr/share/java/commons-fileupload.jar /usr/share/java/clj-time.jar /usr/share/java/crypto-random.jar /usr/share/java/crypto-equality.jar
+usr/share/java/ring-core.jar /usr/share/java/clojure.jar /usr/share/java/tools.reader.jar /usr/share/java/ring-codec.jar /usr/share/java/commons-io.jar /usr/share/java/commons-fileupload.jar /usr/share/java/clj-time.jar /usr/share/java/crypto-random.jar /usr/share/java/crypto-equality.jar

debian/libring-jetty-adapter-clojure.classpath

-/usr/share/java/ring-jetty-adapter.jar /usr/share/java/clojure.jar /usr/share/java/ring-core.jar /usr/share/java/ring-servlet.jar /usr/share/java/jetty9-server.jar /usr/share/java/jetty9-util.jar /usr/share/java/jetty9-http.jar /usr/share/java/jetty9-io.jar
+usr/share/java/ring-jetty-adapter.jar /usr/share/java/clojure.jar /usr/share/java/ring-core.jar /usr/share/java/ring-servlet.jar /usr/share/java/jetty9-server.jar /usr/share/java/jetty9-util.jar /usr/share/java/jetty9-http.jar /usr/share/java/jetty9-io.jar

debian/libring-servlet-clojure.classpath

-/usr/share/java/ring-servlet.jar /usr/share/java/clojure.jar
+usr/share/java/ring-servlet.jar /usr/share/java/clojure.jar

debian/rules

@@ -14,6 +14,12 @@ override_jh_build:
 	jar cf ring-servlet.jar -C ring-servlet/src .
 	jar cf ring-jetty-adapter.jar -C ring-jetty-adapter/src .
 
+# Work around jh_classpath not being able to handle multiple packages correctly
+override_jh_classpath:
+	jh_classpath -plibring-core-clojure
+	jh_classpath -plibring-servlet-clojure
+	jh_classpath -plibring-jetty-adapter-clojure
+
 # Sorting the filenames according to the C locale is sufficient to get a
 # successful run as of 1.6.2 but further updates might need to encode a
 # specific sequence instead (#918437):