Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

During recent rebuilt testing in wheezy, FTBFS where recorded for 
wagon2 (#684841), jenkins (#684826), jenkins-ssh-cli-auth (#684829)
and jenkins-instance-identity (#684815).

The root cause of this issue is that the version of bouncycastle in
testing does not include maven artifacts; this is included in the
version in unstable (from 1.44+dfsg-3 onwards) but due to a new upstream
release (1.46) which only builds for Java 6+ this addition has never
migrated to testing due to build failures on archs which don't use
openjdk (kfreebsd-* and hurd-i386).

I'd like permission to target an upload of 1.44+dfsg-3 direct to testing
to resolve this issue - debdiff attached.

unblock bouncycastle/1.44+dfsg-3.1

- -- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.5.0-10-generic (SMP w/8 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAEBCAAGBQJQK1nCAAoJEL/srsug59jDiakP/3sNfhJnNdER7htrx7BxkEHz
hQe0T82aB4+otTaE7hTjtvHT9ynd6u7WOTdywkQa07cUONE3mBY5M7EMux8Udoiz
rrhZjjj+z0Nzs9UZkr7aoR+mmtjnYzsYVIzWG4TGcXS87HOiC58XrI15xs/RTiBE
eva36tGCsen8jN9I4ZzUZ5bjPAgHa0F7nRDgMRuGzikbbF1UTdiN+9OGSiWFTVya
mlJ5Ci3RXABg9kgVFXXqsMek5a12FKNC6Bc2aRDu9spRa/3oY560kjB+m+1E1it7
o6HQnh07aHnHYexmoN1JVOYak8yU9hex7GP036iKlHI8hVTSA8KnPHhghB3v7p3u
XwLbEU6HKAD5s7p1983tH9PUHrfEZsfW0h05z8rb8gTUqRbBemglZpynUsXirvMr
FNMhBuBKqnUFOrAmOFVDs1J4pxiVktdxRyUdQMR2deyADlcJCRtf0xfkzxaJl6Wy
xndJX7sb7jE2Eq7gvQF09l0pJ4OUx5jy6T//jmWxzIUkrGWR+MFqRGzEdAxnvvDm
qdTIR370iRFBXWlWir7LsPLzuTQTmlLb/KHXj6/byP8FyuzeNq0ZehLclgqiss0y
5qU8h7Sj3XrANmdZC/aavK0z9Bwgp+kiiRT8CybNOBE6eS2MAauT7FtvNFTcCcm2
RDaLTla9lZ40ZAEvsI0u
=whjC
-----END PGP SIGNATURE-----
diff -u bouncycastle-1.44+dfsg/debian/rules bouncycastle-1.44+dfsg/debian/rules
--- bouncycastle-1.44+dfsg/debian/rules
+++ bouncycastle-1.44+dfsg/debian/rules
@@ -32,7 +32,8 @@
 
 # bcprov
 binary-install/libbcprov-java:: build/libbcprov-java
-	install -m 644 $(builddir)/jars/bcprov-jdk14-*.jar debian/libbcprov-java/usr/share/java/bcprov.jar
+	mh_installpoms -plibbcprov-java
+	mh_installjar -plibbcprov-java -l debian/poms/bcprov.pom $(builddir)/jars/bcprov-jdk14-*.jar
 	ln -sf ../bcprov.jar debian/libbcprov-java/usr/share/java/gcj-endorsed/bcprov.jar
 	touch debian/libbcprov-java/etc/java/security/security.d/2000-org.bouncycastle.jce.provider.BouncyCastleProvider
 binary-install/libbcprov-java-doc::
@@ -40,19 +41,22 @@
 
 # bcmail
 binary-install/libbcmail-java:: build/libbcmail-java
-	install -m 644 $(builddir)/jars/bcmail-jdk14-*.jar debian/libbcmail-java/usr/share/java/bcmail.jar
+	mh_installpoms -plibbcmail-java
+	mh_installjar -plibbcmail-java -l debian/poms/bcmail.pom $(builddir)/jars/bcmail-jdk14-*.jar
 binary-install/libbcmail-java-doc::
 	mv -i $(builddir)/javadoc/bcmail debian/libbcmail-java-doc/usr/share/doc/libbcmail-java-doc/api
 
 # bcpg
 binary-install/libbcpg-java:: build/libbcpg-java
-	install -m 644 $(builddir)/jars/bcpg-jdk14-*.jar debian/libbcpg-java/usr/share/java/bcpg.jar
+	mh_installpoms -plibbcpg-java
+	mh_installjar -plibbcpg-java -l debian/poms/bcpg.pom $(builddir)/jars/bcpg-jdk14-*.jar
 binary-install/libbcpg-java-doc::
 	mv -i $(builddir)/javadoc/bcpg debian/libbcpg-java-doc/usr/share/doc/libbcpg-java-doc/api
 
 # bctsp
 binary-install/libbctsp-java:: build/libbctsp-java
-	install -m 644 $(builddir)/jars/bctsp-jdk14-*.jar debian/libbctsp-java/usr/share/java/bctsp.jar
+	mh_installpoms -plibbctsp-java
+	mh_installjar -plibbctsp-java -l debian/poms/bctsp.pom $(builddir)/jars/bctsp-jdk14-*.jar
 binary-install/libbctsp-java-doc::
 	mv -i $(builddir)/javadoc/bctsp debian/libbctsp-java-doc/usr/share/doc/libbctsp-java-doc/api
 
@@ -90,0 +95,11 @@
+
+POMS=bcprov bcpg bcmail bctsp
+UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p' | sed 's/\+dfsg//')
+
+get-orig-pom:
+	mkdir -p debian/poms
+	for pom in $(POMS); do \
+		wget -O debian/poms/$${pom}.pom -U NoAgent-1.0 \
+			http://repo1.maven.org/maven2/org/bouncycastle/$${pom}-jdk14/$(UPSTREAM_VERSION)/$${pom}-jdk14-$(UPSTREAM_VERSION).pom ; \
+	done ;
+
diff -u bouncycastle-1.44+dfsg/debian/changelog bouncycastle-1.44+dfsg/debian/changelog
--- bouncycastle-1.44+dfsg/debian/changelog
+++ bouncycastle-1.44+dfsg/debian/changelog
@@ -1,3 +1,28 @@
+bouncycastle (1.44+dfsg-3.1) testing; urgency=low
+
+  * Target upload for testing to enable maven artifacts and fix up
+    FTBFS in a number of other rbd's.
+
+ -- James Page <james.p...@ubuntu.com>  Wed, 15 Aug 2012 08:59:20 +0100
+
+bouncycastle (1.44+dfsg-3) unstable; urgency=low
+
+  * Team upload.
+
+  [Niels Thykier]
+  * Changed the section of the gcj packages to java.
+  * Replaced B-D on default-jdk-builddep with gcj-native-helper
+    and default-jdk.
+
+  [tony mancill]
+  * Apply patch to deploy maven artifacts. (Closes: #632183)
+    Thanks to James Page.
+  * All Recommends on *-gcj packages downgraded to Suggests. 
+    (Closes: #585062)
+  * Bumped Standards-Versions 3.9.2 - no changes required.
+
+ -- tony mancill <tmanc...@debian.org>  Sun, 10 Jul 2011 16:27:31 -0700
+
 bouncycastle (1.44+dfsg-2) unstable; urgency=low
 
   [ Thierry Carrez ]
diff -u bouncycastle-1.44+dfsg/debian/control bouncycastle-1.44+dfsg/debian/control
--- bouncycastle-1.44+dfsg/debian/control
+++ bouncycastle-1.44+dfsg/debian/control
@@ -1,20 +1,19 @@
 Source: bouncycastle
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintain...@lists.alioth.debian.org>
 Uploaders: Matthias Klose <d...@ubuntu.com>, Michael Koch <konque...@gmx.de>
-Build-Depends: cdbs (>= 0.4.27), debhelper (>= 7), ant, default-jdk-builddep, quilt, libgnumail-java, junit
-Standards-Version: 3.8.3
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 7), ant, default-jdk, gcj-native-helper, quilt, libgnumail-java,
+ junit, ant-optional, maven-repo-helper
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/bouncycastle
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/bouncycastle
 Homepage: http://www.bouncycastle.org/
 
 Package: libbcprov-java
-Section: java
 Architecture: all
 Depends: libgcj-common (>= 1:4.1.1-19), default-jre-headless | java2-runtime-headless, ${misc:Depends}
-Recommends: libbcprov-java-gcj
-Suggests: java-virtual-machine, libbcprov-java-doc
+Suggests: java-virtual-machine, libbcprov-java-doc, libbcprov-java-gcj
 Description: Bouncy Castle Java Cryptographic Service Provider
  The Bouncy Castle Crypto package is a Java implementation of
  cryptographic algorithms.
@@ -30,11 +29,9 @@
  algorithms.
 
 Package: libbcmail-java
-Section: java
 Architecture: all
 Depends: default-jre-headless | java2-runtime-headless, libgnumail-java, libgnujaf-java, ${misc:Depends}
-Recommends: libbcmail-java-gcj
-Suggests: java-virtual-machine, libbcmail-java-doc
+Suggests: java-virtual-machine, libbcmail-java-doc,libbcmail-java-gcj
 Description: Bouncy Castle generators/processors for S/MIME and CMS
  The Bouncy Castle Crypto package is a Java implementation of
  cryptographic algorithms.
@@ -51,11 +48,9 @@
  processors for S/MIME and CMS.
 
 Package: libbctsp-java
-Section: java
 Architecture: all
 Depends: default-jre-headless | java2-runtime-headless, ${misc:Depends}
-Recommends: libbctsp-java-gcj
-Suggests: java-virtual-machine, libbctsp-java-doc
+Suggests: java-virtual-machine, libbctsp-java-doc, libbctsp-java-gcj
 Description: Bouncy Castle generators/processors for TSP
  The Bouncy Castle Crypto package is a Java implementation of
  cryptographic algorithms.
@@ -71,11 +66,9 @@
  for TSP.
 
 Package: libbcpg-java
-Section: java
 Architecture: all
 Depends: default-jre-headless | java2-runtime-headless, ${misc:Depends}
-Recommends: libbcpg-java-gcj
-Suggests: java-virtual-machine, libbcpg-java-doc
+Suggests: java-virtual-machine, libbcpg-java-doc, libbcpg-java-gcj
 Description: Bouncy Castle generators/processors for OpenPGP
  The Bouncy Castle Crypto package is a Java implementation of
  cryptographic algorithms.
only in patch2:
unchanged:
--- bouncycastle-1.44+dfsg.orig/debian/libbcprov-java.poms
+++ bouncycastle-1.44+dfsg/debian/libbcprov-java.poms
@@ -0,0 +1 @@
+debian/poms/bcprov.pom
only in patch2:
unchanged:
--- bouncycastle-1.44+dfsg.orig/debian/libbctsp-java.poms
+++ bouncycastle-1.44+dfsg/debian/libbctsp-java.poms
@@ -0,0 +1 @@
+debian/poms/bctsp.pom
only in patch2:
unchanged:
--- bouncycastle-1.44+dfsg.orig/debian/maven.rules
+++ bouncycastle-1.44+dfsg/debian/maven.rules
@@ -0,0 +1,5 @@
+# Strip out -jdk14 as Ubuntu/Debian does not build multiple versions
+org.bouncycastle s/bcmail-jdk14/bcmail/ * s/.*/debian/ * *
+org.bouncycastle s/bcprov-jdk14/bcprov/ * s/.*/debian/ * *
+org.bouncycastle s/bctsp-jdk14/bctsp/ * s/.*/debian/ * *
+org.bouncycastle s/bcpg-jdk14/bcpg/ * s/.*/debian/ * *
only in patch2:
unchanged:
--- bouncycastle-1.44+dfsg.orig/debian/libbcmail-java.poms
+++ bouncycastle-1.44+dfsg/debian/libbcmail-java.poms
@@ -0,0 +1 @@
+debian/poms/bcmail.pom
only in patch2:
unchanged:
--- bouncycastle-1.44+dfsg.orig/debian/libbcpg-java.poms
+++ bouncycastle-1.44+dfsg/debian/libbcpg-java.poms
@@ -0,0 +1 @@
+debian/poms/bcpg.pom
only in patch2:
unchanged:
--- bouncycastle-1.44+dfsg.orig/debian/poms/bcmail.pom
+++ bouncycastle-1.44+dfsg/debian/poms/bcmail.pom
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.bouncycastle</groupId>
+  <artifactId>bcmail-jdk14</artifactId>
+  <packaging>jar</packaging>
+  <name>Bouncy Castle CMS and S/MIME API</name>
+  <version>1.44</version>
+  <description>The Bouncy Castle Java CMS and S/MIME APIs for handling the CMS and S/MIME protocols. This jar contains CMS and S/MIME APIs for JDK 1.4. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs. If the S/MIME API is used, the JavaMail API and the Java activation framework will also be needed.</description>
+  <url>http://www.bouncycastle.org/java.html</url>
+  <licenses>
+    <license>
+      <name>Bouncy Castle Licence</name>
+      <url>http://www.bouncycastle.org/licence.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk14</artifactId>
+      <version>1.44</version>
+      <type>jar</type>
+    </dependency>
+  </dependencies>
+</project>
only in patch2:
unchanged:
--- bouncycastle-1.44+dfsg.orig/debian/poms/bcprov.pom
+++ bouncycastle-1.44+dfsg/debian/poms/bcprov.pom
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.bouncycastle</groupId>
+  <artifactId>bcprov-jdk14</artifactId>
+  <packaging>jar</packaging>
+  <name>Bouncy Castle Provider</name>
+  <version>1.44</version>
+  <description>The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms. This jar contains JCE provider and lightweight API for the Bouncy Castle Cryptography APIs for JDK 1.4.</description>
+  <url>http://www.bouncycastle.org/java.html</url>
+  <licenses>
+    <license>
+      <name>Bouncy Castle Licence</name>
+      <url>http://www.bouncycastle.org/licence.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url>
+  </scm>
+</project>
only in patch2:
unchanged:
--- bouncycastle-1.44+dfsg.orig/debian/poms/bcpg.pom
+++ bouncycastle-1.44+dfsg/debian/poms/bcpg.pom
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.bouncycastle</groupId>
+  <artifactId>bcpg-jdk14</artifactId>
+  <packaging>jar</packaging>
+  <name>Bouncy Castle OpenPGP API</name>
+  <version>1.44</version>
+  <description>The Bouncy Castle Java API for handling the OpenPGP protocol. This jar contains the OpenPGP API for JDK 1.4. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs.</description>
+  <url>http://www.bouncycastle.org/java.html</url>
+  <licenses>
+    <license>
+      <name>Bouncy Castle Licence</name>
+      <url>http://www.bouncycastle.org/licence.html</url>
+      <distribution>repo</distribution>
+    </license>
+    <license>
+      <name>Apache Software License, Version 1.1</name>
+      <url>http://www.apache.org/licenses/LICENSE-1.1</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk14</artifactId>
+      <version>1.44</version>
+      <type>jar</type>
+    </dependency>
+  </dependencies>
+</project>
only in patch2:
unchanged:
--- bouncycastle-1.44+dfsg.orig/debian/poms/bctsp.pom
+++ bouncycastle-1.44+dfsg/debian/poms/bctsp.pom
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.bouncycastle</groupId>
+  <artifactId>bctsp-jdk14</artifactId>
+  <packaging>jar</packaging>
+  <name>Bouncy Castle OpenPGP API</name>
+  <version>1.44</version>
+  <description>The Bouncy Castle Java API for handling the Time Stamp Protocol (TSP). This jar contains the TSP API for JDK 1.4. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs.</description>
+  <url>http://www.bouncycastle.org/java.html</url>
+  <licenses>
+    <license>
+      <name>Bouncy Castle Licence</name>
+      <url>http://www.bouncycastle.org/licence.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk14</artifactId>
+      <version>1.44</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcmail-jdk14</artifactId>
+      <version>1.44</version>
+      <type>jar</type>
+    </dependency>
+  </dependencies>
+</project>

Reply via email to