[pkg-java] r17029 - in trunk/bouncycastle/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-07-15 15:07:16 +0000 (Mon, 15 Jul 2013)
New Revision: 17029

Modified:
   trunk/bouncycastle/debian/changelog
   trunk/bouncycastle/debian/patches/01_build.patch
   trunk/bouncycastle/debian/rules
Log:
debian/rules: Use the CDBS Ant class



Modified: trunk/bouncycastle/debian/changelog
===================================================================
--- trunk/bouncycastle/debian/changelog	2013-07-15 14:56:51 UTC (rev 17028)
+++ trunk/bouncycastle/debian/changelog	2013-07-15 15:07:16 UTC (rev 17029)
@@ -13,6 +13,7 @@
   * debian/orig-tar.sh: Exclude Eclipse project file
   * debian/orig-tar.sh: Exclude the prebuilt CLDC classes
   * debian/rules:
+    - Use the CDBS Ant class
     - Updated the download URL for the poms
     - Use uppercase names for the constants
     - Removed the duplicate constants

Modified: trunk/bouncycastle/debian/patches/01_build.patch
===================================================================
--- trunk/bouncycastle/debian/patches/01_build.patch	2013-07-15 14:56:51 UTC (rev 17028)
+++ trunk/bouncycastle/debian/patches/01_build.patch	2013-07-15 15:07:16 UTC (rev 17029)
@@ -1,4 +1,4 @@
-Description: Modify JAR paths and pass unicode flag to javac targets for proper compilation
+Description: Pass unicode flag to javac targets for proper compilation
 Author: Brian Thomason <brian.thomason at eucalyptus.com>
 
 --- a/bc-build.xml
@@ -27,37 +27,3 @@
          </javac>
      </target>
  
---- a/build15+
-+++ b/build15+
-@@ -8,10 +8,9 @@
- 
- 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
-+	JUNIT_HOME=/usr/share/java
- fi
- 
- JAVA_HOME=$JDKPATH
-@@ -20,7 +19,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:$JUNIT_HOME/junit.jar:$CLASSPATH
- export CLASSPATH
- 
- if [ "$1" = "test" ]
-@@ -30,7 +29,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/rules
===================================================================
--- trunk/bouncycastle/debian/rules	2013-07-15 14:56:51 UTC (rev 17028)
+++ trunk/bouncycastle/debian/rules	2013-07-15 15:07:16 UTC (rev 17029)
@@ -1,32 +1,25 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 UPSTREAM_VERSION = $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p' | sed 's/\+dfsg//')
 ARTIFACTS = bcprov bcpg bcmail bcpkix
 BUILD_DIR = build/artifacts/jdk1.5
 
+JAVA_HOME                  := /usr/lib/jvm/default-java
+DEB_JARS                   := junit gnumail
+DEB_ANT_BUILDFILE          := jdk15+.xml
+DEB_ANT_BUILD_TARGET       := build-provider build
 DEB_INSTALL_CHANGELOGS_ALL := releasenotes.html
 
 
-common-build-indep:: stamp-build-indep
-stamp-build-indep:
-	sh -x ./build15+
-	#sh -x ./build15+ test
-	mkdir -p debian/build
-	set -e; \
-	for j in $(ARTIFACTS); do \
-	  install -m 644 $(BUILD_DIR)/jars/$$j-jdk15on-*.jar \
-	    debian/build/$$j.jar; \
-	done
-	touch stamp-build-indep
-
 clean::
+	mh_clean
 	rm -f stamp-*
-	rm -rf build debian/build
+	rm -rf build
 	rm -f *.bpg test.* large.* secret.asc pub.asc
-	rm -rf debian/.mh
 
 # bcprov
 binary-install/libbcprov-java:: build/libbcprov-java