[jdeb] 02/06: Refreshed the patches

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jdeb.

commit d35e679b42c6e93df544bcda7b65eb177f27e5e8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Mar 29 16:58:24 2016 +0200

    Refreshed the patches
---
 debian/changelog                                  |  8 ++++++++
 debian/patches/01_fix_testcase_bouncycastle.patch |  4 ++--
 debian/patches/02_set_classpath_for_tests.patch   | 12 ------------
 debian/patches/series                             |  2 +-
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 96263a5..253fb37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jdeb (1.5-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 29 Mar 2016 16:50:11 +0200
+
 jdeb (1.4-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/01_fix_testcase_bouncycastle.patch b/debian/patches/01_fix_testcase_bouncycastle.patch
index c524486..f123ee1 100644
--- a/debian/patches/01_fix_testcase_bouncycastle.patch
+++ b/debian/patches/01_fix_testcase_bouncycastle.patch
@@ -3,11 +3,11 @@ Author: Andreas Moog <amoog at ubuntu.com>
 
 --- a/src/test/java/org/vafer/jdeb/signing/PGPSignerTestCase.java
 +++ b/src/test/java/org/vafer/jdeb/signing/PGPSignerTestCase.java
-@@ -41,7 +41,7 @@
+@@ -42,7 +42,7 @@
                  "\n" +
                  "TEST3\n" +
                  "-----BEGIN PGP SIGNATURE-----\n" +
--                "Version: BCPG v1.51\n" +
+-                "Version: BCPG v1.53\n" +
 +                "Version: BCPG v1.51\n" +
                  "\n" +
                  "iEYEARECABAFAkax1rgJEHM9pIAuB02PAABIJgCghFmoCJCZ0CGiqgVLGGPd/Yh5\n" +
diff --git a/debian/patches/02_set_classpath_for_tests.patch b/debian/patches/02_set_classpath_for_tests.patch
deleted file mode 100644
index 3da140e..0000000
--- a/debian/patches/02_set_classpath_for_tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/pom.xml
-+++ b/pom.xml
-@@ -176,6 +176,9 @@
-                     <excludes>
-                         <exclude>**/Abstract*</exclude>
-                     </excludes>
-+                    <additionalClasspathElements>
-+                        <additionalClasspathElement>/usr/share/java/xz.jar</additionalClasspathElement>
-+                    </additionalClasspathElements>
-                     <testFailureIgnore>false</testFailureIgnore>
-                     <skip>false</skip>
-                 </configuration>
diff --git a/debian/patches/series b/debian/patches/series
index d9b66cd..402e95d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 01_fix_testcase_bouncycastle.patch
-02_set_classpath_for_tests.patch
+#02_set_classpath_for_tests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jdeb.git