Convert debian/rules to dh style

diff --git a/debian/changelog b/debian/changelog
index 084b5f2b0d858165e55050dd0fed4c79fd850a65..eecedd82a5d17857f455b82acbcc0e37127435c2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ t-prot (3.4-4) UNRELEASED; urgency=medium
 
   [ Rhonda D'Vine ]
   * switch my name
+  * Convert debian/rules to dh style.
 
   [ Axel Beckert ]
   * Switch background color in Muttrc from black to default

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9

diff --git a/debian/control b/debian/control
index 67d7153d1c4cbd1ddae16b94fe9e57996bcae72b..df3f58213fda4880c24f0389a649f343d40ef26b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: mail
 Priority: optional
 Maintainer: Rhonda D'Vine <rhonda@debian.org>
 Uploaders: Axel Beckert <abe@debian.org>
-Build-Depends-Indep: dpkg-dev (>= 1.17.0~),
+Build-Depends-Indep: debhelper (>= 9~),
+                     dpkg-dev (>= 1.17.0~),
                      po-debconf,
                      quilt (>= 0.40-1~)
 Standards-Version: 3.9.6

diff --git a/debian/dirs b/debian/dirs
new file mode 100644 (file)
index 0000000..55ee72b
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+etc/t-prot/ads

diff --git a/debian/docs b/debian/docs
new file mode 100644 (file)
index 0000000..2bb19c3
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+TODO
+README

diff --git a/debian/install b/debian/install
new file mode 100644 (file)
index 0000000..77ffcc5
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,7 @@
+t-prot usr/bin
+t-prot.1 usr/share/man/man1
+debian/Muttrc etc/t-prot
+debian/footers/* etc/t-prot/footers
+contrib/t-prot.sl usr/share/slrn/macros
+contrib/filter_innd.pl usr/share/doc/t-prot/examples
+contrib/README.examples usr/share/doc/t-prot/examples

diff --git a/debian/rules b/debian/rules
index ed79cf847f29bd62dacabf159234278bd26d7282..f4257007c89beca7a0ae3646bc46b4f79b816802 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,99 +1,8 @@
 #!/usr/bin/make -f
-# debian/rules for t-prot package
-# Copyright 2002-2012 by Rhonda D'Vine <rhonda@debian.org>
-# Licenced under WTFPLv2
+#DH_VERBOSE = 1
 
-PKG = t-prot
-TMP = $(CURDIR)/debian/$(PKG)
-BUILD_DATE = $(shell dpkg-parsechangelog --show-field Date)
 
-INSTALL = install
-INSTALL_FILE    = $(INSTALL) -p    -oroot -groot -m644
-INSTALL_PROGRAM = $(INSTALL) -p    -oroot -groot -m755
-INSTALL_SCRIPT  = $(INSTALL) -p    -oroot -groot -m755
-INSTALL_DIR     = $(INSTALL) -p -d -oroot -groot -m755
-
-
-clean:
-       $(checkdir)
-       $(checkroot)
-       -rm -rf $(TMP) debian/files debian/stamp-*
-       $(MAKE) -f /usr/share/quilt/quilt.make unpatch
-
-build: build-arch build-indep
-build-arch: debian/stamp-build
-build-indep: debian/stamp-build
-debian/stamp-build:
-       # only thing to do is apply the patches ...
-       $(MAKE) -f /usr/share/quilt/quilt.make patch
-       touch debian/stamp-build
-
-
-install: debian/stamp-install
-debian/stamp-install: build
-       $(checkdir)
-       $(checkroot)
-       -rm -rf $(TMP)
-       $(INSTALL_DIR) $(TMP)
-       cd $(TMP) && $(INSTALL_DIR) etc/t-prot/footers etc/t-prot/ads \
-               usr/bin usr/share/man/man1 usr/share/slrn/macros \
-               usr/share/doc/$(PKG)/examples
-       #       usr/share/doc/$(PKG)/contrib
-       $(INSTALL_SCRIPT) t-prot   $(TMP)/usr/bin
-       $(INSTALL_FILE)   t-prot.1 $(TMP)/usr/share/man/man1
-       $(INSTALL_FILE) debian/Muttrc     $(TMP)/etc/t-prot
-       $(INSTALL_FILE) debian/footers/*  $(TMP)/etc/t-prot/footers
-       $(INSTALL_FILE) contrib/t-prot.sl $(TMP)/usr/share/slrn/macros
-
-       $(INSTALL_FILE) TODO README $(TMP)/usr/share/doc/$(PKG)
-       $(INSTALL_FILE) contrib/filter_innd.pl contrib/README.examples \
-               $(TMP)/usr/share/doc/$(PKG)/examples
-       $(INSTALL_FILE) ChangeLog \
-               $(TMP)/usr/share/doc/$(PKG)/changelog
-       cd $(TMP)/usr/share && gzip -n9 doc/$(PKG)/changelog \
-               man/man1/t-prot.1
-
-
-binary-indep: install
-       $(checkdir)
-       $(checkroot)
-       $(INSTALL_DIR) $(TMP)/DEBIAN
-       $(INSTALL_FILE) debian/copyright debian/README.Debian \
-               $(TMP)/usr/share/doc/$(PKG)
-       $(INSTALL_FILE) debian/changelog \
-               $(TMP)/usr/share/doc/$(PKG)/changelog.Debian
-       cd $(TMP)/usr/share/doc/$(PKG) && gzip -n9 \
-               changelog.Debian
-       $(INSTALL_SCRIPT) debian/postinst debian/postrm debian/config \
-               $(TMP)/DEBIAN
-       po2debconf debian/templates > $(TMP)/DEBIAN/templates
-       $(INSTALL_FILE) debian/conffiles \
-               $(TMP)/DEBIAN
-       dpkg-gencontrol -ldebian/changelog -isp -p$(PKG) -P$(TMP)
-       cd $(TMP) && find * -type f ! -regex '^DEBIAN/.*' -print0 | \
-               xargs -r0 md5sum > DEBIAN/md5sums
-       # Make build reproducible:
-       # Hardcode permissions for files created by output redirection
-       chmod 644 $(TMP)/DEBIAN/md5sums $(TMP)/DEBIAN/templates
-       # Set timestamp of all files to timestamp in debian/changelog entry
-       find $(TMP) -depth -newermt '$(BUILD_DATE)' -print0 | \
-               xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
-       dpkg --build $(TMP) ..
-
-
-binary-arch:
-       # We have nothing to do here.
-
-
-binary: binary-indep
-
-
-define checkdir
-       test -f debian/rules
-endef
-
-define checkroot
-       test root = "`whoami`"
-endef
-
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+       dh $@
+       # not sure about override for po2debconf needed
+       # po2debconf debian/templates > $(TMP)/DEBIAN/templates