[hamradio-commits] [wwl] 06/11: Switch to streamlined dh

[Iain Learmonth]

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

irl-guest pushed a commit to branch master
in repository wwl.

commit 81a246dc6b20089eb3b0bc2303f933aef69a6f83
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Mon Aug 10 22:43:18 2015 +0100

    Switch to streamlined dh
---
 debian/changelog    |  4 ++++
 debian/rules        | 41 +++--------------------------------------
 debian/wwl.dirs     |  3 ---
 debian/wwl.docs     |  1 +
 debian/wwl.install  |  1 +
 debian/wwl.manpages |  1 +
 6 files changed, 10 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 64d39ae..5d322ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,10 @@ wwl (1.3+db-2) UNRELEASED; urgency=medium
       * Patrick Ouellette (never uploaded)
       * Hamish Moffatt (by request)
     - Added myself to uploaders
+  * debian/rules:
+    - Switched to streamlined dh format
+  * Created debian/wwl.{docs,install,manpages}
+  * Removed redundant debian/wwl.dirs
   * debian/patches/remove-locator.patch:
     - Import the old changes into a quilt patch
     - Update the patch to print version 1.3 instead of version 1.0
diff --git a/debian/rules b/debian/rules
index 20e6b39..bbf24a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,42 +1,7 @@
 #!/usr/bin/make -f
 
-build:
-	dh_testdir
-	$(MAKE)
-	touch build
+%:
+	dh $@
 
-clean:
-	dh_testdir
-	-rm -f build
-	$(MAKE) clean
-	-rm -f `find . -name "*~"`
-	dh_clean
-
-binary-indep:	build
-# nothing else to do
-
-binary-arch:	build
-	dh_clean
-	dh_installdirs
-
-	install wwl `pwd`/debian/wwl/usr/bin
-
-	dh_installdocs
-	dh_installman wwl.1
-	dh_installchangelogs
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_makeshlibs
-	dh_md5sums
-	dh_builddeb
-
-binary:		binary-indep binary-arch
-
-checkroot:
-	dh_testdir
-	dh_testroot
+override_dh_auto_install: ; # handled with a debian/wwl.install
 
diff --git a/debian/wwl.dirs b/debian/wwl.dirs
deleted file mode 100644
index 9046445..0000000
--- a/debian/wwl.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/man/man1
-usr/share/doc/wwl
diff --git a/debian/wwl.docs b/debian/wwl.docs
new file mode 100644
index 0000000..fbc4f92
--- /dev/null
+++ b/debian/wwl.docs
@@ -0,0 +1 @@
+INSTALL
diff --git a/debian/wwl.install b/debian/wwl.install
new file mode 100644
index 0000000..1d72e79
--- /dev/null
+++ b/debian/wwl.install
@@ -0,0 +1 @@
+wwl	usr/bin
diff --git a/debian/wwl.manpages b/debian/wwl.manpages
new file mode 100644
index 0000000..bae8f55
--- /dev/null
+++ b/debian/wwl.manpages
@@ -0,0 +1 @@
+wwl.1

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