debian/changelog

+jdeb (1.6-3) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the test failure with BouncyCastle 1.60
+  * Fixed the shading of the BouncyCastle classes (Closes: #901456)
+  * Standards-Version updated to 4.1.5
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Tue, 31 Jul 2018 13:38:51 +0200
+
 jdeb (1.6-2) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -10,7 +10,7 @@ Build-Depends:
  debhelper (>= 11),
  default-jdk,
  junit,
- libbcpg-java (>= 1.57),
+ libbcpg-java (>= 1.60),
  libcommons-compress-java,
  libcommons-io-java,
  libmaven-invoker-plugin-java,
@@ -20,9 +20,9 @@ Build-Depends:
  libmockito-java,
  libxz-java,
  maven-debian-helper (>= 1.5)
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/jdeb.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jdeb.git
+Standards-Version: 4.1.5
+Vcs-Git: https://salsa.debian.org/java-team/jdeb.git
+Vcs-Browser: https://salsa.debian.org/java-team/jdeb
 Homepage: https://github.com/tcurdt/jdeb
 
 Package: libjdeb-java

debian/patches/01_fix_testcase_bouncycastle.patch

-Description: Update testcase to work with bouncycastle 1.58
+Description: Update testcase to work with bouncycastle 1.60
 Author: Andreas Moog <amoog@ubuntu.com>
 Forwarded: not-needed
 --- a/src/test/java/org/vafer/jdeb/signing/PGPSignerTestCase.java
 +++ b/src/test/java/org/vafer/jdeb/signing/PGPSignerTestCase.java
-@@ -42,7 +42,7 @@
+@@ -45,7 +45,7 @@
                  "\n" +
                  "TEST3\n" +
                  "-----BEGIN PGP SIGNATURE-----\n" +
 -                "Version: BCPG v1.58\n" +
-+                "Version: BCPG v1.59\n" +
++                "Version: BCPG v1.60\n" +
                  "\n" +
                  "iEYEARECABAFAkax1rgJEHM9pIAuB02PAABIJgCghFmoCJCZ0CGiqgVLGGPd/Yh5\n" +
                  "FQQAnRVqvI2ij45JQSHYJBblZ0Vv2meN\n" +

debian/patches/02_fix_bouncycastle_shading.patch

+Description: Fixes the shading og the BouncyCastle classes
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/pom.xml
++++ b/pom.xml
+@@ -156,8 +156,7 @@
+                 <includes>
+                   <include>org.apache.commons:commons-compress</include>
+                   <include>commons-io:commons-io</include>
+-                  <include>org.bouncycastle:bcpg-jdk15on</include>
+-                  <include>org.bouncycastle:bcprov-jdk15on</include>
++                  <include>org.bouncycastle:*</include>
+                   <include>org.tukaani:xz</include>
+                 </includes>
+               </artifactSet>

debian/patches/series

 01_fix_testcase_bouncycastle.patch
 #02_set_classpath_for_tests.patch
+02_fix_bouncycastle_shading.patch

debian/rules

@@ -7,6 +7,3 @@ export JAVA_HOME = /usr/lib/jvm/default-java
 
 override_dh_installchangelogs:
 	dh_installchangelogs -- HISTORY.md
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename