[clojure] 05/09: 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 clojure.

commit 9c8c2bd0e3f403757e29a055ea6986225a3b58b5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 22 15:02:06 2016 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/changelog |  1 +
 debian/clean     |  1 +
 debian/control   |  5 +----
 debian/rules     | 38 +++++++++++++++-----------------------
 4 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8b309a4..f07b426 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 clojure1.6 (1.6.0+dfsg-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * Build the upstream tarball from the Git repository
   * Switch to debhelper level 10
   * Use secure Vcs-* URLs
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..c752d41
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+changes.html
diff --git a/debian/control b/debian/control
index 0fda350..1247f06 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,8 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Daigo Moriwaki <daigo at debian.org>
 Build-Depends:
- cdbs,
- debhelper (>= 10),
- quilt
-Build-Depends-Indep:
  ant,
+ debhelper (>= 10),
  default-jdk,
  javahelper,
  libasm-java (>= 5.0),
diff --git a/debian/rules b/debian/rules
index 5fb3511..733ff9a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,41 +3,33 @@
 SOURCE = $(shell dpkg-parsechangelog | grep ^Source | sed "s/Source: //")
 VER = $(shell echo $(SOURCE) | sed s/^clojure//)
 
-MDWN_DOCS = $(patsubst %.md,%.html,$(wildcard *.md))
+JAVA_HOME = /usr/lib/jvm/default-java
 
-include /usr/share/javahelper/java-vars.mk
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+%:
+	dh $@ --with maven-repo-helper
 
-DEB_JARS  := asm asm-commons
+override_dh_auto_build:
+	dh_auto_build -- jar
 
-DEB_INSTALL_CHANGELOGS_ALL := changes.md
-DEB_INSTALL_DOCS_ALL := readme.txt changes.html
-# Prevent test from running because executing test requires a third-party library called test.generative
-DEB_ANT_BUILD_TARGET := jar
+	# Convert changes.md to html
+	cat debian/header.html > changes.html
+	sed -i'' -e 's/@TITLE@/$(shell head -n 1 $< | sed 's/^#*\s*//')/g' changes.html
+	markdown changes.md >> changes.html
+	cat debian/footer.html >> changes.html
 
-build/clojure1.6:: $(MDWN_DOCS)
-
-binary-install/$(SOURCE)::
+override_dh_install:
 	$(JAVA_HOME)/bin/java -cp /usr/share/java/asm.jar:/usr/share/java/asm-commons.jar:clojure.jar clojure.main debian/gencompletions.clj > debian/$(SOURCE)/etc/rlwrap/clojure$(VER)
 
-binary-post-install/$(SOURCE)::
+	dh_install
+
 	sed -i 's/@VER@/$(VER)/g' debian/$(SOURCE)/usr/bin/*
 	prename 's/$$/$(VER)/' debian/$(SOURCE)/usr/bin/*
 	prename 's/\.(.)$$/$(VER).$$1/' debian/$(SOURCE)/usr/share/man/*/*
 	mh_installpom -p$(SOURCE) --no-parent pom.xml
 	mh_installjar -p$(SOURCE) -l -s pom.xml clojure.jar /usr/share/java/clojure-$(VER).jar
 
-%.html:%.md
-	cat debian/header.html > $@
-	sed -i'' -e 's/@TITLE@/$(shell head -n 1 $< | sed 's/^#*\s*//')/g' $@
-	markdown $< >> $@
-	cat debian/footer.html >> $@
-
-clean::
-	rm -f $(MDWN_DOCS)
-	-mh_clean
+override_dh_installchangelogs:
+	dh_installchangelogs -- changes.html
 
 get-orig-source:
 	uscan --download-current-version --force-download --repack --rename --compression xz

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