Author: ebourg-guest Date: 2013-03-29 13:26:26 +0000 (Fri, 29 Mar 2013) New Revision: 16453
Added: trunk/bouncycastle/debian/libbcpkix-java.README.Debian trunk/bouncycastle/debian/libbcpkix-java.dirs trunk/bouncycastle/debian/libbcpkix-java.docs trunk/bouncycastle/debian/libbcpkix-java.poms trunk/bouncycastle/debian/poms/bcpkix.pom Removed: trunk/bouncycastle/debian/libbctsp-java.README.Debian trunk/bouncycastle/debian/libbctsp-java.dirs trunk/bouncycastle/debian/libbctsp-java.docs trunk/bouncycastle/debian/libbctsp-java.poms trunk/bouncycastle/debian/poms/bctsp.pom Modified: trunk/bouncycastle/debian/changelog trunk/bouncycastle/debian/control trunk/bouncycastle/debian/maven.rules trunk/bouncycastle/debian/patches/01_build.patch trunk/bouncycastle/debian/poms/bcmail.pom trunk/bouncycastle/debian/poms/bcpg.pom trunk/bouncycastle/debian/poms/bcprov.pom trunk/bouncycastle/debian/rules Log: New upstream release (1.48) Modified: trunk/bouncycastle/debian/changelog =================================================================== --- trunk/bouncycastle/debian/changelog 2013-03-29 00:08:40 UTC (rev 16452) +++ trunk/bouncycastle/debian/changelog 2013-03-29 13:26:26 UTC (rev 16453) @@ -1,3 +1,18 @@ +bouncycastle (1.48+dfsg-1) experimental; urgency=low + + * Team upload. + * New upstream release + - Fixes the Lucky 13 attack on CBC-mode encryption in TLS + CVE-2013-0169, CVE-2013-1624 (Closes: #699885) + * Added the bcpkix packages + * Removed the bctsp packages (the TSP API is now included in bcpkix) + * Updated Standards-Version to 3.9.4: no changes needed. + * Removed the DMUA flag + * Refreshed the patches + * Removed "Suggests: java-virtual-machine" on the libbcpg-java-gcj package + + -- Emmanuel Bourg <[email protected]> Fri, 29 Mar 2013 12:52:23 +0100 + bouncycastle (1.46+dfsg-7) unstable; urgency=low * Team upload. Modified: trunk/bouncycastle/debian/control =================================================================== --- trunk/bouncycastle/debian/control 2013-03-29 00:08:40 UTC (rev 16452) +++ trunk/bouncycastle/debian/control 2013-03-29 13:26:26 UTC (rev 16453) @@ -2,14 +2,13 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Brian Thomason <[email protected]> +Uploaders: Brian Thomason <[email protected]>, Emmanuel Bourg <[email protected]> Build-Depends: cdbs (>= 0.4.27), debhelper (>= 7.0.50~), ant, gcj-native-helper, libgnumail-java, junit, ant-optional, maven-repo-helper, default-jdk (>= 1:1.6) -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 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/ -DM-Upload-Allowed: yes Package: libbcprov-java Architecture: all @@ -48,23 +47,24 @@ Javadocs for libbcmail-java, which provides Java generators and processors for S/MIME and CMS. -Package: libbctsp-java +Package: libbcpkix-java Architecture: all Depends: ${misc:Depends} -Suggests: libbctsp-java-doc, libbctsp-java-gcj -Description: Bouncy Castle generators/processors for TSP +Suggests: libbcpkix-java-doc, libbcpkix-java-gcj +Description: Bouncy Castle Java API for PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms. . - This package contains generators and processors for TSP (RFC 3161). + This package contains generators and processors for PKIX, CMS, + EAC, TSP, PKCS, OCSP, CMP, and CRMF. -Package: libbctsp-java-doc +Package: libbcpkix-java-doc Section: doc Architecture: all Depends: ${misc:Depends} -Description: Documentation for libbctsp-java - Javadocs for libbctsp-java, which provides generators and processors - for TSP. +Description: Documentation for libbcpkix-java + Javadocs for libbcpkix-java, which provides generators and processors + for PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF. Package: libbcpg-java Architecture: all @@ -98,18 +98,18 @@ Native support for gij for the Bouncy Castle Crypto generators and processors for S/MIME and CMS (PKCS7/RFC 3852). -Package: libbctsp-java-gcj +Package: libbcpkix-java-gcj Architecture: any -Depends: libbctsp-java (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} -Suggests: libbctsp-java-doc -Description: Bouncy Castle generators/processors for TSP +Depends: libbcpkix-java (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} +Suggests: libbcpkix-java-doc +Description: Bouncy Castle Java API for PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF Native support for gij for the Bouncy Castle Crypto generators - and processors for TSP (RFC 3161). + and processors for PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF. Package: libbcpg-java-gcj Architecture: any Depends: libbcpg-java (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} -Suggests: java-virtual-machine, libbcpg-java-doc +Suggests: libbcpg-java-doc Description: Bouncy Castle generators/processors for OpenPGP Native support for gij for the Bouncy Castle Crypto generators and processors for OpenPGP (RFC 2440). Copied: trunk/bouncycastle/debian/libbcpkix-java.README.Debian (from rev 16452, trunk/bouncycastle/debian/libbctsp-java.README.Debian) =================================================================== --- trunk/bouncycastle/debian/libbcpkix-java.README.Debian (rev 0) +++ trunk/bouncycastle/debian/libbcpkix-java.README.Debian 2013-03-29 13:26:26 UTC (rev 16453) @@ -0,0 +1,11 @@ +libbcpkix-java for Debian +========================= + +In order to use this library, add the following to your classpath: + + /usr/share/java/bcpkix.jar + +Alternatively, the jar can be installed as an optional package by linking it +from $JAVA_HOME/lib/ext. + + -- Charles Fry <[email protected]>, Tue May 2 10:28:52 2006 Copied: trunk/bouncycastle/debian/libbcpkix-java.dirs (from rev 16452, trunk/bouncycastle/debian/libbctsp-java.dirs) =================================================================== --- trunk/bouncycastle/debian/libbcpkix-java.dirs (rev 0) +++ trunk/bouncycastle/debian/libbcpkix-java.dirs 2013-03-29 13:26:26 UTC (rev 16453) @@ -0,0 +1 @@ +usr/share/java Copied: trunk/bouncycastle/debian/libbcpkix-java.docs (from rev 16452, trunk/bouncycastle/debian/libbctsp-java.docs) =================================================================== --- trunk/bouncycastle/debian/libbcpkix-java.docs (rev 0) +++ trunk/bouncycastle/debian/libbcpkix-java.docs 2013-03-29 13:26:26 UTC (rev 16453) @@ -0,0 +1,4 @@ +CONTRIBUTORS.html +index.html +releasenotes.html +specifications.html Copied: trunk/bouncycastle/debian/libbcpkix-java.poms (from rev 16452, trunk/bouncycastle/debian/libbctsp-java.poms) =================================================================== --- trunk/bouncycastle/debian/libbcpkix-java.poms (rev 0) +++ trunk/bouncycastle/debian/libbcpkix-java.poms 2013-03-29 13:26:26 UTC (rev 16453) @@ -0,0 +1 @@ +debian/poms/bcpkix.pom Deleted: trunk/bouncycastle/debian/libbctsp-java.README.Debian =================================================================== --- trunk/bouncycastle/debian/libbctsp-java.README.Debian 2013-03-29 00:08:40 UTC (rev 16452) +++ trunk/bouncycastle/debian/libbctsp-java.README.Debian 2013-03-29 13:26:26 UTC (rev 16453) @@ -1,11 +0,0 @@ -libbctsp-java for Debian -========================= - -In order to use this library, add the following to your classpath: - - /usr/share/java/bctsp.jar - -Alternatively, the jar can be installed as an optional package by linking it -from $JAVA_HOME/lib/ext. - - -- Charles Fry <[email protected]>, Tue May 2 10:28:52 2006 Deleted: trunk/bouncycastle/debian/libbctsp-java.dirs =================================================================== --- trunk/bouncycastle/debian/libbctsp-java.dirs 2013-03-29 00:08:40 UTC (rev 16452) +++ trunk/bouncycastle/debian/libbctsp-java.dirs 2013-03-29 13:26:26 UTC (rev 16453) @@ -1 +0,0 @@ -usr/share/java Deleted: trunk/bouncycastle/debian/libbctsp-java.docs =================================================================== --- trunk/bouncycastle/debian/libbctsp-java.docs 2013-03-29 00:08:40 UTC (rev 16452) +++ trunk/bouncycastle/debian/libbctsp-java.docs 2013-03-29 13:26:26 UTC (rev 16453) @@ -1,4 +0,0 @@ -CONTRIBUTORS.html -index.html -releasenotes.html -specifications.html Deleted: trunk/bouncycastle/debian/libbctsp-java.poms =================================================================== --- trunk/bouncycastle/debian/libbctsp-java.poms 2013-03-29 00:08:40 UTC (rev 16452) +++ trunk/bouncycastle/debian/libbctsp-java.poms 2013-03-29 13:26:26 UTC (rev 16453) @@ -1 +0,0 @@ -debian/poms/bctsp.pom Modified: trunk/bouncycastle/debian/maven.rules =================================================================== --- trunk/bouncycastle/debian/maven.rules 2013-03-29 00:08:40 UTC (rev 16452) +++ trunk/bouncycastle/debian/maven.rules 2013-03-29 13:26:26 UTC (rev 16453) @@ -1,5 +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/ * * +# Strip out -jdk15on as Ubuntu/Debian does not build multiple versions +org.bouncycastle s/bcmail-jdk15on/bcmail/ * s/.*/debian/ * * +org.bouncycastle s/bcprov-jdk15on/bcprov/ * s/.*/debian/ * * +org.bouncycastle s/bcpkix-jdk15on/bcpkix/ * s/.*/debian/ * * +org.bouncycastle s/bcpg-jdk15on/bcpg/ * s/.*/debian/ * * Modified: trunk/bouncycastle/debian/patches/01_build.patch =================================================================== --- trunk/bouncycastle/debian/patches/01_build.patch 2013-03-29 00:08:40 UTC (rev 16452) +++ trunk/bouncycastle/debian/patches/01_build.patch 2013-03-29 13:26:26 UTC (rev 16453) @@ -1,43 +1,8 @@ Description: Modify JAR paths and pass unicode flag to javac targets for proper compilation Author: Brian Thomason <[email protected]> ---- bouncycastle-1.46+dfsg.orig/build1-5 -+++ bouncycastle-1.46+dfsg/build1-5 -@@ -6,10 +6,10 @@ - # otherwise it just creates the docs and class files. - # - --JDKPATH=/opt/jdk1.5.0 # JDK 1.5 location --JAVA_MAIL_HOME=/opt/javamail --JAVA_ACTIVATION_HOME=/opt/jaf --JUNIT_HOME=/opt/junit -+JDKPATH=/usr/lib/jvm/default-java -+JAVA_MAIL_HOME=/usr/share/java -+JAVA_ACTIVATION_HOME=/usr/share/java -+JUNIT_HOME=/usr/share/java - - JAVA_HOME=$JDKPATH - export JAVA_HOME -@@ -17,7 +17,7 @@ export JAVA_HOME - PATH=$JDKPATH/bin:$PATH - export PATH - --CLASSPATH=$JAVA_MAIL_HOME/mail.jar:$JAVA_ACTIVATION_HOME/activation.jar:$JUNIT_HOME/junit.jar:$CLASSPATH -+CLASSPATH=$JAVA_MAIL_HOME/gnumail.jar:$JAVA_ACTIVATION_HOME/activation.jar:$JUNIT_HOME/junit.jar:$CLASSPATH - export CLASSPATH - - if [ "$1" = "test" ] -@@ -27,7 +27,7 @@ else - if ant -f jdk15.xml build-provider - then - ant -f jdk15.xml build -- ant -f jdk15.xml zip-src -+ #ant -f jdk15.xml zip-src - fi - fi - ---- bouncycastle-1.46+dfsg.orig/bc-build.xml -+++ bouncycastle-1.46+dfsg/bc-build.xml +--- a/bc-build.xml ++++ b/bc-build.xml @@ -101,6 +101,7 @@ <include name="**/*.jar" /> </fileset> @@ -54,7 +19,7 @@ <classpath> <fileset dir="${artifacts.jars.dir}"> <include name="**/*.jar" /> -@@ -238,6 +240,7 @@ +@@ -242,6 +244,7 @@ srcdir="${lcrypto.target.src.dir}" destdir="${lcrypto.target.classes.dir}" debug="${release.debug}"> @@ -62,3 +27,38 @@ </javac> </target> +--- a/build15+ ++++ b/build15+ +@@ -8,10 +8,10 @@ + + if [ "${JDKPATH}" = "" ] + then +- JDKPATH=/opt/jdk1.5.0 # JDK 1.5 location +- JAVA_MAIL_HOME=/opt/javamail +- JAVA_ACTIVATION_HOME=/opt/jaf +- JUNIT_HOME=/opt/junit ++ JDKPATH=/usr/lib/jvm/default-java ++ JAVA_MAIL_HOME=/usr/share/java ++ JAVA_ACTIVATION_HOME=/usr/share/java ++ JUNIT_HOME=/usr/share/java + fi + + JAVA_HOME=$JDKPATH +@@ -20,7 +20,7 @@ + PATH=$JDKPATH/bin:$PATH + export PATH + +-CLASSPATH=$JAVA_MAIL_HOME/mail.jar:$JAVA_ACTIVATION_HOME/activation.jar:$JUNIT_HOME/junit.jar:$CLASSPATH ++CLASSPATH=$JAVA_MAIL_HOME/gnumail.jar:$JAVA_ACTIVATION_HOME/activation.jar:$JUNIT_HOME/junit.jar:$CLASSPATH + export CLASSPATH + + if [ "$1" = "test" ] +@@ -30,7 +30,7 @@ + if ant -f jdk15+.xml build-provider + then + ant -f jdk15+.xml build +- ant -f jdk15+.xml zip-src ++ #ant -f jdk15+.xml zip-src + fi + fi + Modified: trunk/bouncycastle/debian/poms/bcmail.pom =================================================================== --- trunk/bouncycastle/debian/poms/bcmail.pom 2013-03-29 00:08:40 UTC (rev 16452) +++ trunk/bouncycastle/debian/poms/bcmail.pom 2013-03-29 13:26:26 UTC (rev 16453) @@ -2,11 +2,11 @@ <project> <modelVersion>4.0.0</modelVersion> <groupId>org.bouncycastle</groupId> - <artifactId>bcmail-jdk14</artifactId> + <artifactId>bcmail-jdk15on</artifactId> <packaging>jar</packaging> - <name>Bouncy Castle CMS and S/MIME API</name> - <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> + <name>Bouncy Castle S/MIME API</name> + <version>1.48</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> <url>http://www.bouncycastle.org/java.html</url> <licenses> <license> @@ -21,9 +21,15 @@ <dependencies> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk14</artifactId> - <version>1.46</version> + <artifactId>bcprov-jdk15on</artifactId> + <version>1.48</version> <type>jar</type> </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + <version>1.48</version> + <type>jar</type> + </dependency> </dependencies> </project> Modified: trunk/bouncycastle/debian/poms/bcpg.pom =================================================================== --- trunk/bouncycastle/debian/poms/bcpg.pom 2013-03-29 00:08:40 UTC (rev 16452) +++ trunk/bouncycastle/debian/poms/bcpg.pom 2013-03-29 13:26:26 UTC (rev 16453) @@ -2,11 +2,11 @@ <project> <modelVersion>4.0.0</modelVersion> <groupId>org.bouncycastle</groupId> - <artifactId>bcpg-jdk14</artifactId> + <artifactId>bcpg-jdk15on</artifactId> <packaging>jar</packaging> <name>Bouncy Castle OpenPGP API</name> - <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> + <version>1.48</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> <url>http://www.bouncycastle.org/java.html</url> <licenses> <license> @@ -26,8 +26,8 @@ <dependencies> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk14</artifactId> - <version>1.46</version> + <artifactId>bcprov-jdk15on</artifactId> + <version>1.48</version> <type>jar</type> </dependency> </dependencies> Copied: trunk/bouncycastle/debian/poms/bcpkix.pom (from rev 16452, trunk/bouncycastle/debian/poms/bctsp.pom) =================================================================== --- trunk/bouncycastle/debian/poms/bcpkix.pom (rev 0) +++ trunk/bouncycastle/debian/poms/bcpkix.pom 2013-03-29 13:26:26 UTC (rev 16453) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + <packaging>jar</packaging> + <name>Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs</name> + <version>1.48</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> + <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-jdk15on</artifactId> + <version>1.48</version> + <type>jar</type> + </dependency> + </dependencies> +</project> Modified: trunk/bouncycastle/debian/poms/bcprov.pom =================================================================== --- trunk/bouncycastle/debian/poms/bcprov.pom 2013-03-29 00:08:40 UTC (rev 16452) +++ trunk/bouncycastle/debian/poms/bcprov.pom 2013-03-29 13:26:26 UTC (rev 16453) @@ -2,11 +2,11 @@ <project> <modelVersion>4.0.0</modelVersion> <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk14</artifactId> + <artifactId>bcprov-jdk15on</artifactId> <packaging>jar</packaging> <name>Bouncy Castle Provider</name> - <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> + <version>1.48</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> <url>http://www.bouncycastle.org/java.html</url> <licenses> <license> Deleted: trunk/bouncycastle/debian/poms/bctsp.pom =================================================================== --- trunk/bouncycastle/debian/poms/bctsp.pom 2013-03-29 00:08:40 UTC (rev 16452) +++ trunk/bouncycastle/debian/poms/bctsp.pom 2013-03-29 13:26:26 UTC (rev 16453) @@ -1,35 +0,0 @@ -<?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.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> - <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.46</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcmail-jdk14</artifactId> - <version>1.46</version> - <type>jar</type> - </dependency> - </dependencies> -</project> Modified: trunk/bouncycastle/debian/rules =================================================================== --- trunk/bouncycastle/debian/rules 2013-03-29 00:08:40 UTC (rev 16452) +++ trunk/bouncycastle/debian/rules 2013-03-29 13:26:26 UTC (rev 16453) @@ -15,16 +15,16 @@ with_native := yes endif -jars = bcprov bcmail bctsp bcpg +jars = bcprov bcmail bcpg bcpkix common-build-indep:: stamp-build-indep stamp-build-indep: - sh -x ./build1-5 - #sh -x ./build1-5 test + sh -x ./build15+ + #sh -x ./build15+ test mkdir -p debian/build set -e; \ for j in $(jars); do \ - install -m 644 $(builddir)/jars/$$j-jdk15-*.jar \ + install -m 644 $(builddir)/jars/$$j-jdk15on-*.jar \ debian/build/$$j.jar; \ done touch stamp-build-indep @@ -38,7 +38,7 @@ # bcprov binary-install/libbcprov-java:: build/libbcprov-java mh_installpoms -plibbcprov-java - mh_installjar -plibbcprov-java -l debian/poms/bcprov.pom $(builddir)/jars/bcprov-jdk15-*.jar + mh_installjar -plibbcprov-java -l debian/poms/bcprov.pom $(builddir)/jars/bcprov-jdk15on-*.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:: @@ -47,23 +47,23 @@ # bcmail binary-install/libbcmail-java:: build/libbcmail-java mh_installpoms -plibbcmail-java - mh_installjar -plibbcmail-java -l debian/poms/bcmail.pom $(builddir)/jars/bcmail-jdk15-*.jar + mh_installjar -plibbcmail-java -l debian/poms/bcmail.pom $(builddir)/jars/bcmail-jdk15on-*.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 mh_installpoms -plibbcpg-java - mh_installjar -plibbcpg-java -l debian/poms/bcpg.pom $(builddir)/jars/bcpg-jdk15-*.jar + mh_installjar -plibbcpg-java -l debian/poms/bcpg.pom $(builddir)/jars/bcpg-jdk15on-*.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 - mh_installpoms -plibbctsp-java - mh_installjar -plibbctsp-java -l debian/poms/bctsp.pom $(builddir)/jars/bctsp-jdk15-*.jar -binary-install/libbctsp-java-doc:: - mv -i $(builddir)/javadoc/bctsp debian/libbctsp-java-doc/usr/share/doc/libbctsp-java-doc/api +# bcpkix +binary-install/libbcpkix-java:: build/libbcpkix-java + mh_installpoms -plibbcpkix-java + mh_installjar -plibbcpkix-java -l debian/poms/bcpkix.pom $(builddir)/jars/bcpkix-jdk15on-*.jar +binary-install/libbcpkix-java-doc:: + mv -i $(builddir)/javadoc/bcpkix debian/libbcpkix-java-doc/usr/share/doc/libbcpkix-java-doc/api binary-post-install/libbcprov-java-gcj:: binary-post-install/libbcprov-java @@ -90,22 +90,22 @@ dh_nativejava -plibbcpg-java-gcj endif -binary-post-install/libbctsp-java-gcj:: binary-post-install/libbctsp-java - rm -rf debian/libbctsp-java-gcj/usr/share/doc/libbctsp-java-gcj - ln -s libbctsp-java \ - debian/libbctsp-java-gcj/usr/share/doc/libbctsp-java-gcj +binary-post-install/libbcpkix-java-gcj:: binary-post-install/libbcpkix-java + rm -rf debian/libbcpkix-java-gcj/usr/share/doc/libbcpkix-java-gcj + ln -s libbcpkix-java \ + debian/libbcpkix-java-gcj/usr/share/doc/libbcpkix-java-gcj ifeq ($(with_native),yes) - dh_nativejava -plibbctsp-java-gcj + dh_nativejava -plibbcpkix-java-gcj endif -POMS=bcprov bcpg bcmail bctsp +POMS=bcprov bcpg bcmail bcpkix 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}-jdk55/$(UPSTREAM_VERSION)/$${pom}-jdk15-$(UPSTREAM_VERSION).pom ; \ + http://repo1.maven.org/maven2/org/bouncycastle/$${pom}-jdk55/$(UPSTREAM_VERSION)/$${pom}-jdk15on-$(UPSTREAM_VERSION).pom ; \ done ; get-orig-source: _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
