[pkg-java] r17470 - in trunk/jdeb/debian: . patches

[Tony Mancill]

Author: tmancill
Date: 2013-11-21 06:42:37 +0000 (Thu, 21 Nov 2013)
New Revision: 17470

Added:
   trunk/jdeb/debian/patches/
   trunk/jdeb/debian/patches/01_fix_testcase_bouncycastle.patch
   trunk/jdeb/debian/patches/series
Modified:
   trunk/jdeb/debian/changelog
   trunk/jdeb/debian/control
   trunk/jdeb/debian/maven.properties
Log:
packaging changes for 1.0.2~git20130829-2

Modified: trunk/jdeb/debian/changelog
===================================================================
--- trunk/jdeb/debian/changelog	2013-11-21 06:40:58 UTC (rev 17469)
+++ trunk/jdeb/debian/changelog	2013-11-21 06:42:37 UTC (rev 17470)
@@ -1,11 +1,21 @@
-jdeb (1.0.2~git20130829-2) UNRELEASED; urgency=low
+jdeb (1.0.2~git20130829-2) unstable; urgency=low
 
-  * Ignore the test failures when building
+  * Team upload.
+
+  [ Emmanuel Bourg ]
   * Added a watch file
   * Install the upstream changelog
 
- -- Emmanuel Bourg <ebourg at apache.org>  Mon, 23 Sep 2013 10:05:54 +0200
+  [ tony mancill ]
+  * Apply patch from Andreas Moog
+    - Add Build-Depends on libmaven-plugin-tools-java to fix FTBFS 
+      (Closes: #724097) (LP: #1249778)
+    - debian/patches/01_fix_testcase_bouncycastle.patch:
+        Update testcase to work with bouncycastle 1.49
+  * Re-enabled test failures while building
 
+ -- tony mancill <tmancill at debian.org>  Fri, 15 Nov 2013 21:17:44 -0800
+
 jdeb (1.0.2~git20130829-1) unstable; urgency=low
 
   * Initial release (Closes: #721249).

Modified: trunk/jdeb/debian/control
===================================================================
--- trunk/jdeb/debian/control	2013-11-21 06:40:58 UTC (rev 17469)
+++ trunk/jdeb/debian/control	2013-11-21 06:42:37 UTC (rev 17470)
@@ -5,7 +5,7 @@
 Uploaders: Steffen Moeller <moeller at debian.org>, Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.5)
 Build-Depends-Indep: libmaven-invoker-plugin-java, libmaven-shade-plugin-java, ant, libbcpg-java,  
- libcommons-compress-java, libcommons-io-java, libmaven2-core-java, libplexus-utils-java 
+ libcommons-compress-java, libcommons-io-java, libmaven2-core-java, libplexus-utils-java, libmaven-plugin-tools-java
 Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jdeb
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jdeb

Modified: trunk/jdeb/debian/maven.properties
===================================================================
--- trunk/jdeb/debian/maven.properties	2013-11-21 06:40:58 UTC (rev 17469)
+++ trunk/jdeb/debian/maven.properties	2013-11-21 06:42:37 UTC (rev 17470)
@@ -2,4 +2,4 @@
 # For example:
 # maven.test.skip=true
 
-maven.test.failure.ignore=true
+#maven.test.failure.ignore=true

Added: trunk/jdeb/debian/patches/01_fix_testcase_bouncycastle.patch
===================================================================
--- trunk/jdeb/debian/patches/01_fix_testcase_bouncycastle.patch	                        (rev 0)
+++ trunk/jdeb/debian/patches/01_fix_testcase_bouncycastle.patch	2013-11-21 06:42:37 UTC (rev 17470)
@@ -0,0 +1,14 @@
+Description: Update testcase to work with bouncycastle 1.49
+Author: Andreas Moog <amoog at ubuntu.com>
+
+--- jdeb-1.0.2~git20130829.orig/src/test/java/org/vafer/jdeb/signing/PGPSignerTestCase.java
++++ jdeb-1.0.2~git20130829/src/test/java/org/vafer/jdeb/signing/PGPSignerTestCase.java
+@@ -42,7 +42,7 @@ public final class PGPSignerTestCase ext
+                 "\n" +
+                 "TEST3\n" +
+                 "-----BEGIN PGP SIGNATURE-----\n" +
+-                "Version: BCPG v1.48\n" +
++                "Version: BCPG v1.49\n" +
+                 "\n" +
+                 "iEYEARECABAFAkax1rgJEHM9pIAuB02PAABIJgCghFmoCJCZ0CGiqgVLGGPd/Yh5\n" +
+                 "FQQAnRVqvI2ij45JQSHYJBblZ0Vv2meN\n" +

Added: trunk/jdeb/debian/patches/series
===================================================================
--- trunk/jdeb/debian/patches/series	                        (rev 0)
+++ trunk/jdeb/debian/patches/series	2013-11-21 06:42:37 UTC (rev 17470)
@@ -0,0 +1 @@
+01_fix_testcase_bouncycastle.patch