28 files changed, 175 insertions, 228 deletions

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 000000000..eaf5ee789
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,6 @@
+stamp-configure
+stamp-configure-static
+config.cache
+config.status
+config.status.lineno
+Doc/zsh.idx
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000000000..7f8f011eb
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/conffiles b/debian/conffiles
deleted file mode 100644
index dbe1840a2..000000000
--- a/debian/conffiles
+++ /dev/null
@@ -1,6 +0,0 @@
-/etc/zsh/zlogin
-/etc/zsh/zlogout
-/etc/zsh/zprofile
-/etc/zsh/zshenv
-/etc/zsh/zshrc
-/etc/zsh/newuser.zshrc.recommended
diff --git a/debian/control b/debian/control
index 8dfaf20a6..bc2631bce 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: zsh
 Section: shells
 Priority: optional
 Build-Depends: bsdmainutils,
+               debhelper (>= 7~),
                ghostscript,
                groff,
                groff-base,
@@ -25,7 +26,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/zsh.git
 
 Package: zsh
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: ${shlibs:Recommends}
 Suggests: zsh-doc
 Description: shell with lots of features
@@ -40,7 +41,7 @@ Description: shell with lots of features
 Package: zsh-doc
 Architecture: all
 Section: doc
-Depends: dpkg (>= 1.15.4) | install-info
+Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends}
 Description: zsh documentation - info/HTML format
  Zsh is a UNIX command interpreter (shell) usable as an
  interactive login shell and as a shell script command
@@ -54,7 +55,7 @@ Description: zsh documentation - info/HTML format
 
 Package: zsh-static
 Architecture: any
-Depends: zsh, ${shlibs:Depends}
+Depends: zsh, ${shlibs:Depends}, ${misc:Depends}
 Suggests: zsh-doc
 Description: shell with lots of features (static link)
  Zsh is a UNIX command interpreter (shell) usable as an
@@ -69,6 +70,7 @@ Description: shell with lots of features (static link)
 
 Package: zsh-dev
 Architecture: any
+Depends: ${misc:Depends}
 Section: libdevel
 Description: shell with lots of features (development files)
  Zsh is a UNIX command interpreter (shell) usable as an
@@ -86,7 +88,7 @@ Package: zsh-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: zsh (= ${binary:Version})
+Depends: zsh (= ${binary:Version}), ${misc:Depends}
 Description: shell with lots of features (debugging symbols)
  Zsh is a UNIX command interpreter (shell) usable as an
  interactive login shell and as a shell script command
diff --git a/debian/examples/compctl.dpkg b/debian/examples/old/compctl.dpkg
index d8c142e28..d8c142e28 100644
--- a/debian/examples/compctl.dpkg
+++ b/debian/examples/old/compctl.dpkg
diff --git a/debian/examples/jhm.zshrc b/debian/examples/old/jhm.zshrc
index 86dacc7eb..86dacc7eb 100644
--- a/debian/examples/jhm.zshrc
+++ b/debian/examples/old/jhm.zshrc
diff --git a/debian/rules b/debian/rules
index 5eb585b87..d1498c8f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,6 @@
 #!/usr/bin/make -f
 INSTALL = install
-INSTALL_FILE    = $(INSTALL) -p    -o root -g root  -m  644
 INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
-INSTALL_SCRIPT  = $(INSTALL) -p    -o root -g root  -m  755
-INSTALL_DIR     = $(INSTALL) -p -d -o root -g root  -m  755
 
 package=zsh
 ifeq (zsh-beta,$(package))
@@ -51,14 +48,8 @@ else
 CFLAGS += -O2
 endif
 
-ifeq (zsh-beta,$(package))
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-INSTALL_PROGRAM += -s
-endif
-endif
-
 build: stamp-configure
-	$(checkdir)
+	dh_testdir
 ifeq (zsh-beta,$(package))
 	touch stamp-h.in
 endif
@@ -74,7 +65,7 @@ endif
 	touch build
 
 build-static: stamp-configure-static
-	$(checkdir)
+	dh_testdir
 	cd obj-static && $(MAKE)
 
 	touch build-static
@@ -83,7 +74,7 @@ build-debug: DEB_BUILD_OPTIONS+=debug
 build-debug: build
 
 stamp-configure:
-	$(checkdir)
+	dh_testdir
 	touch stamp-h.in configure
 	chmod 755 configure
 	mkdir -p obj/testhome
@@ -95,7 +86,7 @@ endif
 	touch stamp-configure
 
 stamp-configure-static:
-	$(checkdir)
+	dh_testdir
 	mkdir obj-static
 	cd obj-static && CFLAGS='$(CFLAGS)' ../configure $(CONFIGFLAGS) $(STATICFLAGS)
 #	cp debian/static.conf obj-static/Src/mymods.conf
@@ -103,7 +94,7 @@ stamp-configure-static:
 	touch stamp-configure-static
 
 clean:
-	$(checkdir)
+	dh_testdir
 ifeq (zsh-beta,$(package))
 	test ! -f Config/version.mk.orig || mv Config/version.mk.orig Config/version.mk
 endif
@@ -111,47 +102,30 @@ endif
 	if test -d obj && cd obj && test -f Makefile; then $(MAKE) distclean; fi
 	if test -d obj-static && cd obj-static && test -f Makefile; then $(MAKE) distclean; fi
 ifneq (zsh-beta,$(package))
-	test ! -f Makefile || $(MAKE) distclean
+	dh_auto_clean
 endif
-	-rm -f `find . -name "*~"` \
-	        debian/files* core debian/*ubstvars \
-	        stamp-configure stamp-configure-static \
-		config.cache config.status config.status.lineno \
-		Doc/zsh.idx config.h.in~
-	-rm -rf debian/tmp debian/tmp-doc debian/tmp-static debian/tmp-dbg \
-	        debian/tmp-dev config.cache obj obj-static \
-		autom4te.cache
+	dh_clean
+	-rm -rf config.cache obj obj-static autom4te.cache
 
 binary-indep:	checkroot build
-	$(checkdir)
-	-rm -rf debian/tmp-doc
-	$(INSTALL_DIR) debian/tmp-doc
-	cd debian/tmp-doc && $(INSTALL_DIR) usr/share/doc-base \
-		usr/share/info \
-		usr/share/doc/$(package)-doc/html \
-		DEBIAN
-
-	-cd obj && $(MAKE) install.info DESTDIR=$(CURDIR)/debian/tmp-doc
-	rm -f debian/tmp-doc/usr/share/info/dir*
-	gzip -9frq debian/tmp-doc/usr/share/info/*
-	cd obj && $(MAKE) install.html DESTDIR=$(CURDIR)/debian/tmp-doc htmldir=/usr/share/doc/$(package)-doc/html
-# Work around texi2html unfriendliness
-	sed -i -e 's/<BODY.*>/<BODY LANG="EN">/' debian/tmp-doc/usr/share/doc/$(package)-doc/html/*.html
+	dh_testdir
+	dh_installdirs -p$(package)-doc
 
-ifeq (zsh,$(package))
-	$(INSTALL_FILE) obj/Doc/zsh.pdf debian/tmp-doc/usr/share/doc/$(package)-doc/
-endif
-
-	$(INSTALL_FILE) debian/copyright debian/tmp-doc/usr/share/doc/$(package)-doc/copyright
-	$(INSTALL_FILE) debian/changelog debian/tmp-doc/usr/share/doc/$(package)-doc/changelog.Debian
-	gzip -9frq debian/tmp-doc/usr/share/doc/$(package)-doc/changelog.Debian
-	$(INSTALL_FILE) debian/$(package).doc-base debian/tmp-doc/usr/share/doc-base/$(package)
-	cd debian/tmp-doc && find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums
+	-cd obj && $(MAKE) install.info DESTDIR=$(CURDIR)/debian/zsh-doc
+	rm -f debian/zsh-doc/usr/share/info/dir*
+	gzip -9frq debian/zsh-doc/usr/share/info/*
+	cd obj && $(MAKE) install.html DESTDIR=$(CURDIR)/debian/zsh-doc htmldir=/usr/share/doc/$(package)-doc/html
+# Work around texi2html unfriendliness
+	sed -i -e 's/<BODY.*>/<BODY LANG="EN">/' debian/zsh-doc/usr/share/doc/$(package)-doc/html/*.html
 
-	dpkg-gencontrol -isp -p$(package)-doc -Pdebian/tmp-doc
-	chown -R root.root debian/tmp-doc
-	chmod -R go=rX debian/tmp-doc
-	dpkg --build debian/tmp-doc ..
+	dh_installdocs -p$(package)-doc
+	dh_installchangelogs -p$(package)-doc
+	dh_compress -p$(package)-doc -Xpdf
+	dh_fixperms -p$(package)-doc
+	dh_installdeb -p$(package)-doc
+	dh_md5sums -p$(package)-doc
+	dh_gencontrol -p$(package)-doc
+	dh_builddeb -p$(package)-doc
 
 ifneq (zsh-beta,$(package))
 binary-arch: binary-arch-dynamic binary-arch-static binary-arch-dev
@@ -159,206 +133,107 @@ else
 binary-arch: binary-arch-dynamic
 endif
 binary-arch-dynamic:	checkroot build
-	$(checkdir)
-
-	-rm -rf debian/tmp debian/tmp-dbg
-	$(INSTALL_DIR) debian/tmp debian/tmp-dbg/usr/lib/debug/bin debian/tmp-dbg/DEBIAN
-	cd debian/tmp && $(INSTALL_DIR) etc/$(package) \
-		bin \
-		usr/lib/$(package) \
-		usr/share/menu \
-		usr/share/man \
-		usr/share/$(package)/help \
-		usr/share/doc/$(package)/examples/Functions \
-		usr/share/doc/$(package)/examples/Misc \
-		usr/share/doc/$(package)/examples/old \
-		DEBIAN
-
-	cd obj && $(MAKE) install.man DESTDIR=$(CURDIR)/debian/tmp
+	dh_testdir
+
+	dh_installdirs -p$(package) -p$(package)-dbg
+
+	cd obj && $(MAKE) install.man DESTDIR=$(CURDIR)/debian/zsh
 	nroff -mandoc -Tascii Doc/zshbuiltins.1 | colcrt - | \
-	sed -e 's/±/{+|-}/' | ( cd debian/tmp/usr/share/$(package)/help && \
+	sed -e 's/±/{+|-}/' | ( cd debian/zsh/usr/share/$(package)/help && \
 	perl $(CURDIR)/Util/helpfiles )
 
 ifeq (zsh-beta,$(package))
 	sed -r -i -e \
 	's/zsh(all|builtins|compctl|compsys|compwid|contrib|expn|misc|modules|options|param|roadmap|tcpsys|zftpsys|zle|calsys)/$(package)\1/g' \
-	debian/tmp/usr/share/man/man1/*.1
+	debian/zsh/usr/share/man/man1/*.1
 endif
 
 # functions
-	$(INSTALL_FILE) -m 644 Misc/* debian/tmp/usr/share/doc/$(package)/examples/Misc/.
-	$(INSTALL_FILE) -m 644 Functions/Example/* debian/tmp/usr/share/doc/$(package)/examples/Functions/.
+	dh_installexamples -p$(package) -X.distfiles
+	cd  debian/zsh/usr/share/doc/$(package)/examples/; mv Example Functions
 	sed -i -e '1!b;s:^#!.*[ /]zsh:#!/bin/$(package):;s#/usr/local/bin#/usr/bin#' \
-	   debian/tmp/usr/share/doc/$(package)/examples/Misc/*
-	$(INSTALL_FILE) StartupFiles/* debian/tmp/usr/share/doc/$(package)/examples/.
-	$(INSTALL_FILE) Util/reporter debian/tmp/usr/share/doc/$(package)/examples/.
-
-	$(INSTALL_FILE) debian/examples/ssh_completion \
-	                debian/examples/ssh_completion2 \
-	                debian/examples/carstenh.zshrc \
-	                debian/tmp/usr/share/doc/$(package)/examples/.
-ifneq (zsh-beta,$(package))
-	$(INSTALL_FILE) debian/examples/compctl.dpkg debian/examples/jhm.zshrc debian/tmp/usr/share/doc/$(package)/examples/old/.
-endif
+	   debian/zsh/usr/share/doc/$(package)/examples/Misc/*
 
-	cd obj && $(MAKE) install.bin DESTDIR=$(CURDIR)/debian/tmp INSTALL_PROGRAM='$(INSTALL_PROGRAM)'
-	cd obj && $(MAKE) install.modules DESTDIR=$(CURDIR)/debian/tmp INSTALL_PROGRAM='$(INSTALL_PROGRAM)'
-	cd obj && $(MAKE) install.fns DESTDIR=$(CURDIR)/debian/tmp
+	cd obj && $(MAKE) install.bin DESTDIR=$(CURDIR)/debian/$(package) INSTALL_PROGRAM='$(INSTALL_PROGRAM)'
+	cd obj && $(MAKE) install.modules DESTDIR=$(CURDIR)/debian/$(package) INSTALL_PROGRAM='$(INSTALL_PROGRAM)'
+	cd obj && $(MAKE) install.fns DESTDIR=$(CURDIR)/debian/zsh
 
-	rm -r debian/tmp/usr/local
+	rm -r debian/zsh/usr/local
 
 # move this to a non-root section; also drop it for cross-compiles
 	awk '/^#define FPATH_DIR/ { head=$$3; gsub(/"/,"",head); }; /^#define FPATH_SUBDIRS/ { $$1=""; $$2=""; gsub(/[" ]/,""); tail=$$0; } END { printf "%s/%s\n", head, tail; };' obj/Src/zshpaths.h >obj/Src/zshpaths.temp
-	debian/tmp/bin/$(package) -fc 'setopt extendedglob; for i in debian/tmp/'`cat obj/Src/zshpaths.temp`'; do zcompile -U -M $$i.zwc $$i/*~*.zwc(^/) ; chmod 644 $$i.zwc ; done'
+	debian/zsh/bin/$(package) -fc 'setopt extendedglob; for i in debian/zsh/'`cat obj/Src/zshpaths.temp`'; do zcompile -U -M $$i.zwc $$i/*~*.zwc(^/) ; chmod 644 $$i.zwc ; done'
 
 ifneq (zsh-beta,$(package))
-	mv debian/tmp/bin/zsh debian/tmp/bin/zsh5
-	rm debian/tmp/bin/zsh-5.[0-9]*
-	ln -s zsh.1.gz debian/tmp/usr/share/man/man1/zsh5.1.gz
-
-	for i in `find debian/tmp/usr/lib/zsh -type d | sed 's#^debian/tmp/##'`; \
-		do mkdir -p debian/tmp-dbg/usr/lib/debug/"$$i"; done
-
-	objcopy --only-keep-debug debian/tmp/bin/zsh5 \
-	                          debian/tmp-dbg/usr/lib/debug/bin/zsh5.dbg
-	strip --remove-section=.comment --remove-section=.note debian/tmp/bin/zsh5
-	objcopy --add-gnu-debuglink=debian/tmp-dbg/usr/lib/debug/bin/zsh5.dbg debian/tmp/bin/zsh5
-
-	for i in `find debian/tmp/usr/lib/zsh -name "*.so"`; \
-		do objcopy --only-keep-debug $$i debian/tmp-dbg/usr/lib/debug/`echo $$i | sed 's#^debian/tmp/##'`.debug; \
-		   strip --remove-section=.comment --remove-section=.note \
-		         --strip-unneeded $$i; \
-		   objcopy --add-gnu-debuglink=debian/tmp-dbg/usr/lib/debug/`echo $$i | sed 's#^debian/tmp/##'`.debug $$i; \
-		done
-else
-	rm debian/tmp/bin/zsh-beta-*
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	strip --remove-section=.comment --remove-section=.note debian/tmp/bin/zsh-beta
-	strip --remove-section=.comment --remove-section=.note \
-	      --strip-unneeded `find debian/tmp/usr/lib/zsh-beta -name "*.so"`
-endif
-endif
-
-	$(INSTALL_DIR) debian/tmp-dbg/usr/share/doc
-	ln -s zsh debian/tmp-dbg/usr/share/doc/$(package)-dbg
-
-	$(INSTALL_FILE) debian/zlogin debian/zlogout debian/zprofile debian/zshenv debian/zshrc debian/newuser.zshrc.recommended debian/tmp/etc/$(package)/.
-	sed -i -e 's,^local HELPDIR=.*,local HELPDIR=$${HELPDIR:-/usr/share/$(package)/help},;s,:-more,:-/usr/bin/pager,;' debian/tmp/usr/share/$(package)/functions/Misc/run-help
-
-	sed -i -e '1!b;s:^#!.*[ /]zsh:#!/bin/$(package):;s#/usr/local/bin#/usr/bin#;' `find debian/tmp/usr/share/$(package)/functions -type f`
-	chmod 755 debian/tmp/usr/share/$(package)/functions/Misc/checkmail \
-	          debian/tmp/usr/share/$(package)/functions/Misc/harden \
-	          debian/tmp/usr/share/$(package)/functions/Misc/run-help \
-	          debian/tmp/usr/share/$(package)/functions/Misc/zkbd \
-	          debian/tmp/usr/share/$(package)/functions/Misc/zcalc \
+	mv debian/zsh/bin/zsh debian/zsh/bin/zsh5
+	rm debian/zsh/bin/zsh-5.[0-9]*
 
-	$(INSTALL_FILE) Etc/ChangeLog* README META-FAQ Doc/zsh.texi Etc/BUGS Etc/CONTRIBUTORS FEATURES \
-		Etc/FTP-README MACHINES NEWS Etc/TODO Etc/completion-style-guide Etc/zsh-development-guide Functions/README.zftp debian/tmp/usr/share/doc/$(package)/
-	$(INSTALL_FILE) ChangeLog debian/tmp/usr/share/doc/$(package)/changelog
-	chmod -R u+rw,go=rX debian/tmp/usr/share/doc
-	$(INSTALL_FILE) debian/copyright debian/tmp/usr/share/doc/$(package)/copyright
-
-	$(INSTALL_FILE) debian/changelog debian/tmp/usr/share/doc/$(package)/changelog.Debian
-ifeq (zsh-beta,$(package))
-	$(INSTALL_FILE) debian/NEWS debian/tmp/usr/share/doc/$(package)/NEWS.Debian
+	dh_link -p$(package)
+	dh_strip -p$(package) --dbg-package=$(package)-dbg
 endif
 
-	$(INSTALL_FILE) debian/README.Debian debian/tmp/usr/share/doc/$(package)/README.Debian
-
-	$(INSTALL_FILE) debian/menu debian/tmp/usr/share/menu/$(package)
-
-	chmod 644 `find debian/tmp/usr/share/man -type f` `find debian/tmp/usr/share/doc -type f`
-	chmod 644 `find debian/tmp/usr/lib/$(package) -type f -name "*.so"`
-	chmod 644 `find debian/tmp/usr/share/$(package) -type f -name "_*"`
-	gzip -9f `find debian/tmp/usr/share/man -type f` `find debian/tmp/usr/share/doc -type f ! -name "copyright"`
-	dpkg-shlibdeps -Tdebian/substvars -dDepends debian/tmp/bin/* -dRecommends debian/tmp/usr/lib/$(package)/*/zsh/*.so
-	dpkg-gencontrol -ldebian/changelog -isp -p$(package) -Tdebian/substvars -Pdebian/tmp
-ifneq (zsh-beta,$(package))
-	cd debian/tmp-dbg && find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums
-	dpkg-gencontrol -ldebian/changelog -isp -p$(package)-dbg -Tdebian/substvars -Pdebian/tmp-dbg
-endif
+	dh_link -p$(package)-dbg
+	dh_install -p$(package) -p$(package)-dbg
 
-	$(INSTALL_SCRIPT) debian/postinst debian/tmp/DEBIAN/postinst
-	$(INSTALL_SCRIPT) debian/postrm debian/tmp/DEBIAN/postrm
-	$(INSTALL_SCRIPT) debian/prerm debian/tmp/DEBIAN/prerm
-	$(INSTALL_FILE) debian/conffiles debian/tmp/DEBIAN/conffiles
+	sed -i -e 's,^local HELPDIR=.*,local HELPDIR=$${HELPDIR:-/usr/share/$(package)/help},;s,:-more,:-/usr/bin/pager,;' debian/zsh/usr/share/$(package)/functions/Misc/run-help
+	sed -i -e '1!b;s:^#!.*[ /]zsh:#!/bin/$(package):;s#/usr/local/bin#/usr/bin#;' `find debian/zsh/usr/share/$(package)/functions -type f`
+	chmod 755 debian/zsh/usr/share/$(package)/functions/Misc/checkmail \
+	          debian/zsh/usr/share/$(package)/functions/Misc/harden \
+	          debian/zsh/usr/share/$(package)/functions/Misc/run-help \
+	          debian/zsh/usr/share/$(package)/functions/Misc/zkbd \
+	          debian/zsh/usr/share/$(package)/functions/Misc/zcalc \
 
-	cd debian/tmp && find * -type f ! -path "etc/$(package)/zlogin" ! -path "etc/$(package)/zlogout" ! -path "etc/$(package)/zprofile" ! -path "etc/$(package)/zshenv" ! -path "etc/$(package)/zshrc"  ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums
+	dh_installmenu -p$(package)
 
-ifneq (zsh-beta,$(package))
-	chown -R root:root debian/tmp debian/tmp-dbg
-	chmod -R go=rX debian/tmp debian/tmp-dbg
-else
-	chown -R root:root debian/tmp
-	chmod -R go=rX debian/tmp
-endif
-
-	dpkg --build debian/tmp ..
-ifneq (zsh-beta,$(package))
-	dpkg --build debian/tmp-dbg ..
-endif
-
-define checkdir
-	test -f debian/rules
-endef
+	dh_shlibdeps -p$(package) -p$(package)-dbg -- -dDepends debian/zsh/bin/* -dRecommends debian/zsh/usr/lib/$(package)/*/zsh/*.so
+	dh_installdocs -p$(package) -p$(package)-dbg
+	dh_installchangelogs -p$(package) -p$(package)-dbg ChangeLog
+	dh_compress -p$(package) -p$(package)-dbg
+	dh_fixperms -p$(package) -p$(package)-dbg
+	dh_installdeb -p$(package) -p$(package)-dbg
+	dh_md5sums -p$(package) -p$(package)-dbg
+	dh_gencontrol -p$(package) -p$(package)-dbg
+	dh_builddeb -p$(package) -p$(package)-dbg
 
 binary-arch-static:	checkroot build-static
-	$(checkdir)
-
-	-rm -rf debian/tmp-static
-	$(INSTALL_DIR) debian/tmp-static/usr/share/man/man1/
-	cd debian/tmp-static && $(INSTALL_DIR) bin \
-		usr/share/doc/$(package)-static \
-		usr/share/lintian/overrides \
-		DEBIAN
-
-	$(INSTALL_SCRIPT) debian/static.prerm debian/tmp-static/DEBIAN/prerm
-	$(INSTALL_SCRIPT) debian/static.postinst debian/tmp-static/DEBIAN/postinst
-	$(INSTALL_SCRIPT) debian/static.postrm debian/tmp-static/DEBIAN/postrm
+	dh_testdir
 
-	$(INSTALL_FILE) debian/changelog debian/tmp-static/usr/share/doc/$(package)-static/changelog.Debian
-	$(INSTALL_FILE) debian/$(package)-static.lintian-overrides debian/tmp-static/usr/share/lintian/overrides/$(package)-static
+	dh_installdirs -p$(package)-static
+	dh_lintian -p$(package)-static
 
-	awk 'BEGIN { print "The following modules are statically-compiled into the static $(package) binary:\n"; } /link=static/ { printf "%s (%s %s)\n", substr($$1,6), $$4, $$5; }' obj-static/config.modules >debian/tmp-static/usr/share/doc/$(package)-static/README.Debian
+	awk 'BEGIN { print "The following modules are statically-compiled into the static $(package) binary:\n"; } /link=static/ { printf "%s (%s %s)\n", substr($$1,6), $$4, $$5; }' obj-static/config.modules >debian/zsh-static/usr/share/doc/$(package)-static/README.Debian
 
-	$(INSTALL_FILE) debian/copyright debian/tmp-static/usr/share/doc/$(package)-static/copyright
-
-	$(INSTALL_PROGRAM) obj-static/Src/zsh debian/tmp-static/bin/zsh5-static
-	strip --remove-section=.comment --remove-section=.note debian/tmp-static/bin/zsh5-static
-
-	gzip -9f debian/tmp-static/usr/share/doc/$(package)-static/changelog.Debian
-	cd debian/tmp-static && find * -type f  ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums
-	ln -s $(package).1.gz debian/tmp-static/usr/share/man/man1/zsh5-static.1.gz
+	dh_install -p$(package)-static
+	mv debian/$(package)-static/bin/zsh debian/$(package)-static/bin/zsh5-static
 
 ifneq (zsh-beta,$(package))
-	dpkg-shlibdeps -Tdebian/$(package)-static.substvars -dDepends debian/tmp-static/bin/*
+	dh_shlibdeps -p$(package)-static
 endif
-	dpkg-gencontrol -ldebian/changelog -isp -p$(package)-static -Tdebian/$(package)-static.substvars -Pdebian/tmp-static
-	chown -R root.root debian/tmp-static
-	chmod -R go=rX debian/tmp-static
-	dpkg --build debian/tmp-static ..
+
+	dh_strip -p$(package)-static
+	dh_link -p$(package)-static
+	dh_installdocs -p$(package)-static
+	dh_installchangelogs -p$(package)-static
+	dh_compress -p$(package)-static
+	dh_fixperms -p$(package)-static
+	dh_installdeb -p$(package)-static
+	dh_md5sums -p$(package)-static
+	dh_gencontrol -p$(package)-static
+	dh_builddeb -p$(package)-static
+
 
 binary-arch-dev:	checkroot build
-	$(INSTALL_DIR) debian/tmp-dev/usr/include/$(package) \
-	               debian/tmp-dev/usr/share/$(package)-dev \
-		       debian/tmp-dev/usr/share/doc/$(package)-dev \
-		       debian/tmp-dev/usr/share/aclocal \
-		       debian/tmp-dev/DEBIAN
-	$(INSTALL_FILE) obj/Src/*.epro obj/Src/sigcount.h \
-	                Src/hashtable.h Src/prototypes.h \
-			Src/signals.h Src/zsh_system.h Src/zsh.h Src/ztype.h \
-			debian/tmp-dev/usr/include/$(package)
-	$(INSTALL_FILE) Src/makepro.awk debian/tmp-dev/usr/share/$(package)-dev
-	$(INSTALL_FILE) Config/aczshoot.m4 debian/tmp-dev/usr/share/aclocal/$(package)oot.m4
-	$(INSTALL_FILE) debian/changelog debian/tmp-dev/usr/share/doc/$(package)-dev/changelog.Debian
-	$(INSTALL_FILE) debian/copyright debian/tmp-dev/usr/share/doc/$(package)-dev/
-	gzip -9f debian/tmp-dev/usr/share/doc/$(package)-dev/changelog.Debian
-
-	cd debian/tmp-dev && find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > DEBIAN/md5sums
-	dpkg-gencontrol -ldebian/changelog -isp -p$(package)-dev -Tdebian/$(package)-dev.substvars -Pdebian/tmp-dev
-	chown -R root.root debian/tmp-dev
-	chmod -R go=rX debian/tmp-dev
-	dpkg --build debian/tmp-dev ..
+	dh_installdirs -p$(package)-dev
+	dh_install -p$(package)-dev
+	cd debian/$(package)-dev/usr/share/aclocal; mv aczshoot.m4 zshoot.m4
+	dh_installdocs -p$(package)-dev
+	dh_installchangelogs -p$(package)-dev
+	dh_compress -p$(package)-dev
+	dh_fixperms -p$(package)-dev
+	dh_installdeb -p$(package)-dev
+	dh_md5sums -p$(package)-dev
+	dh_gencontrol -p$(package)-dev
+	dh_builddeb -p$(package)-dev
 
 ifneq (zsh-beta,$(package))
 binary:		binary-indep binary-arch binary-arch-static binary-arch-dev
@@ -374,7 +249,7 @@ prebuild:
 	rm -rf autom4te.cache
 
 checkroot:
-	$(checkdir)
+	dh_testdir
 	test root = "`whoami`"
 
 .PHONY: binary binary-arch binary-indep clean checkroot binary-arch-dynamic binary-arch-static prebuild binary-arch-dev
diff --git a/debian/zsh-dbg.dirs b/debian/zsh-dbg.dirs
new file mode 100644
index 000000000..4fbd1b17d
--- /dev/null
+++ b/debian/zsh-dbg.dirs
@@ -0,0 +1 @@
+usr/lib/debug/bin
diff --git a/debian/zsh-dbg.links b/debian/zsh-dbg.links
new file mode 100644
index 000000000..35fe07927
--- /dev/null
+++ b/debian/zsh-dbg.links
@@ -0,0 +1 @@
+/usr/share/doc/zsh /usr/share/doc/zsh-dbg
\ No newline at end of file
diff --git a/debian/zsh-dev.dirs b/debian/zsh-dev.dirs
new file mode 100644
index 000000000..d21ae6547
--- /dev/null
+++ b/debian/zsh-dev.dirs
@@ -0,0 +1,4 @@
+usr/include/zsh
+usr/share/zsh-dev
+usr/share/doc/zsh-dev
+usr/share/aclocal
diff --git a/debian/zsh-dev.install b/debian/zsh-dev.install
new file mode 100644
index 000000000..4e7edf94f
--- /dev/null
+++ b/debian/zsh-dev.install
@@ -0,0 +1,10 @@
+obj/Src/*.epro usr/include/zsh
+obj/Src/sigcount.h usr/include/zsh
+Src/hashtable.h usr/include/zsh
+Src/prototypes.h usr/include/zsh
+Src/signals.h usr/include/zsh
+Src/zsh_system.h usr/include/zsh
+Src/zsh.h usr/include/zsh
+Src/ztype.h usr/include/zsh
+Src/makepro.awk usr/share/zsh-dev
+Config/aczshoot.m4 usr/share/aclocal
diff --git a/debian/zsh-doc.dirs b/debian/zsh-doc.dirs
new file mode 100644
index 000000000..51508fe44
--- /dev/null
+++ b/debian/zsh-doc.dirs
@@ -0,0 +1,2 @@
+usr/share/info
+usr/share/doc/zsh-doc/html
diff --git a/debian/zsh.doc-base b/debian/zsh-doc.doc-base
index 232ec9182..232ec9182 100644
--- a/debian/zsh.doc-base
+++ b/debian/zsh-doc.doc-base
diff --git a/debian/zsh-doc.docs b/debian/zsh-doc.docs
new file mode 100644
index 000000000..60cb2382a
--- /dev/null
+++ b/debian/zsh-doc.docs
@@ -0,0 +1 @@
+obj/Doc/zsh.pdf
diff --git a/debian/zsh-static.dirs b/debian/zsh-static.dirs
new file mode 100644
index 000000000..6c6a9684b
--- /dev/null
+++ b/debian/zsh-static.dirs
@@ -0,0 +1,4 @@
+bin
+usr/share/man/man1
+usr/share/doc/zsh-static
+usr/share/lintian/overrides
diff --git a/debian/zsh-static.install b/debian/zsh-static.install
new file mode 100644
index 000000000..51a712325
--- /dev/null
+++ b/debian/zsh-static.install
@@ -0,0 +1 @@
+obj-static/Src/zsh bin
diff --git a/debian/zsh-static.links b/debian/zsh-static.links
new file mode 100644
index 000000000..1f4ad1e3e
--- /dev/null
+++ b/debian/zsh-static.links
@@ -0,0 +1 @@
+/usr/share/man/man1/zsh.1.gz /usr/share/man/man1/zsh5-static.1.gz
diff --git a/debian/static.postinst b/debian/zsh-static.postinst
index 396c0fabe..18432c0fa 100644
--- a/debian/static.postinst
+++ b/debian/zsh-static.postinst
@@ -21,4 +21,6 @@ esac
 
 update-alternatives --install /bin/zsh-static zsh-static /bin/zsh5-static 40
 
+#DEBHELPER#
+
 exit 0
diff --git a/debian/static.postrm b/debian/zsh-static.postrm
index ae0c1d682..6fc83e6fa 100644
--- a/debian/static.postrm
+++ b/debian/zsh-static.postrm
@@ -7,3 +7,5 @@ case "$1" in
 	remove-shell /bin/zsh-static
 	;;
 esac
+
+#DEBHELPER#
diff --git a/debian/static.prerm b/debian/zsh-static.prerm
index b5404047c..adbdf8caa 100644
--- a/debian/static.prerm
+++ b/debian/zsh-static.prerm
@@ -17,3 +17,5 @@ case "$1" in
 	exit 0
     ;;
 esac
+
+#DEBHELPER#
diff --git a/debian/zsh.dirs b/debian/zsh.dirs
new file mode 100644
index 000000000..24be48523
--- /dev/null
+++ b/debian/zsh.dirs
@@ -0,0 +1,6 @@
+etc/zsh
+bin
+usr/lib/zsh
+usr/share/menu
+usr/share/man
+usr/share/zsh/help
diff --git a/debian/zsh.docs b/debian/zsh.docs
new file mode 100644
index 000000000..e31e29544
--- /dev/null
+++ b/debian/zsh.docs
@@ -0,0 +1,14 @@
+Doc/zsh.texi
+Etc/BUGS
+Etc/CONTRIBUTORS
+Etc/ChangeLog*
+Etc/FTP-README
+Etc/TODO
+Etc/completion-style-guide
+Etc/zsh-development-guide
+FEATURES
+Functions/README.zftp
+MACHINES
+META-FAQ
+NEWS
+README
diff --git a/debian/zsh.examples b/debian/zsh.examples
new file mode 100644
index 000000000..47c809f1b
--- /dev/null
+++ b/debian/zsh.examples
@@ -0,0 +1,5 @@
+Misc
+Functions/Example
+StartupFiles/*
+Util/reporter
+debian/examples/*
diff --git a/debian/zsh.install b/debian/zsh.install
new file mode 100644
index 000000000..e5aeb05e0
--- /dev/null
+++ b/debian/zsh.install
@@ -0,0 +1,6 @@
+debian/zlogin etc/zsh
+debian/zlogout etc/zsh
+debian/zprofile etc/zsh
+debian/zshenv etc/zsh
+debian/zshrc etc/zsh
+debian/newuser.zshrc.recommended etc/zsh
diff --git a/debian/zsh.links b/debian/zsh.links
new file mode 100644
index 000000000..b695f6f4e
--- /dev/null
+++ b/debian/zsh.links
@@ -0,0 +1 @@
+/usr/share/man/man1/zsh.1.gz /usr/share/man/man1/zsh5.1.gz
diff --git a/debian/postinst b/debian/zsh.postinst
index 88f042ac0..b639d9f68 100644
--- a/debian/postinst
+++ b/debian/zsh.postinst
@@ -31,4 +31,6 @@ update-alternatives --install /bin/rzsh rzsh /bin/zsh5 50 \
 mkdir -m2775 -p /usr/local/share/zsh/site-functions && chown root:staff \
                /usr/local/share/zsh/site-functions || true
 
+#DEBHELPER#
+
 exit 0
diff --git a/debian/postrm b/debian/zsh.postrm
index 974675812..2660ddbfd 100644
--- a/debian/postrm
+++ b/debian/zsh.postrm
@@ -10,3 +10,5 @@ case "$1" in
 	remove-shell /usr/bin/zsh
 	;;
 esac
+
+#DEBHELPER#
diff --git a/debian/prerm b/debian/zsh.prerm
index 75ed305ae..a874e3881 100644
--- a/debian/prerm
+++ b/debian/zsh.prerm
@@ -21,4 +21,6 @@ case "$1" in
     ;;
 esac
 
+#DEBHELPER#
+
 exit 0