[sacjava] 06/09: Build with the DH sequencer

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository sacjava.

commit 349d4e9ff7e27d6923d5a1883b9e705b7ad1a7c7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jun 19 10:47:41 2017 +0200

    Build with the DH sequencer
---
 debian/changelog        |  1 +
 debian/clean            |  4 +++
 debian/control          |  1 -
 debian/libsac-java.poms |  1 +
 debian/rules            | 74 ++++++-------------------------------------------
 5 files changed, 14 insertions(+), 67 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b1c886f..d00de0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ sacjava (1.3+dfsg-3) UNRELEASED; urgency=medium
 
   * Team upload.
   * Removed the GCJ package
+  * Build with the DH sequencer
   * Standards-Version updated to 3.9.8
   * Switch to debhelper level 10
   * Use a secure Vcs-Git URL
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..8d08c9c
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,4 @@
+org/w3c/css/sac/*.class
+org/w3c/css/sac/helpers/*.class
+doc/
+sac*.jar
diff --git a/debian/control b/debian/control
index 587a333..de1a22a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Build-Depends:
  bnd (>= 2.1.0),
  debhelper (>= 10),
  default-jdk,
- dpkg-dev (>= 1.16.2),
  maven-repo-helper
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/sacjava.git
diff --git a/debian/libsac-java.poms b/debian/libsac-java.poms
new file mode 100644
index 0000000..6d568bd
--- /dev/null
+++ b/debian/libsac-java.poms
@@ -0,0 +1 @@
+debian/pom.xml --has-package-version --java-lib --artifact=sac-1.3.jar
diff --git a/debian/rules b/debian/rules
index aff6ecf..29987d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,75 +1,17 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+JAVA_HOME=/usr/lib/jvm/default-java
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
+%:
+	dh $@ --with maven-repo-helper
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp build-indep-stamp
-
-build-indep-stamp: configure-stamp
-	if [ ! -d doc ]; then mkdir doc; fi
-	/usr/lib/jvm/default-java/bin/javadoc -source 1.5 -d doc `find org -name "*.java" | xargs`
-
-	touch $@
-
-build-stamp: configure-stamp 
-	dh_testdir
-
-	/usr/lib/jvm/default-java/bin/javac -source 1.5 -target 1.5 `find org -name "*.java" | xargs`
-	/usr/lib/jvm/default-java/bin/jar cvf sac-1.3.jar `find org -name "*.class" | xargs`
+override_dh_auto_build:
+	$(JAVA_HOME)/bin/javac -source 1.5 -target 1.5 `find org -name "*.java" | xargs`
+	$(JAVA_HOME)/bin/jar cvf sac-1.3.jar `find org -name "*.class" | xargs`
 	bnd wrap --properties debian/sac.bnd --output sac-1.3.jar.tmp sac-1.3.jar
 	mv sac-1.3.jar.tmp sac-1.3.jar
 
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp build-indep-stamp configure-stamp
-
-	rm -f sac.jar sac-1.3.jar
-	-find org -name "*.class" | xargs rm
-	# remove this; will be rebuilt
-	rm -rf doc
+	$(JAVA_HOME)/bin/javadoc -source 1.5 -d doc `find org -name "*.java" | xargs`
 
-	mh_clean
-	dh_clean 
-
-install: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	mh_installpom -plibsac-java debian/pom.xml
-	mh_installjar -plibsac-java -l debian/pom.xml sac-1.3.jar
-
-binary-indep: build-indep install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_link -i
-	dh_compress -i 
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary: binary-indep binary-arch
-
-VERSION=$(shell dpkg-parsechangelog -S Version | tr '+' '-' | cut -d- -f1)
 get-orig-source:
-	uscan --force-download --download-version $(VERSION) \
-		--rename --destdir=$(CURDIR) \
-		--repack --compression xz \
-		--verbose
-
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install configure get-orig-source
+	uscan --force-download --download-current-version --rename --repack --compression xz --verbose

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