[squareness] 10/12: 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 squareness.

commit 0dab7cf89fced29ab93e67be33fa817d4adf0162
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Mar 7 11:55:43 2018 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/changelog        |  1 +
 debian/control          |  4 ++--
 debian/rules            | 13 +++----------
 debian/squareness.jlibs |  1 +
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 528eaff..0d6a6d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ squareness (2.3.0-7) UNRELEASED; urgency=medium
 
   * Team upload.
   * Moved the package to Git
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 4.1.3
   * Switch to debhelper level 11
 
diff --git a/debian/control b/debian/control
index c2def5d..730938d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,9 @@ Uploaders:
  Varun Hiremath <varun at debian.org>
 Build-Depends:
  ant,
- cdbs,
  debhelper (>= 11),
- default-jdk
+ default-jdk,
+ javahelper
 Standards-Version: 4.1.3
 Homepage: http://squareness.beeger.net/
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/squareness.git
diff --git a/debian/rules b/debian/rules
index 6274e58..bbdf3e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-JAVA_HOME		:= /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET	:= build
-
-install/squareness::
-	install -m 644 -D squareness.jar $(DEB_DESTDIR)/usr/share/java/squareness-$(DEB_UPSTREAM_VERSION).jar
-	dh_link /usr/share/java/squareness-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/squareness.jar
+%:
+	dh $@ --with javahelper
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	uscan --download-current-version --force-download --rename
diff --git a/debian/squareness.jlibs b/debian/squareness.jlibs
new file mode 100644
index 0000000..f5293b4
--- /dev/null
+++ b/debian/squareness.jlibs
@@ -0,0 +1 @@
+squareness.jar

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