[javacc] 01/07: 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 javacc.

commit b14b3e7d537565de4cc87ef0b552e4b3286ea344
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Nov 18 12:52:55 2016 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/changelog          |  6 ++++++
 debian/clean              |  1 +
 debian/control            |  1 -
 debian/javacc-doc.install |  2 ++
 debian/javacc.install     |  3 +++
 debian/javacc.links       |  2 ++
 debian/javacc.poms        |  1 +
 debian/manpages           |  1 +
 debian/rules              | 34 +++++++---------------------------
 9 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 890c7d9..0df9e53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+javacc (5.0-7) UNRELEASED; urgency=medium
+
+  * Build with the DH sequencer instead of CDBS
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 18 Nov 2016 12:37:15 +0100
+
 javacc (5.0-6) unstable; urgency=medium
 
   * Require Java 5 or higher at runtime
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..53585a9
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+bin/javacc.1
diff --git a/debian/control b/debian/control
index 1cc2f53..23dde6f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: Emmanuel Bourg <ebourg at apache.org>
 Build-Depends:
  ant,
  ant-optional,
- cdbs (>= 0.4.5.3),
  debhelper (>= 10),
  default-jdk,
  docbook-to-man,
diff --git a/debian/javacc-doc.install b/debian/javacc-doc.install
new file mode 100644
index 0000000..21bd6a5
--- /dev/null
+++ b/debian/javacc-doc.install
@@ -0,0 +1,2 @@
+www/doc      usr/share/doc/javacc
+examples     usr/share/doc/javacc
diff --git a/debian/javacc.install b/debian/javacc.install
new file mode 100644
index 0000000..b5b8da7
--- /dev/null
+++ b/debian/javacc.install
@@ -0,0 +1,3 @@
+bin/javacc      /usr/bin
+bin/jjdoc       /usr/bin
+bin/jjtree      /usr/bin
diff --git a/debian/javacc.links b/debian/javacc.links
new file mode 100644
index 0000000..64b3002
--- /dev/null
+++ b/debian/javacc.links
@@ -0,0 +1,2 @@
+usr/share/man/man1/javacc.1   usr/share/man/man1/jjtree.1
+usr/share/man/man1/javacc.1   usr/share/man/man1/jjdoc.1
diff --git a/debian/javacc.poms b/debian/javacc.poms
new file mode 100644
index 0000000..9b0289e
--- /dev/null
+++ b/debian/javacc.poms
@@ -0,0 +1 @@
+pom.xml --java-lib -e5.0 --artifact=bin/lib/javacc.jar
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..53585a9
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+bin/javacc.1
diff --git a/debian/rules b/debian/rules
index 5ec9563..1b0da16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,36 +1,16 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
 
-PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
+%:
+	dh $@ --with maven-repo-helper
 
-JAVA_HOME            := /usr/lib/jvm/default-java
-
-DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar $(ANT_HOME)/lib/ant-junit.jar junit
-DEB_ANT_BUILD_TARGET := jar
-DEB_ANT_CLEAN_TARGET := realclean
-DEB_ANT_CHECK_TARGET := unittest
-DEB_ANT_BUILDFILE    := build.xml
-DEB_ANT_ARGS         := -Dversion=$(DEB_UPSTREAM_VERSION)
-
-clean::
-	mh_clean
-	rm -f bin/javacc.1
-
-binary-post-install/$(PACKAGE)::
-	mh_installpom -p$(PACKAGE) -e$(DEB_UPSTREAM_VERSION) pom.xml
-	mh_installjar -p$(PACKAGE) -e$(DEB_UPSTREAM_VERSION) -l pom.xml \
-	  bin/lib/$(PACKAGE).jar
+override_dh_auto_build:
+	dh_auto_build -- jar -Dversion=$(VERSION)
 	docbook-to-man debian/manpage.sgml >bin/javacc.1
-	dh_installman bin/javacc.1
-	dh_install bin/javacc bin/jjdoc bin/jjtree usr/bin
-	dh_link usr/share/man/man1/javacc.1 usr/share/man/man1/jjtree.1
-	dh_link usr/share/man/man1/javacc.1 usr/share/man/man1/jjdoc.1
 
-binary-post-install/$(PACKAGE)-doc::
-	dh_install -p$(PACKAGE)-doc www/doc usr/share/doc/javacc
-	dh_install -p$(PACKAGE)-doc examples usr/share/doc/javacc
+override_dh_auto_test:
+	dh_auto_build -- unittest
 
 get-orig-source:
 	uscan --force-download --rename --repack

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