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

Emmanuel Bourg ebourg-guest at alioth.debian.org
Mon Jul 15 13:32:33 UTC 2013 

Author: ebourg-guest
Date: 2013-07-15 13:32:33 +0000 (Mon, 15 Jul 2013)
New Revision: 17019

Modified:
   trunk/bouncycastle/debian/changelog
   trunk/bouncycastle/debian/control
   trunk/bouncycastle/debian/libbcprov-java.dirs
   trunk/bouncycastle/debian/rules
Log:
Removed the -gcj packages



Modified: trunk/bouncycastle/debian/changelog
===================================================================
--- trunk/bouncycastle/debian/changelog	2013-07-14 14:43:39 UTC (rev 17018)
+++ trunk/bouncycastle/debian/changelog	2013-07-15 13:32:33 UTC (rev 17019)
@@ -5,6 +5,7 @@
     - libbcpkix-java depends on libbcprov-java
     - libbcpg-java depends on libbcprov-java
     - libbcmail-java depends on libbcprov-java and libbcpkix-java
+  * Removed the -gcj packages
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 08 Jul 2013 14:26:18 +0200
 

Modified: trunk/bouncycastle/debian/control
===================================================================
--- trunk/bouncycastle/debian/control	2013-07-14 14:43:39 UTC (rev 17018)
+++ trunk/bouncycastle/debian/control	2013-07-15 13:32:33 UTC (rev 17019)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Brian Thomason <brian.thomason at eucalyptus.com>, Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: cdbs (>= 0.4.27), debhelper (>= 7.0.50~), ant, gcj-native-helper, libgnumail-java,
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 7.0.50~), ant, libgnumail-java,
  junit, ant-optional, maven-repo-helper, default-jdk (>= 1:1.6)
 Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/bouncycastle
@@ -12,8 +12,8 @@
 
 Package: libbcprov-java
 Architecture: all
-Depends: libgcj-common (>= 1:4.1.1-19), ${misc:Depends}
-Suggests: libbcprov-java-doc, libbcprov-java-gcj
+Depends: ${misc:Depends}
+Suggests: libbcprov-java-doc
 Description: Bouncy Castle Java Cryptographic Service Provider
  The Bouncy Castle Crypto package is a Java implementation of
  cryptographic algorithms.
@@ -31,7 +31,7 @@
 Package: libbcmail-java
 Architecture: all
 Depends: libgnumail-java, libbcprov-java (>= ${source:Version}), libbcpkix-java (>= ${source:Version}), ${misc:Depends}
-Suggests: libbcmail-java-doc,libbcmail-java-gcj
+Suggests: libbcmail-java-doc
 Description: Bouncy Castle generators/processors for S/MIME and CMS
  The Bouncy Castle Crypto package is a Java implementation of
  cryptographic algorithms.
@@ -50,7 +50,7 @@
 Package: libbcpkix-java
 Architecture: all
 Depends: libbcprov-java (>= ${source:Version}), ${misc:Depends}
-Suggests: libbcpkix-java-doc, libbcpkix-java-gcj
+Suggests: libbcpkix-java-doc
 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.
@@ -69,7 +69,7 @@
 Package: libbcpg-java
 Architecture: all
 Depends: libbcprov-java (>= ${source:Version}), ${misc:Depends}
-Suggests: libbcpg-java-doc, libbcpg-java-gcj
+Suggests: libbcpg-java-doc
 Description: Bouncy Castle generators/processors for OpenPGP
  The Bouncy Castle Crypto package is a Java implementation of
  cryptographic algorithms.
@@ -83,33 +83,3 @@
 Description: Documentation for libbcpg-java
  Javadocs for libbcpg-java, which provides generators and processors
  for OpenPGP.
-
-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, ${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: libbcpkix-java-gcj
-Architecture: any
-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 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: 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/libbcprov-java.dirs
===================================================================
--- trunk/bouncycastle/debian/libbcprov-java.dirs	2013-07-14 14:43:39 UTC (rev 17018)
+++ trunk/bouncycastle/debian/libbcprov-java.dirs	2013-07-15 13:32:33 UTC (rev 17019)
@@ -1,2 +1 @@
-usr/share/java/gcj-endorsed
 etc/java/security/security.d

Modified: trunk/bouncycastle/debian/rules
===================================================================
--- trunk/bouncycastle/debian/rules	2013-07-14 14:43:39 UTC (rev 17018)
+++ trunk/bouncycastle/debian/rules	2013-07-15 13:32:33 UTC (rev 17019)
@@ -5,22 +5,6 @@
 
 builddir = build/artifacts/jdk1.5
 
-# hardening
-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-export AOT_GCJFLAGS=$(CFLAGS)
-export AOT_LDFLAGS=$(LDFLAGS)
-
-include /usr/share/gcj/debian_defaults
-
-#exclude sparc for now as there is a gcj bug which prevents its optimizations from compiling
-export BUILD_NATIVE = $(filter-out sparc%, $(gcj_native_archs))
-
-DEB_HOST_ARCH ?= $(shell dpkg-architecture qDEB_HOST_ARCH)
-ifneq (,$(filter $(DEB_HOST_ARCH), $(BUILD_NATIVE)))
-  with_native := yes
-endif
-
 jars = bcprov bcmail bcpg bcpkix
 
 common-build-indep:: stamp-build-indep
@@ -45,7 +29,6 @@
 binary-install/libbcprov-java:: build/libbcprov-java
 	mh_installpoms -plibbcprov-java
 	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::
 	mv -i $(builddir)/javadoc/bcprov debian/libbcprov-java-doc/usr/share/doc/libbcprov-java-doc/api
@@ -72,38 +55,6 @@
 	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
-	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/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 -plibbcpkix-java-gcj
-endif
-
 POMS=bcprov bcpg bcmail bcpkix
 UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p' | sed 's/\+dfsg//')

More information about the pkg-java-commits mailing list