[libhibernate-validator-java] 12/14: 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 libhibernate-validator-java.

commit a40bea1f5fb2fa964f7044a986dd53c9e4f0adf6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 31 23:57:09 2016 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog |  1 +
 debian/control   |  3 +--
 debian/rules     | 31 +++++++++++++++----------------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 792f9bb..a70e34b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ libhibernate-validator-java (4.3.2-1) UNRELEASED; urgency=medium
     - Removed jaxb-binding-fixes.patch (fixed upstream)
     - Updated the build for the new project layout
     - Worked around a maven-repo-helper bug with plugin dependencies
+  * Build with the DH sequencer instead of CDBS
   * Added the missing Maven rule for log4j
   * Standards-Version updated to 3.9.7 (no changes)
   * Use a secure Vcs-Git URL
diff --git a/debian/control b/debian/control
index b371f9b..c2855c6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>
-Build-Depends: cdbs,
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                default-jdk,
                glassfish-javaee,
                groovy2,
diff --git a/debian/rules b/debian/rules
index 8f71416..e85276a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,21 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+JAVA_HOME := /usr/lib/jvm/default-java
 
-JAVA_HOME            := /usr/lib/jvm/default-java
+%:
+	dh $@ --buildsystem=maven
 
-clean::
-	mh_clean
-	rm -f mvn-build
-	find ./ -name *.class |xargs rm -rf
+override_dh_auto_configure:
+	dh_auto_configure
+
+	# Invoke xjc manually due to the lack of jaxb2-maven-plugin in Debian
+	cd $(CURDIR)/engine/src/main/java && $(JAVA_HOME)/bin/xjc -enableIntrospection -p org.hibernate.validator.internal.xml -extension -b ../xjb/binding-customization.xjb ../xsd/validation-mapping-1.0.xsd
+	cd $(CURDIR)/engine/src/main/java && $(JAVA_HOME)/bin/xjc -enableIntrospection -p org.hibernate.validator.internal.xml ../xsd/validation-configuration-1.0.xsd
+
+override_dh_clean:
+	dh_clean
+
+	# Remove the files generated by xjc
 	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/AnnotationType.java
 	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/BeanType.java
 	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/ClassType.java
@@ -27,13 +34,5 @@ clean::
 	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/ValidationConfigType.java
 	rm -f engine/src/main/java/org/hibernate/validator/internal/xml/package-info.java
 
-configure/libhibernate-validator-java::
-	cd $(CURDIR)/engine/src/main/java && $(JAVA_HOME)/bin/xjc -enableIntrospection -p org.hibernate.validator.internal.xml -extension -b ../xjb/binding-customization.xjb ../xsd/validation-mapping-1.0.xsd
-	cd $(CURDIR)/engine/src/main/java && $(JAVA_HOME)/bin/xjc -enableIntrospection -p org.hibernate.validator.internal.xml ../xsd/validation-configuration-1.0.xsd
-
-binary/libhibernate-validator-java::
-	cp pom.xml.save pom.xml
-	cp engine/pom.xml.save engine/pom.xml
-
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
+	uscan --download-current-version --force-download

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