[excalibur-logkit] 28/32: 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 excalibur-logkit.

commit 059666be6b5c231f881be4f8961bb931fc6897c9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 29 01:01:29 2018 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog                     |  1 +
 debian/clean                         |  1 +
 debian/control                       |  1 -
 debian/libexcalibur-logkit-java.poms |  2 +-
 debian/rules                         | 19 ++++---------------
 5 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0f55401..60aa4a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 excalibur-logkit (2.0-12) UNRELEASED; urgency=medium
 
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.1.3
   * Switch to debhelper level 11
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..567609b
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+build/
diff --git a/debian/control b/debian/control
index 35acac7..db2bfb0 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Uploaders:
 Build-Depends:
  ant,
  ant-optional,
- cdbs,
  debhelper (>= 11),
  default-jdk,
  default-jdk-doc,
diff --git a/debian/libexcalibur-logkit-java.poms b/debian/libexcalibur-logkit-java.poms
index 1a7e280..50636a9 100644
--- a/debian/libexcalibur-logkit-java.poms
+++ b/debian/libexcalibur-logkit-java.poms
@@ -1 +1 @@
-debian/pom.xml
+debian/pom.xml --java-lib --artifact=target/excalibur-logkit.jar
diff --git a/debian/rules b/debian/rules
index 5888cfa..7f77c55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+%:
+	dh $@ --with maven-repo-helper --with javahelper
 
-JAVA_HOME_DIRS		:= /usr/lib/jvm/default-java
-DEB_JARS		:= ant-junit geronimo-jms-1.1-spec javax.mail junit log4j-1.2 servlet-api-3.1
-DEB_ANT_BUILD_TARGET	:= dist
-DEB_ANT_ARGS		:= -Dnoget=true -Dfinal.name=excalibur-logkit -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -Dlibdir=/usr/share/java
-
-install/libexcalibur-logkit-java::
-	mh_installpoms -plibexcalibur-logkit-java -e$(DEB_UPSTREAM_VERSION)
-	jh_classpath -plibexcalibur-logkit-java target/excalibur-logkit.jar
-	mh_installjar -plibexcalibur-logkit-java -e$(DEB_UPSTREAM_VERSION) -l \
-          debian/pom.xml target/excalibur-logkit.jar
-
-clean::
-	mh_clean
+override_dh_auto_build:
+	dh_auto_build -- dist -Dnoget=true -Dfinal.name=excalibur-logkit -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -Dlibdir=/usr/share/java

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