[libskinlf-java] 04/06: 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 libskinlf-java.

commit cf7ce80b2ee7c80431ac58d979a5fcdbfd6bcda6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Dec 1 09:08:46 2017 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 0be1f45..4142175 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 libskinlf-java (6.7-10) UNRELEASED; urgency=medium
 
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 4.1.2
   * Switch to debhelper level 10
 
diff --git a/debian/control b/debian/control
index 39c3894..9f8d441 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Uploaders:
 Build-Depends:
  ant,
  ant-optional,
- cdbs,
  debhelper (>= 10),
  default-jdk,
  imagemagick,
diff --git a/debian/rules b/debian/rules
index dc48584..3fe4ef9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,28 +1,30 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/dpkg/pkg-info.mk
 
-JAVA_HOME            := /usr/lib/jvm/default-java/
-DEB_ANT_BUILDFILE    := debian/build.xml
-DEB_JARS             := ant-nodeps laf-plugin xalan2
-DEB_ANT_BUILD_TARGET := dist.pre
-BUILDDIR             := build
+%:
+	dh $@ --buildsystem=ant
 
-makebuilddir/libskinlf-java-demo::
-# The source package does not ship those two images (mandatory for the demo)
+override_dh_auto_build:
+	dh_auto_build -- -f debian/build.xml dist.pre
+
+override_dh_auto_install:
+	# The source package does not ship those two images (mandatory for the demo)
 	convert debian/skinlfdemo.xpm src/examples/skinlfdemo.gif
-	convert debian/windowicon.xpm src/examples/windowicon.gif 
+	convert debian/windowicon.xpm src/examples/windowicon.gif
+
+	install -m 644 -D build/skinlf.jar debian/libskinlf-java/usr/share/java/skinlf-$(DEB_VERSION_UPSTREAM).jar
+	ln -s skinlf-$(DEB_VERSION_UPSTREAM).jar debian/libskinlf-java/usr/share/java/skinlf.jar
+	install -m 644 -D build/nativeskin.jar debian/libskinlf-java/usr/share/java/nativeskin-$(DEB_VERSION_UPSTREAM).jar
+	ln -s nativeskin-$(DEB_VERSION_UPSTREAM).jar debian/libskinlf-java/usr/share/java/nativeskin.jar
 
-install/libskinlf-java::
-	install -m 644 -D $(BUILDDIR)/skinlf.jar debian/libskinlf-java/usr/share/java/skinlf-$(DEB_UPSTREAM_VERSION).jar
-	ln -s skinlf-$(DEB_UPSTREAM_VERSION).jar debian/libskinlf-java/usr/share/java/skinlf.jar
-	install -m 644 -D $(BUILDDIR)/nativeskin.jar debian/libskinlf-java/usr/share/java/nativeskin-$(DEB_UPSTREAM_VERSION).jar
-	ln -s nativeskin-$(DEB_UPSTREAM_VERSION).jar debian/libskinlf-java/usr/share/java/nativeskin.jar
+	install -m 644 -D build/examples.jar debian/libskinlf-java-demo/usr/share/java/skinlf-demo-$(DEB_VERSION_UPSTREAM).jar
+	ln -s  skinlf-demo-$(DEB_VERSION_UPSTREAM).jar debian/libskinlf-java-demo/usr/share/java/skinlf-demo.jar
 
-install/libskinlf-java-demo::
-	install -m 644 -D $(BUILDDIR)/examples.jar debian/libskinlf-java-demo/usr/share/java/skinlf-demo-$(DEB_UPSTREAM_VERSION).jar
-	ln -s  skinlf-demo-$(DEB_UPSTREAM_VERSION).jar debian/libskinlf-java-demo/usr/share/java/skinlf-demo.jar
+override_dh_auto_clean:
+	rm -Rf build
+	rm -f src/examples/skinlfdemo.gif
+	rm -f src/examples/windowicon.gif
 
 get-orig-source:
-	-uscan --upstream-version 0 --rename	
+	-uscan --upstream-version 0 --rename

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