[pkg-java] r15675 - in trunk/bouncycastle/debian: . patches poms

Steffen Möller moeller at alioth.debian.org
Tue Jan 10 12:29:56 UTC 2012 

Author: moeller
Date: 2012-01-10 12:29:55 +0000 (Tue, 10 Jan 2012)
New Revision: 15675

Modified:
   trunk/bouncycastle/debian/changelog
   trunk/bouncycastle/debian/control
   trunk/bouncycastle/debian/patches/01_build.patch
   trunk/bouncycastle/debian/patches/02_index.patch
   trunk/bouncycastle/debian/poms/bcmail.pom
   trunk/bouncycastle/debian/poms/bcpg.pom
   trunk/bouncycastle/debian/poms/bcprov.pom
   trunk/bouncycastle/debian/poms/bctsp.pom
   trunk/bouncycastle/debian/rules
Log:
Interim upload for Brian of attempted
merger of bouncycastle's 1.46 update.


Modified: trunk/bouncycastle/debian/changelog
===================================================================
--- trunk/bouncycastle/debian/changelog	2012-01-09 21:52:22 UTC (rev 15674)
+++ trunk/bouncycastle/debian/changelog	2012-01-10 12:29:55 UTC (rev 15675)
@@ -1,3 +1,32 @@
+bouncycastle (1.46+dfsg-1) UNRELEASED; urgency=low
+
+  [ by sponsor Steffen Moeller ]
+  * Merging Ubuntu changes with what is in pkg-java
+  * Removing Michael Koch from uploaders, adding Brian
+
+ -- Brian Thomason <brian.thomason at eucalyptus.com>  Tue, 10 Jan 2012 13:15:54 +0100
+
+bouncycastle (1.46+dfsg-0ubuntu1) precise; urgency=low
+
+  * New upstream release
+  * Updated Standards-Version to 3.9.2
+  * Changed source format to 3.0 (quilt)
+  * Changed Section to Java
+
+ -- Brian Thomason <brian.thomason at eucalyptus.com>  Tue, 06 Dec 2011 20:53:23 +0000
+
+bouncycastle (1.44+dfsg-2ubuntu2) oneiric; urgency=low
+
+  * Deployment of Maven artifacts:
+    - debian/rules: retrieve source POM's and install
+    - debian/control: Build-depend on maven-repo-helper
+    - debian/poms/*: versioned POM's from repo1.maven.org
+    - debian/lib[bcprov|bcmail|bcpg|bctsp].poms; POM lists
+      for deployment to maven-repo
+    - debian/maven.rules: Transform rules for POM deployment
+
+ -- James Page <james.page at ubuntu.com>  Wed, 29 Jun 2011 16:36:43 +0100
+
 bouncycastle (1.44+dfsg-3) unstable; urgency=low
 
   * Team upload.
@@ -16,6 +45,16 @@
 
  -- tony mancill <tmancill at debian.org>  Sun, 10 Jul 2011 16:27:31 -0700
 
+bouncycastle (1.44+dfsg-2ubuntu1) maverick; urgency=low
+
+  * Merge from debian. Remaining changes:
+    - debian/rules: Enable test suite
+    - debian/control: Build-depend on ant-optional (needed for test suite)
+    - debian/control: Only suggest libbcprov-java-gcj on selected
+      architectures, build libbcprov-java architecture "any" to have it work
+
+ -- Thierry Carrez <thierry.carrez at ubuntu.com>  Thu, 03 Jun 2010 15:51:05 +0200
+
 bouncycastle (1.44+dfsg-2) unstable; urgency=low
 
   [ Thierry Carrez ]

Modified: trunk/bouncycastle/debian/control
===================================================================
--- trunk/bouncycastle/debian/control	2012-01-09 21:52:22 UTC (rev 15674)
+++ trunk/bouncycastle/debian/control	2012-01-10 12:29:55 UTC (rev 15675)
@@ -2,8 +2,8 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Matthias Klose <doko at ubuntu.com>, Michael Koch <konqueror at gmx.de>
-Build-Depends: cdbs (>= 0.4.27), debhelper (>= 7), ant, default-jdk, gcj-native-helper, quilt, libgnumail-java,
+Uploaders: Matthias Klose <doko at ubuntu.com>, Brian Thomason <brian.thomason at eucalyptus.com>
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 7.0.50~), ant, 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

Modified: trunk/bouncycastle/debian/patches/01_build.patch
===================================================================
--- trunk/bouncycastle/debian/patches/01_build.patch	2012-01-09 21:52:22 UTC (rev 15674)
+++ trunk/bouncycastle/debian/patches/01_build.patch	2012-01-10 12:29:55 UTC (rev 15675)
@@ -1,5 +1,7 @@
---- bouncycastle-1.33/build1-4.orig	2007-07-15 19:27:18.000000000 +0200
-+++ bouncycastle-1.33/build1-4	2007-07-15 19:28:24.000000000 +0200
+Description: Set JRE paths and replace mail.jar reference with gnumail.jar
+
+--- bouncycastle-1.46+dfsg.orig/build1-4
++++ bouncycastle-1.46+dfsg/build1-4
 @@ -6,9 +6,9 @@
  # otherwise it just creates the docs and class files.
  #
@@ -13,7 +15,7 @@
  
  JAVA_HOME=$JDKPATH
  export JAVA_HOME
-@@ -16,7 +16,7 @@
+@@ -16,7 +16,7 @@ export JAVA_HOME
  PATH=$JDKPATH/bin:$PATH
  export PATH
  
@@ -21,4 +23,12 @@
 +CLASSPATH=$JAVA_MAIL_HOME/gnumail.jar:$JAVA_ACTIVATION_HOME/activation.jar:$CLASSPATH
  export CLASSPATH
  
- if [ "$1" == "test" ]
+ if [ "$1" = "test" ]
+@@ -26,6 +26,6 @@ else
+     if ant -f jdk14.xml build-provider
+     then
+         ant -f jdk14.xml build
+-        ant -f jdk14.xml zip-src
++        #ant -f jdk14.xml zip-src
+     fi
+ fi

Modified: trunk/bouncycastle/debian/patches/02_index.patch
===================================================================
--- trunk/bouncycastle/debian/patches/02_index.patch	2012-01-09 21:52:22 UTC (rev 15674)
+++ trunk/bouncycastle/debian/patches/02_index.patch	2012-01-10 12:29:55 UTC (rev 15675)
@@ -1,6 +1,8 @@
---- bouncycastle-1.33/index.html.orig	2007-07-15 19:31:02.000000000 +0200
-+++ bouncycastle-1.33/index.html	2007-07-15 19:31:27.000000000 +0200
-@@ -36,7 +36,7 @@
+Description: Refer to documentation contained in doc package
+
+--- bouncycastle-1.46+dfsg.orig/index.html
++++ bouncycastle-1.46+dfsg/index.html
+@@ -36,7 +36,7 @@ The current specifications for this pack
  <a href=specifications.html>here</a>.
  <p>
  The current api documentation for this package is

Modified: trunk/bouncycastle/debian/poms/bcmail.pom
===================================================================
--- trunk/bouncycastle/debian/poms/bcmail.pom	2012-01-09 21:52:22 UTC (rev 15674)
+++ trunk/bouncycastle/debian/poms/bcmail.pom	2012-01-10 12:29:55 UTC (rev 15675)
@@ -5,7 +5,7 @@
   <artifactId>bcmail-jdk14</artifactId>
   <packaging>jar</packaging>
   <name>Bouncy Castle CMS and S/MIME API</name>
-  <version>1.44</version>
+  <version>1.46</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>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk14</artifactId>
-      <version>1.44</version>
+      <version>1.46</version>
       <type>jar</type>
     </dependency>
   </dependencies>

Modified: trunk/bouncycastle/debian/poms/bcpg.pom
===================================================================
--- trunk/bouncycastle/debian/poms/bcpg.pom	2012-01-09 21:52:22 UTC (rev 15674)
+++ trunk/bouncycastle/debian/poms/bcpg.pom	2012-01-10 12:29:55 UTC (rev 15675)
@@ -5,7 +5,7 @@
   <artifactId>bcpg-jdk14</artifactId>
   <packaging>jar</packaging>
   <name>Bouncy Castle OpenPGP API</name>
-  <version>1.44</version>
+  <version>1.46</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>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk14</artifactId>
-      <version>1.44</version>
+      <version>1.46</version>
       <type>jar</type>
     </dependency>
   </dependencies>

Modified: trunk/bouncycastle/debian/poms/bcprov.pom
===================================================================
--- trunk/bouncycastle/debian/poms/bcprov.pom	2012-01-09 21:52:22 UTC (rev 15674)
+++ trunk/bouncycastle/debian/poms/bcprov.pom	2012-01-10 12:29:55 UTC (rev 15675)
@@ -5,7 +5,7 @@
   <artifactId>bcprov-jdk14</artifactId>
   <packaging>jar</packaging>
   <name>Bouncy Castle Provider</name>
-  <version>1.44</version>
+  <version>1.46</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>

Modified: trunk/bouncycastle/debian/poms/bctsp.pom
===================================================================
--- trunk/bouncycastle/debian/poms/bctsp.pom	2012-01-09 21:52:22 UTC (rev 15674)
+++ trunk/bouncycastle/debian/poms/bctsp.pom	2012-01-10 12:29:55 UTC (rev 15675)
@@ -5,7 +5,7 @@
   <artifactId>bctsp-jdk14</artifactId>
   <packaging>jar</packaging>
   <name>Bouncy Castle OpenPGP API</name>
-  <version>1.44</version>
+  <version>1.46</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>
@@ -22,13 +22,13 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk14</artifactId>
-      <version>1.44</version>
+      <version>1.46</version>
       <type>jar</type>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcmail-jdk14</artifactId>
-      <version>1.44</version>
+      <version>1.46</version>
       <type>jar</type>
     </dependency>
   </dependencies>

Modified: trunk/bouncycastle/debian/rules
===================================================================
--- trunk/bouncycastle/debian/rules	2012-01-09 21:52:22 UTC (rev 15674)
+++ trunk/bouncycastle/debian/rules	2012-01-10 12:29:55 UTC (rev 15675)
@@ -2,7 +2,6 @@
 # -*- makefile -*-
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 builddir = build/artifacts/jdk1.4
 
@@ -18,6 +17,7 @@
 common-build-indep:: stamp-build-indep
 stamp-build-indep:
 	sh -x ./build1-4
+	sh -x ./build1-4 test
 	mkdir -p debian/build
 	set -e; \
 	for j in $(jars); do \
@@ -29,6 +29,8 @@
 clean::
 	rm -f stamp-*
 	rm -rf build debian/build
+	rm -f *.bpg test.* large.* secret.asc pub.asc
+	rm -rf debian/.mh
 
 # bcprov
 binary-install/libbcprov-java:: build/libbcprov-java
@@ -103,3 +105,5 @@
 			http://repo1.maven.org/maven2/org/bouncycastle/$${pom}-jdk14/$(UPSTREAM_VERSION)/$${pom}-jdk14-$(UPSTREAM_VERSION).pom ; \
 	done ;
 
+get-orig-source:
+	-uscan --download-version `echo $(DEB_UPSTREAM_VERSION) |sed -e 's/\.//g;s/\+dfsg//'` --force-download --debug --rename

More information about the pkg-java-commits mailing list