[bouncycastle] 02/07: Build with the DH sequencer instead of CDBS
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Jan 6 16:38:00 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository bouncycastle.
commit d8f41922978f192c0f3ee512ea1c87aa5c319f58
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Jan 6 15:09:36 2017 +0100
Build with the DH sequencer instead of CDBS
---
debian/changelog | 1 +
debian/control | 1 -
debian/libbcmail-java-doc.doc-base | 4 +--
debian/libbcmail-java-doc.install | 1 +
debian/libbcmail-java.poms | 1 -
debian/libbcpg-java-doc.doc-base | 4 +--
debian/libbcpg-java-doc.install | 1 +
debian/libbcpg-java.poms | 1 -
debian/libbcpkix-java-doc.doc-base | 4 +--
debian/libbcpkix-java-doc.install | 1 +
debian/libbcpkix-java.poms | 1 -
debian/libbcprov-java-doc.doc-base | 4 +--
debian/libbcprov-java-doc.install | 1 +
debian/libbcprov-java.poms | 5 +++-
debian/rules | 60 +++++++++-----------------------------
15 files changed, 30 insertions(+), 60 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c351bcb..4f9e905 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
bouncycastle (1.55-3) UNRELEASED; urgency=medium
* Team upload.
+ * Build with the DH sequencer instead of CDBS
* Switch to debhelper level 10
-- Emmanuel Bourg <ebourg at apache.org> Fri, 06 Jan 2017 14:18:45 +0100
diff --git a/debian/control b/debian/control
index 7e1622d..a47fb22 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: Brian Thomason <brian.thomason at eucalyptus.com>,
Emmanuel Bourg <ebourg at apache.org>
Build-Depends: ant,
ant-optional,
- cdbs (>= 0.4.27),
debhelper (>= 10),
default-jdk (>= 1:1.6),
javahelper,
diff --git a/debian/libbcmail-java-doc.doc-base b/debian/libbcmail-java-doc.doc-base
index a77d813..09a7b26 100644
--- a/debian/libbcmail-java-doc.doc-base
+++ b/debian/libbcmail-java-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: This is the API Javadoc provided for the libbcmail-java library.
Section: Programming
Format: HTML
-Index: /usr/share/doc/libbcmail-java-doc/api/index.html
-Files: /usr/share/doc/libbcmail-java-doc/api/*
+Index: /usr/share/doc/libbcmail-java/api/index.html
+Files: /usr/share/doc/libbcmail-java/api/*
diff --git a/debian/libbcmail-java-doc.install b/debian/libbcmail-java-doc.install
new file mode 100644
index 0000000..6246b55
--- /dev/null
+++ b/debian/libbcmail-java-doc.install
@@ -0,0 +1 @@
+build/artifacts/jdk1.5/javadoc/bcmail/* /usr/share/doc/libbcmail-java/api
diff --git a/debian/libbcmail-java.poms b/debian/libbcmail-java.poms
deleted file mode 100644
index f1b3861..0000000
--- a/debian/libbcmail-java.poms
+++ /dev/null
@@ -1 +0,0 @@
-debian/poms/bcmail.pom
diff --git a/debian/libbcpg-java-doc.doc-base b/debian/libbcpg-java-doc.doc-base
index 5a6259c..08b571c 100644
--- a/debian/libbcpg-java-doc.doc-base
+++ b/debian/libbcpg-java-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: This is the API Javadoc provided for the libbcpg-java library.
Section: Programming
Format: HTML
-Index: /usr/share/doc/libbcpg-java-doc/api/index.html
-Files: /usr/share/doc/libbcpg-java-doc/api/*
+Index: /usr/share/doc/libbcpg-java/api/index.html
+Files: /usr/share/doc/libbcpg-java/api/*
diff --git a/debian/libbcpg-java-doc.install b/debian/libbcpg-java-doc.install
new file mode 100644
index 0000000..6a786bd
--- /dev/null
+++ b/debian/libbcpg-java-doc.install
@@ -0,0 +1 @@
+build/artifacts/jdk1.5/javadoc/bcpg/* /usr/share/doc/libbcpg-java/api
diff --git a/debian/libbcpg-java.poms b/debian/libbcpg-java.poms
deleted file mode 100644
index 6874db4..0000000
--- a/debian/libbcpg-java.poms
+++ /dev/null
@@ -1 +0,0 @@
-debian/poms/bcpg.pom
diff --git a/debian/libbcpkix-java-doc.doc-base b/debian/libbcpkix-java-doc.doc-base
index 4677b1b..dd8ea5b 100644
--- a/debian/libbcpkix-java-doc.doc-base
+++ b/debian/libbcpkix-java-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: This is the API Javadoc provided for the libbcpkix-java library.
Section: Programming
Format: HTML
-Index: /usr/share/doc/libbcpkix-java-doc/api/index.html
-Files: /usr/share/doc/libbcpkix-java-doc/api/*
+Index: /usr/share/doc/libbcpkix-java/api/index.html
+Files: /usr/share/doc/libbcpkix-java/api/*
diff --git a/debian/libbcpkix-java-doc.install b/debian/libbcpkix-java-doc.install
new file mode 100644
index 0000000..3f4d809
--- /dev/null
+++ b/debian/libbcpkix-java-doc.install
@@ -0,0 +1 @@
+build/artifacts/jdk1.5/javadoc/bcpkix/* /usr/share/doc/libbcpkix-java/api
diff --git a/debian/libbcpkix-java.poms b/debian/libbcpkix-java.poms
deleted file mode 100644
index 547d450..0000000
--- a/debian/libbcpkix-java.poms
+++ /dev/null
@@ -1 +0,0 @@
-debian/poms/bcpkix.pom
diff --git a/debian/libbcprov-java-doc.doc-base b/debian/libbcprov-java-doc.doc-base
index b760e7f..2d0c32b 100644
--- a/debian/libbcprov-java-doc.doc-base
+++ b/debian/libbcprov-java-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: This is the API Javadoc provided for the libbcprov-java library.
Section: Programming
Format: HTML
-Index: /usr/share/doc/libbcprov-java-doc/api/index.html
-Files: /usr/share/doc/libbcprov-java-doc/api/*
+Index: /usr/share/doc/libbcprov-java/api/index.html
+Files: /usr/share/doc/libbcprov-java/api/*
diff --git a/debian/libbcprov-java-doc.install b/debian/libbcprov-java-doc.install
new file mode 100644
index 0000000..937d973
--- /dev/null
+++ b/debian/libbcprov-java-doc.install
@@ -0,0 +1 @@
+build/artifacts/jdk1.5/javadoc/bcprov/* /usr/share/doc/libbcprov-java/api
diff --git a/debian/libbcprov-java.poms b/debian/libbcprov-java.poms
index 67e8f8b..9f9769c 100644
--- a/debian/libbcprov-java.poms
+++ b/debian/libbcprov-java.poms
@@ -1 +1,4 @@
-debian/poms/bcprov.pom
+debian/poms/bcprov.pom --has-package-version --java-lib --package=libbcprov-java --artifact=build/artifacts/jdk1.5/jars/bcprov-jdk15on-*.jar
+debian/poms/bcpkix.pom --has-package-version --java-lib --package=libbcpkix-java --artifact=build/artifacts/jdk1.5/jars/bcpkix-jdk15on-*.jar
+debian/poms/bcmail.pom --has-package-version --java-lib --package=libbcmail-java --artifact=build/artifacts/jdk1.5/jars/bcmail-jdk15on-*.jar
+debian/poms/bcpg.pom --has-package-version --java-lib --package=libbcpg-java --artifact=build/artifacts/jdk1.5/jars/bcpg-jdk15on-*.jar
diff --git a/debian/rules b/debian/rules
index 10c64ac..40942e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,66 +1,32 @@
#!/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 javax.mail
-DEB_ANT_BUILDFILE := ant/jdk15+.xml
-DEB_ANT_BUILD_TARGET := build-provider build
-DEB_INSTALL_CHANGELOGS_ALL := docs/releasenotes.html
+export CLASSPATH=/usr/share/java/javax.mail.jar
+%:
+ dh $@ --buildsystem=ant --with maven-repo-helper --with javahelper
-clean::
- mh_clean
- rm -f stamp-*
- rm -rf build
- rm -f *.bpg test.* large.* secret.asc pub.asc
+override_dh_auto_build:
+ dh_auto_build -- -f ant/jdk15+.xml build-provider build
-# bcprov
-binary-install/libbcprov-java:: build/libbcprov-java
- mh_installpoms -plibbcprov-java
- mh_installjar -plibbcprov-java -l debian/poms/bcprov.pom $(BUILD_DIR)/jars/bcprov-jdk15on-*.jar
+override_dh_auto_install:
+ dh_auto_install
dh_installdirs -plibbcprov-java etc/java/security/security.d
touch debian/libbcprov-java/etc/java/security/security.d/2000-org.bouncycastle.jce.provider.BouncyCastleProvider
-binary-install/libbcprov-java-doc::
- 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 $(BUILD_DIR)/jars/bcmail-jdk15on-*.jar
- jh_classpath -plibbcmail-java
-binary-install/libbcmail-java-doc::
- 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 $(BUILD_DIR)/jars/bcpg-jdk15on-*.jar
- jh_classpath -plibbcpg-java
-binary-install/libbcpg-java-doc::
- 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 $(BUILD_DIR)/jars/bcpkix-jdk15on-*.jar
- jh_classpath -plibbcpkix-java
-binary-install/libbcpkix-java-doc::
- mv -i $(BUILD_DIR)/javadoc/bcpkix debian/libbcpkix-java-doc/usr/share/doc/libbcpkix-java-doc/api
+override_dh_installchangelogs:
+ dh_installchangelogs -- docs/releasenotes.html
+override_dh_auto_clean:
+ dh_auto_clean -- -f ant/jdk15+.xml
get-orig-pom:
mkdir -p debian/poms
- for pom in $(ARTIFACTS); do \
+ for pom in bcprov bcpg bcmail bcpkix; 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 ;
get-orig-source:
- -uscan --download-version `echo $(DEB_UPSTREAM_VERSION) |sed -e 's/\.//g;s/\+dfsg//'` --force-download --rename
+ uscan --download-current-version --force-download --rename
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bouncycastle.git
More information about the pkg-java-commits
mailing list