use dh $@ style rules

diff --git a/debian/changelog b/debian/changelog
index 5a33227d1c57b634c98e903b0eaeca40d2c24416..79d823c86f0a25ce5a642e8b281346a9b77c3540 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-scowl (7.1-2) UNRELEASED; urgency=low
+scowl (2017.01.22-1) experimental; urgency=low
 
   * Include the proper variant spelling into the proper language (Closes:
     #659841). Thanks to Drew Parsons.
   * Sort using LC_ALL=C to make builds reproducible. (Closes: #791851).
     Thanks to Reiner Herrmann.
 
- -- Don Armstrong <don@debian.org>  Wed, 12 Oct 2011 15:04:24 -0700
+ -- Don Armstrong <don@debian.org>  Thu, 06 Apr 2017 07:40:25 -0700
 
 scowl (7.1-1) unstable; urgency=low
 

diff --git a/debian/compat b/debian/compat
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9

diff --git a/debian/control b/debian/control
index b0f0755e15f442dde4e0d501b694f0f0da4f1b02..96559d4613205835d7513eb27fb77afe40c44240 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Don Armstrong <don@debian.org>
 Section: text
 Priority: standard
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper
 Build-Depends-Indep: dictionaries-common-dev
 Homepage: http://wordlist.sourceforge.net/
 

diff --git a/debian/rules b/debian/rules
index 8af85bfeb1a22a24d6526058746cf33c82739e7c..1fbde88bcbf70f8c3e58a5aad6888d615b81cb10 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,6 @@ SIZE_EXTENSIONS:=$(SIZE_EXTENSIONS_small) 40 50
 SIZE_EXTENSIONS_large:=$(SIZE_EXTENSIONS) 55 60 70
 SIZE_EXTENSIONS_huge:=$(SIZE_EXTENSIONS_large) 80
 SIZE_EXTENSIONS_insane:=$(SIZE_EXTENSIONS_huge) 95
-#SIZE_EXTENSIONS-huge:=10 20 35 40 50 55 60 70 80 95
 export SIZE_EXTENSIONS_small
 export SIZE_EXTENSIONS
 export SIZE_EXTENSIONS_large
@@ -36,10 +35,10 @@ SPELLINGS:= american british canadian
 CLASSES:=words proper-names upper contractions
 VARIANTS:=0 1
 
-build: build-stamp
-build-stamp:
-       dh_testdir
+%:
+       dh $@
 
+build:
        set -e;\
        for SPELLING in $(SPELLINGS); do\
          for SIZE in $(SIZES); do\
@@ -97,14 +96,8 @@ build-stamp:
          done;\
        done
 
-       touch build-stamp
-
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp
 
+override_dh_auto_clean:
        set -e;\
        for SIZE in $(SIZES); do\
          if [ -n "$$SIZE" ]; then SIZE="-$$SIZE"; fi; \
@@ -113,62 +106,40 @@ clean:
          done;\
        done
 
-       dh_clean
+INSTALL_WORDLISTS=$(patsubst %-"",%,$(foreach spelling,$(SPELLINGS),$(foreach size,$(SIZES),install-w$(spelling)-$(size))))
 
+override_dh_auto_install: install build
 
-install: DH_OPTIONS=
-install: install-scowl $(patsubst %-"",%,$(foreach spelling,$(SPELLINGS),$(foreach size,$(SIZES),install-w$(spelling)-$(size))))
+override_dh_auto_build: 
+
+install: build install-scowl $(INSTALL_WORDLISTS)
        installdeb-wordlist -pwamerican --noscripts
-       dh_installdebconf -pwamerican
        installdeb-wordlist --no-package=wamerican --no-package=scowl
 
-.PHONY: install-scowl
-install-scowl: PKG=scowl
 install-scowl:
-       dh_testdir
-       dh_testroot
-       dh_installdirs --package=$(PKG)
+       dh_installdirs --package=scowl
 
-       dh_install --package=$(PKG) final/*.[0-9][0-9] usr/share/dict/scowl
-       dh_installdocs --package=$(PKG) README debian/README.Debian
+       dh_install --package=scowl final/*.[0-9][0-9] usr/share/dict/scowl
+       dh_installdocs --package=scowl README debian/README.Debian
 
 
-# this is the install-w$(SPELLING)-$(VARIANT) rule
-.PHONY: $(patsubst %-"",%,$(foreach spelling,$(SPELLINGS),$(foreach size,$(SIZES),install-w$(spelling)-$(size))))
-THISPKG=$(patsubst install-%,%,$@)
-WORDLIST=$(shell echo $@|sed -re 's/^install-w([a-z]*)(-*[a-z]*)/\1-english\2/')
-$(patsubst %-"",%,$(foreach spelling,$(SPELLINGS),$(foreach size,$(SIZES),install-w$(spelling)-$(size)))): build-stamp
+
+override_dh_auto_test:
+       echo "doing nothing";
+
+
+WORDLIST=$(shell echo $(*)|sed -re 's/^w([a-z]*)(-*[a-z]*)/\1-english\2/')
+$(INSTALL_WORDLISTS): install-%: install-scowl
        dh_testdir
        dh_testroot
-       dh_installdirs --package=$(THISPKG)
-       dh_install --package=$(THISPKG) $(WORDLIST) usr/share/dict
-       dh_installdocs --package=$(THISPKG) $(THISPKG).scowl-word-lists-used debian/README.Debian
+       dh_installdirs --package=$(*) usr/share/dict
+       dh_install --package=$(*) $(shell echo $(*)|sed -re     \
+'s/^w([a-z]*)(-*[a-z]*)/\1-english\2/') usr/share/dict
+       dh_installdocs --package=$(*) $(*).scowl-word-lists-used debian/README.Debian
        sed "s/WORDLIST/$(WORDLIST)/g" < debian/wordlist_manpage_template > $(WORDLIST).5
-       dh_installman --package=$(THISPKG) $(WORDLIST).5
+       dh_installman --package=$(*) $(WORDLIST).5
+
+
+# this is the install-w$(SPELLING)-$(VARIANT) rule
+.PHONY: $(foreach spelling,$(SPELLINGS),$(foreach size,$(SIZES),install-w$(spelling)-$(size)))
 
-# This single target is used to build all the packages, all at once, or
-# one at a time. So keep in mind: any options passed to commands here will
-# affect _all_ packages. Anything you want to only affect one package
-# should be put in another target, such as the install target.
-binary-common:
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs
-       dh_link
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-# Build architecture independant packages using the common target.
-binary-indep: build install
-        $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary-common binary install