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

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Aug 7 16:25:26 UTC 2014


Author: ebourg-guest
Date: 2014-08-07 16:25:25 +0000 (Thu, 07 Aug 2014)
New Revision: 18311

Modified:
   trunk/bouncycastle/debian/changelog
   trunk/bouncycastle/debian/libbcprov-java-doc.docs
   trunk/bouncycastle/debian/orig-tar.sh
   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/bcpkix.pom
   trunk/bouncycastle/debian/poms/bcprov.pom
   trunk/bouncycastle/debian/rules
Log:
New upstream release (1.51)
Refreshed the patches
Updated the Maven poms



Modified: trunk/bouncycastle/debian/changelog
===================================================================
--- trunk/bouncycastle/debian/changelog	2014-08-07 12:23:06 UTC (rev 18310)
+++ trunk/bouncycastle/debian/changelog	2014-08-07 16:25:25 UTC (rev 18311)
@@ -1,5 +1,8 @@
-bouncycastle (1.49+dfsg-3) UNRELEASED; urgency=medium
+bouncycastle (1.51-1) experimental; urgency=medium
 
+  * New upstream release
+    - Refreshed the patches
+    - Updated the Maven poms
   * Standards-Version updated to 3.9.5 (no changes)
   * Switch to debhelper level 9
   * Use XZ compression for the upstream tarball

Modified: trunk/bouncycastle/debian/libbcprov-java-doc.docs
===================================================================
--- trunk/bouncycastle/debian/libbcprov-java-doc.docs	2014-08-07 12:23:06 UTC (rev 18310)
+++ trunk/bouncycastle/debian/libbcprov-java-doc.docs	2014-08-07 16:25:25 UTC (rev 18311)
@@ -1,4 +1,3 @@
 CONTRIBUTORS.html
 index.html
-releasenotes.html
-specifications.html
+docs/specifications.html

Modified: trunk/bouncycastle/debian/orig-tar.sh
===================================================================
--- trunk/bouncycastle/debian/orig-tar.sh	2014-08-07 12:23:06 UTC (rev 18310)
+++ trunk/bouncycastle/debian/orig-tar.sh	2014-08-07 16:25:25 UTC (rev 18311)
@@ -3,7 +3,7 @@
 # called by uscan with '--upstream-version' <version> <file>
 DEBIAN_VERSION=$(echo $2 | sed -e 's/^\(.\)/\1./')
 DIR=bouncycastle-$DEBIAN_VERSION.orig
-TAR=../bouncycastle_$DEBIAN_VERSION+dfsg.orig.tar.xz
+TAR=../bouncycastle_$DEBIAN_VERSION.orig.tar.xz
 
 # clean up the upstream tarball
 tar zxf $3

Modified: trunk/bouncycastle/debian/patches/01_build.patch
===================================================================
--- trunk/bouncycastle/debian/patches/01_build.patch	2014-08-07 12:23:06 UTC (rev 18310)
+++ trunk/bouncycastle/debian/patches/01_build.patch	2014-08-07 16:25:25 UTC (rev 18311)
@@ -1,9 +1,9 @@
 Description: Pass unicode flag to javac targets for proper compilation
 Author: Brian Thomason <brian.thomason at eucalyptus.com>
 
---- a/bc-build.xml
-+++ b/bc-build.xml
-@@ -101,6 +101,7 @@
+--- a/ant/bc+-build.xml
++++ b/ant/bc+-build.xml
+@@ -108,6 +108,7 @@
                              <include name="**/*.jar" />
                          </fileset>
                      </classpath>
@@ -11,15 +11,15 @@
                  </javac>
                  <copy todir="${build.dir}/@{target}/classes">
                       <fileset dir="${artifacts.dir}/@{target}/src" includes="**/*.properties" />
-@@ -131,6 +132,7 @@
+@@ -138,6 +139,7 @@
                      srcdir="${artifacts.dir}/@{target}/src"
                      destdir="${build.dir}/@{target}/classes"
                      debug="${release.debug}">
 +                <compilerarg line="-encoding utf-8"/>
                      <classpath>
+                         <path refid="project.classpath" /> 
                          <fileset dir="${artifacts.jars.dir}">
-                             <include name="**/*.jar" />
-@@ -242,6 +244,7 @@
+@@ -269,6 +271,7 @@
              srcdir="${lcrypto.target.src.dir}"
              destdir="${lcrypto.target.classes.dir}"
              debug="${release.debug}">

Modified: trunk/bouncycastle/debian/patches/02_index.patch
===================================================================
--- trunk/bouncycastle/debian/patches/02_index.patch	2014-08-07 12:23:06 UTC (rev 18310)
+++ trunk/bouncycastle/debian/patches/02_index.patch	2014-08-07 16:25:25 UTC (rev 18311)
@@ -1,13 +1,13 @@
 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>.
+--- a/index.html
++++ b/index.html
+@@ -41,7 +41,7 @@
+ </p>
  <p>
- The current api documentation for this package is
--<a href=docs/index.html>here</a>.
+ The current JavaDoc for the Bouncy Castle APIs can be found
+-<a href="javadoc/index.html">here</a>.
 +in the corresponding libbc*-java-doc Debian package.
  </p>
- </p>
- <h2>Examples and Tests</h2>
+ <p>
+ Additional documentation on use of the classes can also be found in the <a href="docs/index.html">docs</a> directory.

Modified: trunk/bouncycastle/debian/poms/bcmail.pom
===================================================================
--- trunk/bouncycastle/debian/poms/bcmail.pom	2014-08-07 12:23:06 UTC (rev 18310)
+++ trunk/bouncycastle/debian/poms/bcmail.pom	2014-08-07 16:25:25 UTC (rev 18311)
@@ -5,8 +5,8 @@
   <artifactId>bcmail-jdk15on</artifactId>
   <packaging>jar</packaging>
   <name>Bouncy Castle S/MIME API</name>
-  <version>1.49</version>
-  <description>The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols. This jar contains S/MIME APIs for JDK 1.5 to JDK 1.7. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs. The JavaMail API and the Java activation framework will also be needed.</description>
+  <version>1.51</version>
+  <description>The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols. This jar contains S/MIME APIs for JDK 1.5 to JDK 1.8. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs. The JavaMail API and the Java activation framework will also be needed.</description>
   <url>http://www.bouncycastle.org/java.html</url>
   <licenses>
     <license>
@@ -16,8 +16,12 @@
     </license>
   </licenses>
   <scm>
-    <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url>
+    <url>https://github.com/bcgit/bc-java</url>
   </scm>
+  <issueManagement>
+     <system>JIRA</system>
+     <url>http://www.bouncycastle.org/jira/secure/Dashboard.jspa</url>
+  </issueManagement>
   <developers>
     <developer>
       <id>feedback-crypto</id>
@@ -29,13 +33,13 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.49</version>
+      <version>1.51</version>
       <type>jar</type>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.49</version>
+      <version>1.51</version>
       <type>jar</type>
     </dependency>
   </dependencies>

Modified: trunk/bouncycastle/debian/poms/bcpg.pom
===================================================================
--- trunk/bouncycastle/debian/poms/bcpg.pom	2014-08-07 12:23:06 UTC (rev 18310)
+++ trunk/bouncycastle/debian/poms/bcpg.pom	2014-08-07 16:25:25 UTC (rev 18311)
@@ -5,8 +5,8 @@
   <artifactId>bcpg-jdk15on</artifactId>
   <packaging>jar</packaging>
   <name>Bouncy Castle OpenPGP API</name>
-  <version>1.49</version>
-  <description>The Bouncy Castle Java API for handling the OpenPGP protocol. This jar contains the OpenPGP API for JDK 1.5 to JDK 1.7. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs.</description>
+  <version>1.51</version>
+  <description>The Bouncy Castle Java API for handling the OpenPGP protocol. This jar contains the OpenPGP API for JDK 1.5 to JDK 1.8. 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>
@@ -21,8 +21,12 @@
     </license>
   </licenses>
   <scm>
-    <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url>
+    <url>https://github.com/bcgit/bc-java</url>
   </scm>
+  <issueManagement>
+     <system>JIRA</system>
+     <url>http://www.bouncycastle.org/jira/secure/Dashboard.jspa</url>
+  </issueManagement>
   <developers>
     <developer>
       <id>feedback-crypto</id>
@@ -34,7 +38,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.49</version>
+      <version>1.51</version>
       <type>jar</type>
     </dependency>
   </dependencies>

Modified: trunk/bouncycastle/debian/poms/bcpkix.pom
===================================================================
--- trunk/bouncycastle/debian/poms/bcpkix.pom	2014-08-07 12:23:06 UTC (rev 18310)
+++ trunk/bouncycastle/debian/poms/bcpkix.pom	2014-08-07 16:25:25 UTC (rev 18311)
@@ -5,8 +5,8 @@
   <artifactId>bcpkix-jdk15on</artifactId>
   <packaging>jar</packaging>
   <name>Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs</name>
-  <version>1.49</version>
-  <description>The Bouncy Castle Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation. This jar contains APIs for JDK 1.5 to JDK 1.7. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs.</description>
+  <version>1.51</version>
+  <description>The Bouncy Castle Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation. This jar contains APIs for JDK 1.5 to JDK 1.8. 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>
@@ -16,8 +16,12 @@
     </license>
   </licenses>
   <scm>
-    <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url>
+    <url>https://github.com/bcgit/bc-java</url>
   </scm>
+  <issueManagement>
+     <system>JIRA</system>
+     <url>http://www.bouncycastle.org/jira/secure/Dashboard.jspa</url>
+  </issueManagement>
   <developers>
     <developer>
       <id>feedback-crypto</id>
@@ -29,7 +33,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
-      <version>1.49</version>
+      <version>1.51</version>
       <type>jar</type>
     </dependency>
   </dependencies>

Modified: trunk/bouncycastle/debian/poms/bcprov.pom
===================================================================
--- trunk/bouncycastle/debian/poms/bcprov.pom	2014-08-07 12:23:06 UTC (rev 18310)
+++ trunk/bouncycastle/debian/poms/bcprov.pom	2014-08-07 16:25:25 UTC (rev 18311)
@@ -5,8 +5,8 @@
   <artifactId>bcprov-jdk15on</artifactId>
   <packaging>jar</packaging>
   <name>Bouncy Castle Provider</name>
-  <version>1.49</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.5 to JDK 1.7.</description>
+  <version>1.51</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.5 to JDK 1.8.</description>
   <url>http://www.bouncycastle.org/java.html</url>
   <licenses>
     <license>
@@ -16,12 +16,16 @@
     </license>
   </licenses>
   <scm>
-    <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url>
+    <url>https://github.com/bcgit/bc-java</url>
   </scm>
+  <issueManagement>
+     <system>JIRA</system>
+     <url>http://www.bouncycastle.org/jira/secure/Dashboard.jspa</url>
+  </issueManagement>
   <developers>
     <developer>
       <id>feedback-crypto</id>
-      <name>The Legion of the Bouncy Castle</name>
+      <name>The Legion of the Bouncy Castle Inc.</name>
       <email>feedback-crypto at bouncycastle.org</email>
     </developer>
   </developers>

Modified: trunk/bouncycastle/debian/rules
===================================================================
--- trunk/bouncycastle/debian/rules	2014-08-07 12:23:06 UTC (rev 18310)
+++ trunk/bouncycastle/debian/rules	2014-08-07 16:25:25 UTC (rev 18311)
@@ -10,9 +10,9 @@
 
 JAVA_HOME                  := /usr/lib/jvm/default-java
 DEB_JARS                   := junit gnumail
-DEB_ANT_BUILDFILE          := jdk15+.xml
+DEB_ANT_BUILDFILE          := ant/jdk15+.xml
 DEB_ANT_BUILD_TARGET       := build-provider build
-DEB_INSTALL_CHANGELOGS_ALL := releasenotes.html
+DEB_INSTALL_CHANGELOGS_ALL := docs/releasenotes.html
 
 
 clean::




More information about the pkg-java-commits mailing list