[libitext-java] 72/76: Build with the DH sequencer instead of CDBS

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libitext-java.

commit 16d3f9cc50acfeabbd0388cc19e21c7da3e010d7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 28 22:22:50 2016 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/ant.properties | 12 +++++++++++-
 debian/changelog      |  1 +
 debian/control        |  1 -
 debian/rules          | 28 ++++++----------------------
 4 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
index d76ab1c..dcdcf68 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1,3 +1,13 @@
 itext.jdk.core=1.5
 itext.src=..
-itext.lib=../lib
+itext.lib=/usr/share/java
+
+lib.bcmail=bcmail.jar
+lib.bcprov=bcprov.jar
+lib.bctsp=bctsp.jar
+lib.dom4j=dom4j.jar
+lib.pdf-renderer=pdf-renderer.jar
+
+itext.jar=../lib/iText.jar
+itext.rtf.jar=../lib/iText-rtf.jar
+itext.rups.jar=../lib/iText-rups.jar
diff --git a/debian/changelog b/debian/changelog
index 8a6410f..316fdb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libitext-java (2.1.7-11) UNRELEASED; urgency=medium
 
   * Install the Maven artifacts for libitext-rtf-java and libitext-rups-java
   * Removed the libitext-java-gcj package
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 3.9.8
 
diff --git a/debian/control b/debian/control
index 4d05ded..f344290 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders: Adriaan Peeters <apeeters at lashout.net>, Torsten Werner <twerner at debia
 Build-Depends: ant,
                debhelper (>= 9),
                default-jdk,
-               cdbs,
                javahelper (>= 0.43),
                libbcmail-java,
                libbcpkix-java,
diff --git a/debian/rules b/debian/rules
index a69c8b0..b2524ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,29 +1,13 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+%:
+	dh $@ --buildsystem=ant --with maven-repo-helper --with javahelper
 
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET := jar jar.rtf jar.rups
-DEB_ANT_CLEAN_TARGET :=
-DEB_JARS             := bcprov bcmail bcpkix dom4j pdfrenderer
+override_dh_auto_build:
+	dh_auto_build -- jar jar.rtf jar.rups
 
-install/libitext-java::
-	jh_depends -plibitext-java
-	mh_install -plibitext-java
-	jh_classpath -plibitext-java
-
-install/libitext-rtf-java::
-	jh_depends -plibitext-rtf-java
-	jh_classpath -plibitext-rtf-java
-
-install/libitext-rups-java::
-	jh_depends -plibitext-rups-java
-	jh_classpath -plibitext-rups-java
-
-clean::
-	mh_clean
-	-rm -rf build lib debian/stamp-*
+override_dh_auto_clean:
+	-rm -rf build lib
 
 get-orig-source:
 	uscan --force-download --download-current-version --rename

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libitext-java.git