r2296 - in trunk/libgnucrypto-java/debian: . patches

[Arnaud Vandyck]

Author: avdyk
Date: 2006-08-01 08:49:08 +0000 (Tue, 01 Aug 2006)
New Revision: 2296

Removed:
   trunk/libgnucrypto-java/debian/patches/01-makefile-am-jar.patch
   trunk/libgnucrypto-java/debian/patches/01-makefile-in-jar.patch
Modified:
   trunk/libgnucrypto-java/debian/README.Debian
   trunk/libgnucrypto-java/debian/changelog
   trunk/libgnucrypto-java/debian/install
   trunk/libgnucrypto-java/debian/rules
Log:
libgnucrypto-java (2.1.0-1) unstable; urgency=low

  * New upstream.

 -- Arnaud Vandyck <avdyk at debian.org>  Tue,  1 Aug 2006 10:13:53 +0200

Modified: trunk/libgnucrypto-java/debian/README.Debian
===================================================================
--- trunk/libgnucrypto-java/debian/README.Debian	2006-07-31 14:34:03 UTC (rev 2295)
+++ trunk/libgnucrypto-java/debian/README.Debian	2006-08-01 08:49:08 UTC (rev 2296)
@@ -1,19 +1,7 @@
 libgnucrypto-java for Debian
 ----------------------------
 
-I think there maybe are problems with some libraries I have to build in
-separate package :(
+New upstream does not provide javax-security.jar and javax-crypto.jar,
+they are in GNU-Classpath now.
 
-javax-crypto.jar
-     +-- javax.crypto.*
-     +-- javax.crypto.interfaces.*
-     +-- javax.crypto.spec.*
-     +-- org.bouncycastle.asn1.*
-
-javax-security.jar
-     +-- javax.security.auth.callback.*
-     +-- javax.security.sasl.*
-
-should not be shipped with this package!
-
- -- Arnaud Vandyck <avdyk at debian.org>, Mon Nov 17 16:30:08 2003
+ -- Arnaud Vandyck <avdyk at debian.org>, Tue,  1 Aug 2006 10:41:19 +0200

Modified: trunk/libgnucrypto-java/debian/changelog
===================================================================
--- trunk/libgnucrypto-java/debian/changelog	2006-07-31 14:34:03 UTC (rev 2295)
+++ trunk/libgnucrypto-java/debian/changelog	2006-08-01 08:49:08 UTC (rev 2296)
@@ -1,3 +1,9 @@
+libgnucrypto-java (2.1.0-1) unstable; urgency=low
+
+  * New upstream.
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Tue,  1 Aug 2006 10:13:53 +0200
+
 libgnucrypto-java (2.0.1-7) unstable; urgency=low
 
   * using java-gcj-compat-dev to build (closes: #377065).

Modified: trunk/libgnucrypto-java/debian/install
===================================================================
--- trunk/libgnucrypto-java/debian/install	2006-07-31 14:34:03 UTC (rev 2295)
+++ trunk/libgnucrypto-java/debian/install	2006-08-01 08:49:08 UTC (rev 2296)
@@ -1,3 +1,2 @@
-jce/javax-crypto.jar usr/share/java
-security/javax-security.jar usr/share/java
 source/gnu-crypto.jar usr/share/java
+source/gnu-crypto-der.jar usr/share/java

Deleted: trunk/libgnucrypto-java/debian/patches/01-makefile-am-jar.patch
===================================================================
--- trunk/libgnucrypto-java/debian/patches/01-makefile-am-jar.patch	2006-07-31 14:34:03 UTC (rev 2295)
+++ trunk/libgnucrypto-java/debian/patches/01-makefile-am-jar.patch	2006-08-01 08:49:08 UTC (rev 2296)
@@ -1,11 +0,0 @@
---- jce/Makefile.am.old	2004-02-17 15:17:34.456775944 +0100
-+++ jce/Makefile.am	2004-02-17 15:18:01.415677568 +0100
-@@ -159,7 +159,7 @@
- 	CLASSPATH=$(CLASSPATH) $(JAVAC) $(JAVACFLAGS) $<
- 
- $(main_jar): $(main_classes)
--	@ jar cf $@ -C . javax/crypto/*.class javax/crypto/interfaces/*.class \
-+	@ $(JAR) cf $@ -C . javax/crypto/*.class javax/crypto/interfaces/*.class \
- 		javax/crypto/spec/*.class org/bouncycastle/asn1/*.class \
- 		org/bouncycastle/asn1/pkcs/*.class org/bouncycastle/asn1/x509/*.class
- 

Deleted: trunk/libgnucrypto-java/debian/patches/01-makefile-in-jar.patch
===================================================================
--- trunk/libgnucrypto-java/debian/patches/01-makefile-in-jar.patch	2006-07-31 14:34:03 UTC (rev 2295)
+++ trunk/libgnucrypto-java/debian/patches/01-makefile-in-jar.patch	2006-08-01 08:49:08 UTC (rev 2296)
@@ -1,11 +0,0 @@
---- jce/Makefile.in.old	2004-02-17 15:15:12.271391408 +0100
-+++ jce/Makefile.in	2004-02-17 15:17:23.673415264 +0100
-@@ -445,7 +445,7 @@
- 	CLASSPATH=$(CLASSPATH) $(JAVAC) $(JAVACFLAGS) $<
- 
- $(main_jar): $(main_classes)
--	@ jar cf $@ -C . javax/crypto/*.class javax/crypto/interfaces/*.class \
-+	@ $(JAR) cf $@ -C . javax/crypto/*.class javax/crypto/interfaces/*.class \
- 		javax/crypto/spec/*.class org/bouncycastle/asn1/*.class \
- 		org/bouncycastle/asn1/pkcs/*.class org/bouncycastle/asn1/x509/*.class
- 

Modified: trunk/libgnucrypto-java/debian/rules
===================================================================
--- trunk/libgnucrypto-java/debian/rules	2006-07-31 14:34:03 UTC (rev 2295)
+++ trunk/libgnucrypto-java/debian/rules	2006-08-01 08:49:08 UTC (rev 2296)
@@ -5,13 +5,20 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
+export JAVA_HOME=/usr/lib/jvm/java-gcj
+#CLASSPATH
+export JAVAC=$(JAVA_HOME)/bin/javac
+export JAVA=$(JAVA_HOME)/bin/java
+export JAR=$(JAVA_HOME)/bin/jar
 
+
 # This variable adds several arguments to the ./configure invocation,
 # in *addition* to what autotools.mk does normally.  So the end command
 # will look something like:
 # ./configure --prefix=/usr/ --sysconfdir=/etc ... --enable-glib --disable-qt ...
-DEB_CONFIGURE_EXTRA_FLAGS := --with-sasl=yes --with-jce=yes --datadir=/usr/share/java
+DEB_CONFIGURE_EXTRA_FLAGS := --with-sasl=yes \
+	--with-jce=yes \
+	--datadir=/usr/share/java
 
 # This adds extra stuff to the clean rule.
 clean::