[Git][java-team/jdeb][master] 5 commits: Standards-Version updated to 4.1.5

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jdeb


Commits:
72ba674b by Emmanuel Bourg at 2018-07-31T10:33:17Z
Standards-Version updated to 4.1.5

- - - - -
f6aa325d by Emmanuel Bourg at 2018-07-31T10:33:29Z
Use salsa.debian.org Vcs-* URLs

- - - - -
e246d3f2 by Emmanuel Bourg at 2018-07-31T10:39:18Z
Fixed the test failure with BouncyCastle 1.60

- - - - -
d3a5323f by Emmanuel Bourg at 2018-07-31T11:38:42Z
Fixed the shading of the BouncyCastle classes (Closes: #901456)

- - - - -
83fd7eca by Emmanuel Bourg at 2018-07-31T11:38:55Z
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/patches/01_fix_testcase_bouncycastle.patch
- + debian/patches/02_fix_bouncycastle_shading.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+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 at apache.org>  Tue, 31 Jul 2018 13:38:51 +0200
+
 jdeb (1.6-2) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/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
=====================================
--- a/debian/patches/01_fix_testcase_bouncycastle.patch
+++ b/debian/patches/01_fix_testcase_bouncycastle.patch
@@ -1,14 +1,14 @@
-Description: Update testcase to work with bouncycastle 1.58
+Description: Update testcase to work with bouncycastle 1.60
 Author: Andreas Moog <amoog at 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
=====================================
--- /dev/null
+++ b/debian/patches/02_fix_bouncycastle_shading.patch
@@ -0,0 +1,15 @@
+Description: Fixes the shading og the BouncyCastle classes
+Author: Emmanuel Bourg <ebourg at 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
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_fix_testcase_bouncycastle.patch
 #02_set_classpath_for_tests.patch
+02_fix_bouncycastle_shading.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/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



View it on GitLab: https://salsa.debian.org/java-team/jdeb/compare/8a3853c4e288a3318322e37e72748c11aba45ce7...83fd7ecaeecb13569229d9e200074b2c7d47ec36

-- 
View it on GitLab: https://salsa.debian.org/java-team/jdeb/compare/8a3853c4e288a3318322e37e72748c11aba45ce7...83fd7ecaeecb13569229d9e200074b2c7d47ec36
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180731/b65dba40/attachment.html>