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,15 @@ +bouncycastle (1.44+dfsg-2ubuntu2~ppa1) oneiric; urgency=low + + * Deployment of maven-repo 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 Wed, 29 Jun 2011 16:36:43 +0100 + bouncycastle (1.44+dfsg-2ubuntu1) maverick; urgency=low * Merge from debian. Remaining changes: 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 @@ -34,7 +34,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:: @@ -42,19 +43,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 @@ -92,0 +97,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/control bouncycastle-1.44+dfsg/debian/control --- bouncycastle-1.44+dfsg/debian/control +++ bouncycastle-1.44+dfsg/debian/control @@ -4,7 +4,8 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: Matthias Klose , Michael Koch -Build-Depends: cdbs (>= 0.4.27), debhelper (>= 7), ant, default-jdk-builddep, quilt, libgnumail-java, junit, ant-optional +Build-Depends: cdbs (>= 0.4.27), debhelper (>= 7), ant, default-jdk-builddep, quilt, libgnumail-java, + junit, ant-optional, maven-repo-helper Standards-Version: 3.8.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/bouncycastle Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/bouncycastle 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/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/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/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/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 @@ + + + 4.0.0 + org.bouncycastle + bcmail-jdk14 + jar + Bouncy Castle CMS and S/MIME API + 1.44 + 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. + http://www.bouncycastle.org/java.html + + + Bouncy Castle Licence + http://www.bouncycastle.org/licence.html + repo + + + + http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java + + + + org.bouncycastle + bcprov-jdk14 + 1.44 + jar + + + 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 @@ + + + 4.0.0 + org.bouncycastle + bcprov-jdk14 + jar + Bouncy Castle Provider + 1.44 + 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. + http://www.bouncycastle.org/java.html + + + Bouncy Castle Licence + http://www.bouncycastle.org/licence.html + repo + + + + http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java + + 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 @@ + + + 4.0.0 + org.bouncycastle + bctsp-jdk14 + jar + Bouncy Castle OpenPGP API + 1.44 + 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. + http://www.bouncycastle.org/java.html + + + Bouncy Castle Licence + http://www.bouncycastle.org/licence.html + repo + + + + http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java + + + + org.bouncycastle + bcprov-jdk14 + 1.44 + jar + + + org.bouncycastle + bcmail-jdk14 + 1.44 + jar + + + 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 @@ + + + 4.0.0 + org.bouncycastle + bcpg-jdk14 + jar + Bouncy Castle OpenPGP API + 1.44 + 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. + http://www.bouncycastle.org/java.html + + + Bouncy Castle Licence + http://www.bouncycastle.org/licence.html + repo + + + Apache Software License, Version 1.1 + http://www.apache.org/licenses/LICENSE-1.1 + repo + + + + http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java + + + + org.bouncycastle + bcprov-jdk14 + 1.44 + jar + + +