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

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-07-15 14:06:32 +0000 (Mon, 15 Jul 2013)
New Revision: 17026

Modified:
   trunk/bouncycastle/debian/changelog
   trunk/bouncycastle/debian/rules
Log:
debian/rules: Use uppercase names for the constants and removed the duplicate constants




Modified: trunk/bouncycastle/debian/changelog
===================================================================
--- trunk/bouncycastle/debian/changelog	2013-07-15 13:58:57 UTC (rev 17025)
+++ trunk/bouncycastle/debian/changelog	2013-07-15 14:06:32 UTC (rev 17026)
@@ -10,7 +10,10 @@
   * Added the upstream changelog
   * Removed the -gcj packages
   * debian/orig-tar.sh: Exclude Eclipse project file
-  * debian/rules: Updated the download URL for the poms
+  * debian/rules:
+    - Updated the download URL for the poms
+    - Use uppercase names for the constants
+    - Removed the duplicate constants
   * debian/copyright: Updated to follow the Copyright Format 1.0
   * The documentation is now registered with doc-base
 

Modified: trunk/bouncycastle/debian/rules
===================================================================
--- trunk/bouncycastle/debian/rules	2013-07-15 13:58:57 UTC (rev 17025)
+++ trunk/bouncycastle/debian/rules	2013-07-15 14:06:32 UTC (rev 17026)
@@ -3,20 +3,21 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-builddir = build/artifacts/jdk1.5
+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
 
-jars = bcprov bcmail bcpg bcpkix
-
 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 $(jars); do \
-	  install -m 644 $(builddir)/jars/$$j-jdk15on-*.jar \
+	for j in $(ARTIFACTS); do \
+	  install -m 644 $(BUILD_DIR)/jars/$$j-jdk15on-*.jar \
 	    debian/build/$$j.jar; \
 	done
 	touch stamp-build-indep
@@ -30,42 +31,39 @@
 # bcprov
 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
+	mh_installjar -plibbcprov-java -l debian/poms/bcprov.pom $(BUILD_DIR)/jars/bcprov-jdk15on-*.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
+	mv -i $(BUILD_DIR)/javadoc/bcprov debian/libbcprov-java-doc/usr/share/doc/libbcprov-java-doc/api
 
 # bcmail
 binary-install/libbcmail-java:: build/libbcmail-java
 	mh_installpoms -plibbcmail-java
-	mh_installjar -plibbcmail-java -l debian/poms/bcmail.pom $(builddir)/jars/bcmail-jdk15on-*.jar
+	mh_installjar -plibbcmail-java -l debian/poms/bcmail.pom $(BUILD_DIR)/jars/bcmail-jdk15on-*.jar
 	jh_classpath -plibbcmail-java
 binary-install/libbcmail-java-doc::
-	mv -i $(builddir)/javadoc/bcmail debian/libbcmail-java-doc/usr/share/doc/libbcmail-java-doc/api
+	mv -i $(BUILD_DIR)/javadoc/bcmail debian/libbcmail-java-doc/usr/share/doc/libbcmail-java-doc/api
 
 # bcpg
 binary-install/libbcpg-java:: build/libbcpg-java
 	mh_installpoms -plibbcpg-java
-	mh_installjar -plibbcpg-java -l debian/poms/bcpg.pom $(builddir)/jars/bcpg-jdk15on-*.jar
+	mh_installjar -plibbcpg-java -l debian/poms/bcpg.pom $(BUILD_DIR)/jars/bcpg-jdk15on-*.jar
 	jh_classpath -plibbcpg-java
 binary-install/libbcpg-java-doc::
-	mv -i $(builddir)/javadoc/bcpg debian/libbcpg-java-doc/usr/share/doc/libbcpg-java-doc/api
+	mv -i $(BUILD_DIR)/javadoc/bcpg debian/libbcpg-java-doc/usr/share/doc/libbcpg-java-doc/api
 
 # bcpkix
 binary-install/libbcpkix-java:: build/libbcpkix-java
 	mh_installpoms -plibbcpkix-java
-	mh_installjar -plibbcpkix-java -l debian/poms/bcpkix.pom $(builddir)/jars/bcpkix-jdk15on-*.jar
+	mh_installjar -plibbcpkix-java -l debian/poms/bcpkix.pom $(BUILD_DIR)/jars/bcpkix-jdk15on-*.jar
 	jh_classpath -plibbcpkix-java
 binary-install/libbcpkix-java-doc::
-	mv -i $(builddir)/javadoc/bcpkix debian/libbcpkix-java-doc/usr/share/doc/libbcpkix-java-doc/api
+	mv -i $(BUILD_DIR)/javadoc/bcpkix debian/libbcpkix-java-doc/usr/share/doc/libbcpkix-java-doc/api
 
 
-POMS=bcprov bcpg bcmail bcpkix
-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 \
+	for pom in $(ARTIFACTS); do \
 		wget -O debian/poms/$${pom}.pom -U NoAgent-1.0 \
 			http://repo1.maven.org/maven2/org/bouncycastle/$${pom}-jdk15on/$(UPSTREAM_VERSION)/$${pom}-jdk15on-$(UPSTREAM_VERSION).pom ; \
 	done ;