[libcommons-validator-java] 01/09: 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-validator-java.

commit 86cbd03d66c37be1b6d5a6f4ad57081993084fcf
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Dec 6 23:08:53 2015 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/changelog                         |  6 ++++++
 debian/control                           |  2 +-
 debian/libcommons-validator-java.install |  1 +
 debian/rules                             | 24 ++++++------------------
 4 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1233c98..1eae5c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libcommons-validator-java (1:1.4.1-2) UNRELEASED; urgency=medium
+
+  * Build with the DH sequencer instead of CDBS
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 06 Dec 2015 23:04:14 +0100
+
 libcommons-validator-java (1:1.4.1-1) unstable; urgency=low
 
   [ Emmanuel Bourg ]
diff --git a/debian/control b/debian/control
index 2cc9ef2..ff78e76 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: Varun Hiremath <varun at debian.org>, Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: cdbs, debhelper (>= 9), default-jdk
+Build-Depends: debhelper (>= 9), default-jdk
 Build-Depends-Indep: ant,
                      javahelper,
                      junit (>= 3.8.1),
diff --git a/debian/libcommons-validator-java.install b/debian/libcommons-validator-java.install
new file mode 100644
index 0000000..a8bee93
--- /dev/null
+++ b/debian/libcommons-validator-java.install
@@ -0,0 +1 @@
+src/main/resources/org/apache/commons/validator/resources/*.dtd   usr/share/sgml/apache/jakarta/validator
diff --git a/debian/rules b/debian/rules
index 032e0c7..5af3123 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,12 @@
 #!/usr/bin/make -f
-# debian/rules for libcommons-validator-java (uses CDBS)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+export JAVA_HOME := /usr/lib/jvm/default-java
 
-JAVA_HOME            := /usr/lib/jvm/default-java
+%:
+	dh $@ --buildsystem=maven --with javahelper
 
-PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
-
-DEB_MAVEN_DOC_TARGET       := javadoc:javadoc
-DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt
-
-binary-post-install/$(PACKAGE)::
-	dh_install -p$(PACKAGE) src/main/resources/org/apache/commons/validator/resources/*.dtd usr/share/sgml/apache/jakarta/validator
-	jh_classpath -p$(PACKAGE)
-
-clean::
-	$(RM) debian/install debian/sgmlcatalogs
-	-mh_clean
+override_dh_installchangelogs:
+	dh_installchangelogs RELEASE-NOTES.txt
 
 get-orig-source:
-	-uscan --download-version $(DEB_UPSTREAM_VERSION) --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/libcommons-validator-java.git