[excalibur-logger] 27/29: 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-logger.

commit e1b33a1feeb16fade69d9a4bc169957a55c2e86b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Nov 21 00:56:13 2017 +0100

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

diff --git a/debian/changelog b/debian/changelog
index a717c2f..8aa0956 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 excalibur-logger (2.1-7) UNRELEASED; urgency=medium
 
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.1.1
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index 096f9c0..54f4c5f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders:
  Emmanuel Bourg <ebourg at apache.org>
 Build-Depends:
  ant,
- cdbs,
  debhelper (>= 10),
  default-jdk,
  glassfish-javaee,
diff --git a/debian/rules b/debian/rules
index b931ee2..603dce4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,21 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+export CLASSPATH=/usr/share/java/avalon-framework.jar\
+                :/usr/share/java/excalibur-logkit.jar\
+                :/usr/share/java/glassfish-jms.jar\
+                :/usr/share/java/log4j-1.2.jar\
+                :/usr/share/java/servlet-api-3.1.jar\
+                :/usr/share/java/mailapi.jar
 
-JAVA_HOME_DIRS	:= /usr/lib/jvm/default-java
-DEB_JARS	:= avalon-framework excalibur-logkit geronimo-jms-1.1-spec mailapi glassfish-jms log4j-1.2 servlet-api-3.1
-DEB_ANT_ARGS	:= -Dnoget=true -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4
+%:
+	dh $@
 
-install/libexcalibur-logger-java::
-	dh_install target/excalibur-logger-${DEB_UPSTREAM_VERSION}.jar usr/share/java/
-	dh_link usr/share/java/excalibur-logger-${DEB_UPSTREAM_VERSION}.jar usr/share/java/excalibur-logger.jar
+override_dh_auto_build:
+	dh_auto_build -- -Dnoget=true -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6
+
+override_dh_auto_install:
+	dh_install target/excalibur-logger-2.1.jar usr/share/java/
+	dh_link usr/share/java/excalibur-logger-2.1.jar usr/share/java/excalibur-logger.jar
 
 get-orig-source:
 	uscan --force-download --rename

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