[libcommons-digester-java] 37/39: 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 libcommons-digester-java.

commit f690eed9db409db436029347991cb85da5fdf8e4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 15 14:15:28 2018 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/changelog                     |  1 +
 debian/control                       |  1 -
 debian/libcommons-digester-java.poms |  2 +-
 debian/rules                         | 26 +++++---------------------
 4 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa91049..e62c0ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libcommons-digester-java (1.8.1-5) UNRELEASED; urgency=medium
     + Remove Kumar Appaiah from uploaders
 
   [ Emmanuel Bourg ]
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.1.3
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index 4788364..6e79fb2 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Uploaders:
 Build-Depends:
  ant,
  ant-optional,
- cdbs (>= 0.4.21),
  debhelper (>= 10),
  default-jdk,
  junit,
diff --git a/debian/libcommons-digester-java.poms b/debian/libcommons-digester-java.poms
index 43e746b..9a8dfa5 100644
--- a/debian/libcommons-digester-java.poms
+++ b/debian/libcommons-digester-java.poms
@@ -1 +1 @@
-pom.xml --no-parent
+pom.xml --no-parent --has-package-version --java-lib --artifact=dist/commons-digester.jar
diff --git a/debian/rules b/debian/rules
index ca8b799..c984b8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,28 +1,12 @@
 #!/usr/bin/make -f
-# debian/rules file for libcommons-digester-java (uses cdbs)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+export CLASSPATH=/usr/share/java/commons-beanutils.jar:/usr/share/java/commons-collections3.jar:/usr/share/java/commons-logging.jar
 
-PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_ANT_ARGS         := -Djavax.xml.transform.TransformerFactory=gnu.xml.libxmlj.transform.TransformerFactoryImpl -Dtest.failonerror=false
-# Additional JARs to add to the class path, either full path or just the
-# basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
-DEB_JARS             := commons-collections3 commons-logging commons-beanutils junit ant-junit
+%:
+	dh $@ --with maven-repo-helper
 
-DEB_ANT_BUILD_TARGET := dist
-
-DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt
-
-binary-post-install/$(PACKAGE)::
-	mh_installpoms -p$(PACKAGE)
-	mh_installjar -p$(PACKAGE) -l pom.xml dist/commons-digester.jar
-
-clean::
-	mh_clean
-	-rm -rf debian/tmp
+override_dh_auto_build:
+	dh_auto_build -- dist
 
 get-orig-source:
 	-uscan --upstream-version 0 --rename

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