[velocity-tools] 03/05: 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 velocity-tools.

commit 73929b8c07dd52d655a90708e78349bd65ff3027
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Oct 14 00:37:38 2017 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog |  1 +
 debian/control   |  2 +-
 debian/rules     | 44 ++++++++++++++++++++++++--------------------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c3b386a..db7572c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 velocity-tools (2.0-7) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * Switch to debhelper level 10
   * Standards-Version updated to 4.1.1
 
diff --git a/debian/control b/debian/control
index 5a729b3..53224e4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: ant, cdbs, debhelper (>= 10), default-jdk
+Build-Depends: ant, debhelper (>= 10), default-jdk
 Build-Depends-Indep: ant-optional,
                      antlr,
                      junit4,
diff --git a/debian/rules b/debian/rules
index b25c229..0a24c53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,37 +1,41 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/dpkg/pkg-info.mk
 
-JAVA_HOME            := /usr/lib/jvm/default-java
-ANT_HOME             := /usr/share/ant
+export CLASSPATH=/usr/share/java/commons-beanutils.jar \
+                :/usr/share/java/commons-collections3.jar \
+                :/usr/share/java/commons-digester.jar \
+                :/usr/share/java/commons-lang.jar \
+                :/usr/share/java/commons-logging.jar \
+                :/usr/share/java/dom4j.jar \
+                :/usr/share/java/jsp-api-2.3.jar \
+                :/usr/share/java/servlet-api-3.1.jar \
+                :/usr/share/java/velocity.jar
 
-DEB_JARS             := antlr commons-beanutils commons-collections3 commons-digester commons-lang commons-logging commons-validator oro servlet-api-3.1 jsp-api-2.3 velocity junit4 ant-junit dom4j
+%:
+	dh $@
 
-DEB_ANT_BUILD_TARGET := jar.view jar.generic javadoc
-#DEB_ANT_CHECK_TARGET := test.generic
-DEB_ANT_CLEAN_TARGET := clean
+override_dh_auto_build:
+	dh_auto_build -- jar.view jar.generic javadoc -Dskip-download=true
 
-DEB_ANT_ARGS         := -Dskip-download=true
+override_dh_install:
+	dh_install
 
-API_DOCS             := docs/javadoc/*
-
-binary-post-install/lib$(DEB_SOURCE_PACKAGE)-java::
 	# Generic JAR
-	mh_installpoms -plib$(DEB_SOURCE_PACKAGE)-java
-	mh_installjar  -plib$(DEB_SOURCE_PACKAGE)-java -l pom.xml dist/$(DEB_SOURCE_PACKAGE)-view-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/velocity-tools-view.jar
+	mh_installpoms -plibvelocity-tools-java
+	mh_installjar  -plibvelocity-tools-java -l pom.xml dist/velocity-tools-view-$(DEB_VERSION_UPSTREAM).jar /usr/share/java/velocity-tools-view.jar
 
 	# View JAR
-	dh_link -plib$(DEB_SOURCE_PACKAGE)-java /usr/share/java/velocity-tools-view.jar /usr/share/maven-repo/velocity-tools/velocity-tools-view/debian/velocity-tools-view-debian.jar
-	dh_link -plib$(DEB_SOURCE_PACKAGE)-java /usr/share/java/velocity-tools-view.jar /usr/share/maven-repo/velocity-tools/velocity-tools-view/$(DEB_UPSTREAM_VERSION)/velocity-tools-view-$(DEB_UPSTREAM_VERSION).jar
+	dh_link -plibvelocity-tools-java /usr/share/java/velocity-tools-view.jar /usr/share/maven-repo/velocity-tools/velocity-tools-view/debian/velocity-tools-view-debian.jar
+	dh_link -plibvelocity-tools-java /usr/share/java/velocity-tools-view.jar /usr/share/maven-repo/velocity-tools/velocity-tools-view/$(DEB_VERSION_UPSTREAM)/velocity-tools-view-$(DEB_VERSION_UPSTREAM).jar
+
+	dh_install -plibvelocity-tools-java-doc docs/javadoc/* usr/share/doc/libvelocity-tools-java/api
 
-clean::
+override_dh_auto_clean:
+	dh_auto_clean
 	-rm -rf debian/tmp
 	mh_clean
 
-binary-post-install/lib$(DEB_SOURCE_PACKAGE)-java-doc::
-	dh_install -plib$(DEB_SOURCE_PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(DEB_SOURCE_PACKAGE)-java/api
-
 # Rename content directory to velocity-tools-X.Y in orig.tar.gz
 get-orig-source:
 	uscan --force-download --rename --repack

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