[jspwiki] 01/02: Use 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 jspwiki.

commit 1c8f63f897801aaefa5d14c38a738d20de7d01ed
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 27 13:03:12 2015 +0100

    Use the dh sequencer
---
 debian/changelog |  1 +
 debian/rules     | 61 +++++++++++---------------------------------------------
 2 files changed, 13 insertions(+), 49 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 43343c8..848d4a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ jspwiki (2.8.0-6) UNRELEASED; urgency=medium
   * debian/rules:
     - Use dh_install to install the files in /etc/jspwiki
     - Removed the unused patch targets
+    - Use the dh sequencer
   * Added debian/orig-tar.sh to build the upstream tarball
   * Moved the package to Git
 
diff --git a/debian/rules b/debian/rules
index 3101d66..fbd705d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,46 +2,16 @@
 
 export JAVA_HOME=/usr/lib/jvm/default-java
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
-	dh_testdir
-#	mv lib lib.orig
-#	mkdir lib
-#	mv src/com/ecyrd/jspwiki/rpc/atom lib.orig/atom
-#	mv src/com/ecyrd/jspwiki/xmlrpc lib.orig/xmlrpc
-#	mv src/com/ecyrd/jspwiki/filters/PingWeblogsComFilter.java lib.orig/PingWeblogsComFilter.java
-	ant opened-war
-#	mv lib.orig/atom src/com/ecyrd/jspwiki/rpc/atom
-#	mv lib.orig/xmlrpc src/com/ecyrd/jspwiki/xmlrpc
-#	mv lib.orig/PingWeblogsComFilter.java src/com/ecyrd/jspwiki/filters/PingWeblogsComFilter.java
-#	rmdir lib
-#	mv lib.orig lib
-
-binary:	binary-arch binary-indep
-
-binary-arch:
-
-binary-indep:	build
-
-clean:
-	dh_testdir
-	dh_testroot
-	dh_clean
-	JAVA_HOME=/usr/lib/jvm/default-java ant clean
+%:
+	dh $@
 
-get-orig-source:
-	uscan --download-version 2.8.0 --rename
+override_dh_auto_build:
+	dh_auto_build
+	ant opened-war
 
-install:	build
-	dh_testdir
-	dh_testroot
-	dh_prep
+override_dh_auto_install:
+	dh_auto_install
 
-binary-indep:	build install
-	dh_testdir
-	dh_testroot
 	dh_installdirs -p jspwiki etc/jspwiki etc/tomcat8/policy.d var/lib/jspwiki var/lib/tomcat8/webapps usr/share/doc/jspwiki/examples usr/share
 	dh_install -p jspwiki
 	cp -r build/JSPWiki debian/jspwiki/usr/share/jspwiki
@@ -53,16 +23,9 @@ binary-indep:	build install
 	dh_installchangelogs ChangeLog
 	(cd src ; mv wikipages/en default ; tar --exclude .cvsignore --create --gzip --file ../debian/jspwiki/usr/share/doc/jspwiki/examples/wikipages.tar.gz default ; mv default wikipages/en )
 
-	dh_link 
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_installdebconf
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-arch:	build install
+override_dh_auto_clean:
+	dh_auto_clean
+	JAVA_HOME=/usr/lib/jvm/default-java ant clean
 
-binary:	binary-indep binary-arch
-.PHONY:	build clean binary-indep binary-arch binary install
+get-orig-source:
+	uscan --download-current-version --rename --force-download

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