[hsqldb] 08/11: Switch from cdbs to dh sequencer.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository hsqldb.

commit 204e9e16533bdd8af18ff5a80ea7b98c15e95824
Author: Markus Koschany <apo at debian.org>
Date:   Fri May 27 06:03:42 2016 +0200

    Switch from cdbs to dh sequencer.
---
 debian/control              |  1 -
 debian/hsqldb-utils.install |  2 ++
 debian/libhsqldb-java.jlibs |  1 +
 debian/libhsqldb-java.poms  |  1 +
 debian/rules                | 55 +++++++++++++++++++--------------------------
 5 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/debian/control b/debian/control
index a9ed4ef..0cba6f5 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders:
  Markus Koschany <apo at debian.org>
 Build-Depends:
  ant,
- cdbs,
  debhelper (>= 9),
  default-jdk,
  javahelper,
diff --git a/debian/hsqldb-utils.install b/debian/hsqldb-utils.install
new file mode 100644
index 0000000..4b19ae6
--- /dev/null
+++ b/debian/hsqldb-utils.install
@@ -0,0 +1,2 @@
+debian/bin/hsqldb.xpm usr/share/pixmaps
+debian/bin/hsqldb-* usr/bin
diff --git a/debian/libhsqldb-java.jlibs b/debian/libhsqldb-java.jlibs
new file mode 100644
index 0000000..95dbab2
--- /dev/null
+++ b/debian/libhsqldb-java.jlibs
@@ -0,0 +1 @@
+hsqldb/lib/hsqldbutil.jar
diff --git a/debian/libhsqldb-java.poms b/debian/libhsqldb-java.poms
new file mode 100644
index 0000000..befca2e
--- /dev/null
+++ b/debian/libhsqldb-java.poms
@@ -0,0 +1 @@
+debian/pom.xml --has-package-version --java-lib --artifact=hsqldb/lib/hsqldb.jar
diff --git a/debian/rules b/debian/rules
index 4a647d3..d837907 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,45 +1,36 @@
 #!/usr/bin/make -f
+export JAVA_HOME=/usr/lib/jvm/default-java
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+%:
+	dh $@ --parallel --with javahelper,maven_repo_helper --buildsystem=ant
 
-JAVA_HOME = /usr/lib/jvm/default-java
-DEB_JARS = servlet-api
-DEB_ANT_BUILDFILE = hsqldb/build/build.xml
-DEB_ANT_BUILD_TARGET = hsqldb hsqldbutil
-DEB_ANT_ARGS += -Dant.build.javac.target=1.5 -Dant.build.javac.source=1.5
-DEB_INSTALL_CHANGELOGS_ALL = hsqldb/doc-src/changelist_2_0.txt
-
-DEB_INSTALL_DOCS_ALL = -X .cvsignore
-
-build/hsqldb-utils::
+override_dh_auto_build:
+	dh_auto_build -- \
+		-f hsqldb/build/build.xml \
+		-Dant.build.javac.target=1.5 \
+		-Dant.build.javac.source=1.5 \
+		hsqldb hsqldbutil
 	$(MAKE) -C debian/bin all
 
-define install-jar
-install -m 644 -D hsqldb/lib/$(1).jar $(DEB_FINALDIR)/usr/share/java/$(1)-$(DEB_UPSTREAM_VERSION).jar
-dh_link /usr/share/java/$(1)-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/$(1).jar
-endef
-
-install/libhsqldb-java:: DEB_FINALDIR=$(CURDIR)/debian/libhsqldb-java/
-install/libhsqldb-java::
-	mh_installpom -plibhsqldb-java -e$(DEB_UPSTREAM_VERSION) debian/pom.xml
-	mh_installjar -plibhsqldb-java -e$(DEB_UPSTREAM_VERSION) -l debian/pom.xml hsqldb/lib/hsqldb.jar
-	# there is no POM file for hsqldbutil
-	$(call install-jar,hsqldbutil)
-	jh_classpath -plibhsqldb-java --classpath=/usr/share/java/servlet-api-3.1.jar \
-                $(CURDIR)/debian/libhsqldb-java/usr/share/java/hsqldb-$(DEB_UPSTREAM_VERSION).jar
+#DEB_JARS = servlet-api
 
-install/hsqldb-utils:: DEB_FINALDIR=$(CURDIR)/debian/hsqldb-utils/
-install/hsqldb-utils::
-	install -d $(DEB_FINALDIR)/usr/bin
-	install -m 755 debian/bin/hsqldb-* $(DEB_FINALDIR)/usr/bin/
-	install -m 644 -D debian/bin/hsqldb.xpm $(DEB_FINALDIR)/usr/share/pixmaps/hsqldb.xpm
+override_dh_installchangelogs:
+	dh_installchangelogs hsqldb/doc-src/changelist_2_0.txt
 
-clean::
+override_dh_auto_clean:
+	dh_auto_clean -- \
+		-f hsqldb/build/build.xml
+
+override_dh_clean:
+	dh_clean
 	rm -f hsqldb/lib/hsqldb*.jar
 	$(MAKE) -C debian/bin clean
 	mkdir -p hsqldb/doc-src
-	mh_clean
+
+override_jh_classpath:
+	jh_classpath
+	jh_classpath -plibhsqldb-java --classpath=/usr/share/java/servlet-api-3.1.jar \
+		hsqldb/lib/hsqldb.jar
 
 get-orig-source:
 	uscan --verbose --download-current-version --force-download --repack --compression xz

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