debian/changelog

-jython (2.7.1+repack-4) UNRELEASED; urgency=medium
+jython (2.7.1+repack-4) unstable; urgency=medium
 
-  * Team upload.
+  [ Emmanuel Bourg ]
   * Removed the unused build dependency on liblivetribe-jsr223-java
 
- -- Emmanuel Bourg <ebourg@apache.org>  Fri, 06 Apr 2018 17:46:44 +0200
+  [ Gilles Filippini ]
+  * Fix jh_installlibs regex (closes: #909910)
+  * Add myself to Uploaders
+  * New patch javadoc-classpath.patch: add missing junit4.jar to the javadoc
+    classpath
+
+ -- Gilles Filippini <pini@debian.org>  Tue, 02 Oct 2018 23:00:24 +0200
 
 jython (2.7.1+repack-3) unstable; urgency=medium
 

debian/control

@@ -2,7 +2,7 @@ Source: jython
 Section: python
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Jakub Adam <jakub.adam@ktknet.cz>
+Uploaders: Jakub Adam <jakub.adam@ktknet.cz>, Gilles Filippini <pini@debian.org>
 Build-Depends: debhelper (>= 10), dh-exec, ant, gawk, maven-repo-helper, javahelper, python
 Build-Depends-Indep: default-jdk,
  dh-python,

debian/patches/javadoc-classpath.patch

+Index: jython/build.xml
+===================================================================
+--- jython.orig/build.xml
++++ jython/build.xml
+@@ -711,6 +711,7 @@ The readme text for the next release wil
+         <path id="javadoc.classpath">
+             <pathelement path="${java.class.path}" />
+             <pathelement path="${compile.dir}" />
++            <pathelement path="/usr/share/java/junit4.jar" />
+             <path refid="main.classpath" />
+         </path>
+         <javadoc sourcepath="${source.dir}"

debian/patches/series

@@ -2,3 +2,4 @@
 01-classpath.patch
 03-default-cachedir.patch
 05-no-com.carrotsearch.sizeof.patch
+javadoc-classpath.patch

debian/rules

@@ -86,7 +86,7 @@ override_dh_auto_clean:
 	rm -rf extlibs
 
 override_jh_installlibs:
-	jh_installlibs --version-strip="+.*"
+	jh_installlibs --version-strip="[+].*"
 
 # libmysql-java and libpostgresql-jdbc-java are part of Suggests
 override_jh_depends: