[pkg-java] r2905 - trunk/bouncycastle/debian

Matthias Klose doko at alioth.debian.org
Wed Jan 3 14:42:02 CET 2007 

Author: doko
Date: 2007-01-03 14:42:01 +0100 (Wed, 03 Jan 2007)
New Revision: 2905

Modified:
   trunk/bouncycastle/debian/changelog
   trunk/bouncycastle/debian/control
   trunk/bouncycastle/debian/rules
Log:
  * Merge from Ubuntu:
    - Build -gcj packages.
    - Install the docs in an api subdir (not apidoc).


Modified: trunk/bouncycastle/debian/changelog
===================================================================
--- trunk/bouncycastle/debian/changelog	2007-01-03 13:28:20 UTC (rev 2904)
+++ trunk/bouncycastle/debian/changelog	2007-01-03 13:42:01 UTC (rev 2905)
@@ -1,3 +1,11 @@
+bouncycastle (1.33-3) unstable; urgency=low
+
+  * Merge from Ubuntu:
+    - Build -gcj packages.
+    - Install the docs in an api subdir (not apidoc).
+
+ -- Matthias Klose <doko at debian.org>  Wed,  3 Jan 2007 14:29:42 +0100
+
 bouncycastle (1.33-2.1) unstable; urgency=medium
 
   * NMU

Modified: trunk/bouncycastle/debian/control
===================================================================
--- trunk/bouncycastle/debian/control	2007-01-03 13:28:20 UTC (rev 2904)
+++ trunk/bouncycastle/debian/control	2007-01-03 13:42:01 UTC (rev 2905)
@@ -2,14 +2,14 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Charles Fry <cfry at debian.org>
-Build-Depends: cdbs (>= 0.4.27-1), debhelper (>= 4.1.0), ant, java-gcj-compat-dev, quilt
-Build-Depends-Indep: libgnumail-java, junit
+Uploaders: Charles Fry <cfry at debian.org>, Matthias Klose <doko at ubuntu.com>
+Build-Depends: cdbs (>= 0.4.27-1), debhelper (>= 4.1.0), ant, java-gcj-compat-dev (>= 1.0.65-6), quilt, libgnumail-java, junit
 Standards-Version: 3.7.2
 
 Package: libbcprov-java
 Architecture: all
 Depends: libgcj-common (>= 1:4.1.1-19), java-gcj-compat | java2-runtime
+Recommends: libbcprov-java-gcj
 Suggests: java-virtual-machine, libbcprov-java-doc
 Description: Bouncy Castle Java Cryptographic Service Provider
  The Bouncy Castle Crypto package is a Java implementation of
@@ -32,6 +32,7 @@
 Package: libbcmail-java
 Architecture: all
 Depends: java-gcj-compat | java2-runtime, libgnumail-java, libgnujaf-java
+Recommends: libbcmail-java-gcj
 Suggests: java-virtual-machine, libbcmail-java-doc
 Description: Bouncy Castle generators/processors for S/MIME and CMS
  The Bouncy Castle Crypto package is a Java implementation of
@@ -55,6 +56,7 @@
 Package: libbctsp-java
 Architecture: all
 Depends: java-gcj-compat | java2-runtime
+Recommends: libbctsp-java-gcj
 Suggests: java-virtual-machine, libbctsp-java-doc
 Description: Bouncy Castle generators/processors for TSP
  The Bouncy Castle Crypto package is a Java implementation of
@@ -77,6 +79,7 @@
 Package: libbcpg-java
 Architecture: all
 Depends: java-gcj-compat | java2-runtime
+Recommends: libbcpg-java-gcj
 Suggests: java-virtual-machine, libbcpg-java-doc
 Description: Bouncy Castle generators/processors for OpenPGP
  The Bouncy Castle Crypto package is a Java implementation of
@@ -95,3 +98,33 @@
  for OpenPGP.
  .
   Homepage: http://www.bouncycastle.org/
+
+Package: libbcprov-java-gcj
+Architecture: any
+Depends: libbcprov-java (>= ${Source-Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: Bouncy Castle Java Cryptographic Service Provider
+ Native support for gij for the Bouncy Castle Crypto JCE provider
+ and a lightweight crypto API.
+
+Package: libbcmail-java-gcj
+Architecture: any
+Depends: libbcmail-java (>= ${Source-Version}), libgnumail-java, libgnujaf-java, ${misc:Depends}, ${shlibs:Depends}
+Description: Bouncy Castle generators/processors for S/MIME and CMS
+ Native support for gij for the Bouncy Castle Crypto generators
+ and processors for S/MIME and CMS (PKCS7/RFC 3852).
+
+Package: libbctsp-java-gcj
+Architecture: any
+Depends: libbctsp-java (>= ${Source-Version}), ${misc:Depends}, ${shlibs:Depends}
+Suggests: java-virtual-machine, libbctsp-java-doc
+Description: Bouncy Castle generators/processors for TSP
+ Native support for gij for the Bouncy Castle Crypto generators
+ and processors for TSP (RFC 3161).
+
+Package: libbcpg-java-gcj
+Architecture: any
+Depends: libbcpg-java (>= ${Source-Version}), ${misc:Depends}, ${shlibs:Depends}
+Suggests: java-virtual-machine, 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).

Modified: trunk/bouncycastle/debian/rules
===================================================================
--- trunk/bouncycastle/debian/rules	2007-01-03 13:28:20 UTC (rev 2904)
+++ trunk/bouncycastle/debian/rules	2007-01-03 13:42:01 UTC (rev 2905)
@@ -6,11 +6,29 @@
 
 builddir = build/artifacts/jdk1.4
 
-common-build-indep::
+include /usr/share/gcj/debian_defaults
+
+DEB_HOST_ARCH ?= $(shell dpkg-architecture qDEB_HOST_ARCH)
+ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
+  with_native := yes
+endif
+
+jars = bcprov bcmail bctsp bcpg
+
+common-build-indep:: stamp-build-indep
+stamp-build-indep:
 	sh -x ./build1-4
+	mkdir -p debian/build
+	set -e; \
+	for j in $(jars); do \
+	  install -m 644 $(builddir)/jars/$$j-jdk14-*.jar \
+	    debian/build/$$j.jar; \
+	done
+	touch stamp-build-indep
 
 clean::
-	rm -rf build
+	rm -f stamp-*
+	rm -rf build debian/build
 
 # bcprov
 binary-install/libbcprov-java::
@@ -18,22 +36,55 @@
 	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::
-	mv -i $(builddir)/javadoc/bcprov debian/libbcprov-java-doc/usr/share/doc/libbcprov-java-doc/apidoc
+	mv -i $(builddir)/javadoc/bcprov debian/libbcprov-java-doc/usr/share/doc/libbcprov-java-doc/api
 
 # bcmail
 binary-install/libbcmail-java::
 	install -m 644 $(builddir)/jars/bcmail-jdk14-*.jar debian/libbcmail-java/usr/share/java/bcmail.jar
 binary-install/libbcmail-java-doc::
-	mv -i $(builddir)/javadoc/bcmail debian/libbcmail-java-doc/usr/share/doc/libbcmail-java-doc/apidoc
+	mv -i $(builddir)/javadoc/bcmail debian/libbcmail-java-doc/usr/share/doc/libbcmail-java-doc/api
 
 # bcpg
 binary-install/libbcpg-java::
 	install -m 644 $(builddir)/jars/bcpg-jdk14-*.jar debian/libbcpg-java/usr/share/java/bcpg.jar
 binary-install/libbcpg-java-doc::
-	mv -i $(builddir)/javadoc/bcpg debian/libbcpg-java-doc/usr/share/doc/libbcpg-java-doc/apidoc
+	mv -i $(builddir)/javadoc/bcpg debian/libbcpg-java-doc/usr/share/doc/libbcpg-java-doc/api
 
 # bctsp
 binary-install/libbctsp-java::
 	install -m 644 $(builddir)/jars/bctsp-jdk14-*.jar debian/libbctsp-java/usr/share/java/bctsp.jar
 binary-install/libbctsp-java-doc::
-	mv -i $(builddir)/javadoc/bctsp debian/libbctsp-java-doc/usr/share/doc/libbctsp-java-doc/apidoc
+	mv -i $(builddir)/javadoc/bctsp debian/libbctsp-java-doc/usr/share/doc/libbctsp-java-doc/api
+
+
+binary-post-install/libbcprov-java-gcj:: binary-post-install/libbcprov-java
+	rm -rf debian/libbcprov-java-gcj/usr/share/doc/libbcprov-java-gcj
+	ln -s libbcprov-java \
+	    debian/libbcprov-java-gcj/usr/share/doc/libbcprov-java-gcj
+ifeq ($(with_native),yes)
+	dh_nativejava -plibbcprov-java-gcj
+endif
+
+binary-post-install/libbcmail-java-gcj:: binary-post-install/libbcmail-java
+	rm -rf debian/libbcmail-java-gcj/usr/share/doc/libbcmail-java-gcj
+	ln -s libbcmail-java \
+	    debian/libbcmail-java-gcj/usr/share/doc/libbcmail-java-gcj
+ifeq ($(with_native),yes)
+	dh_nativejava -plibbcmail-java-gcj
+endif
+
+binary-post-install/libbcpg-java-gcj:: binary-post-install/libbcpg-java
+	rm -rf debian/libbcpg-java-gcj/usr/share/doc/libbcpg-java-gcj
+	ln -s libbcpg-java \
+	    debian/libbcpg-java-gcj/usr/share/doc/libbcpg-java-gcj
+ifeq ($(with_native),yes)
+	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
+ifeq ($(with_native),yes)
+	dh_nativejava -plibbctsp-java-gcj
+endif

More information about the pkg-java-commits mailing list