11 files changed, 338 insertions, 144 deletions
diff --git a/debian/control b/debian/control
index f614197da..3d68f4769 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends: bsdmainutils,
                libpcre3-dev,
                texi2html (>= 1.76-3),
                texinfo,
+               texinfo (<< 5~) | texlive-latex-recommended,
                texlive-latex-base,
                yodl
 Maintainer: Debian Zsh Maintainers <pkg-zsh-devel@lists.alioth.debian.org>
@@ -21,14 +22,14 @@ Uploaders: Michael Prokop <mika@debian.org>,
            Clint Adams <clint@debian.org>,
            Frank Terbeck <ft@bewatermyfriend.org>,
            Richard Hartmann <richih.mailinglist@gmail.com>
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://www.zsh.org/
 Vcs-Git: git://anonscm.debian.org/collab-maint/zsh.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/zsh.git
 
 Package: zsh
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, zsh-common
+Depends: ${shlibs:Depends}, ${misc:Depends}, zsh-common (= ${source:Version})
 Pre-Depends: dpkg (>= 1.15.6~)
 Recommends: ${shlibs:Recommends}
 Suggests: zsh-doc
@@ -64,7 +65,7 @@ Description: architecture independent files for Zsh
 Package: zsh-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, zsh-common (= ${source:Version})
 Pre-Depends: dpkg (>= 1.15.6~)
 Description: zsh documentation - info/HTML format
  Zsh is a UNIX command interpreter (shell) usable as an
@@ -94,7 +95,7 @@ Description: shell with lots of features (static link)
 
 Package: zsh-dev
 Architecture: any
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, zsh-common (= ${source:Version})
 Section: libdevel
 Description: shell with lots of features (development files)
  Zsh is a UNIX command interpreter (shell) usable as an
@@ -112,7 +113,7 @@ Package: zsh-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: zsh (= ${binary:Version}), ${misc:Depends}
+Depends: zsh (= ${binary:Version}), ${misc:Depends}, zsh-common (= ${source:Version})
 Pre-Depends: dpkg (>= 1.15.6~)
 Description: shell with lots of features (debugging symbols)
  Zsh is a UNIX command interpreter (shell) usable as an
@@ -125,3 +126,24 @@ Description: shell with lots of features (debugging symbols)
  .
  This package contains gdb debugging symbols for the 'zsh'
  package.
+
+Package: zsh-beta
+Architecture: all
+Section: oldlibs
+Priority: extra
+Depends: ${misc:Depends}, zsh (>= 5), zsh-common (= ${source:Version})
+Suggests: zsh-beta-doc
+Description: transitional package to zsh
+ The purpose of this package is solely the transition from the zsh-beta
+ package to the zsh package. It can be safely removed if no more user
+ has zsh-beta as login shell.
+
+Package: zsh-beta-doc
+Architecture: all
+Section: oldlibs
+Priority: extra
+Depends: ${misc:Depends}, zsh-doc, zsh-common (= ${source:Version})
+Description: transitional package to zsh-doc
+ The purpose of this package is solely the transition from the
+ zsh-beta-doc package to the zsh-doc package. It can be safely
+ removed.
diff --git a/debian/patches/series b/debian/patches/series
index e69de29bb..d201235f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+updates_needed_with_latest_texinfo.patch
+suppress_texinfo_warning_by_adding_item_arguments.patch
diff --git a/debian/patches/suppress_texinfo_warning_by_adding_item_arguments.patch b/debian/patches/suppress_texinfo_warning_by_adding_item_arguments.patch
new file mode 100644
index 000000000..be78fa9b3
--- /dev/null
+++ b/debian/patches/suppress_texinfo_warning_by_adding_item_arguments.patch
@@ -0,0 +1,26 @@
+Description: 31263: suppress texinfo warning by giving item an argument
+Author: Peter Stephenson <p.w.stephenson@ntlworld.com>
+Date: Fri Apr 12 23:01:25 2013 +0100
+Upstream-Commit: 67a4be36c6203c26c3912c07441f42e3965f0fa8
+Revised: Axel Beckert <abe@debian.org>
+Debian-Bug: 707483
+
+diff --git a/Doc/Zsh/mod_curses.yo b/Doc/Zsh/mod_curses.yo
+index d3f8ad2..7ad772a 100644
+--- a/Doc/Zsh/mod_curses.yo
++++ b/Doc/Zsh/mod_curses.yo
+@@ -84,11 +84,11 @@ The subcommand tt(position) writes various positions associated with
+ var(targetwin) into the array named var(array).
+ These are, in order:
+ startsitem()
+-sitem()(The y and x coordinates of the cursor relative to the top left
++sitem(-)(The y and x coordinates of the cursor relative to the top left
+ of var(targetwin))
+-sitem()(The y and x coordinates of the top left of var(targetwin) on the
++sitem(-)(The y and x coordinates of the top left of var(targetwin) on the
+ screen)
+-sitem()(The size of var(targetwin) in y and x dimensions.)
++sitem(-)(The size of var(targetwin) in y and x dimensions.)
+ endsitem()
+ 
+ Outputting characters and strings are achieved by tt(char) and tt(string)
diff --git a/debian/patches/updates_needed_with_latest_texinfo.patch b/debian/patches/updates_needed_with_latest_texinfo.patch
new file mode 100644
index 000000000..70f5d0724
--- /dev/null
+++ b/debian/patches/updates_needed_with_latest_texinfo.patch
@@ -0,0 +1,36 @@
+Description: 31261: updates needed with latest texinfo
+Author: Peter Stephenson <p.w.stephenson@ntlworld.com>
+Date: Fri Apr 12 22:47:22 2013 +0100
+Upstream-Commit: b174a0df054929efd7804922750c71adeb8e0b57
+Revised: Axel Beckert <abe@debian.org>
+Debian-Bug: 707483
+
+diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
+index 2991c1f..4a436da 100644
+--- a/Doc/Zsh/compsys.yo
++++ b/Doc/Zsh/compsys.yo
+@@ -4414,8 +4414,7 @@ tt(ambiguous), tt(special-dirs), tt(list-suffixes) and tt(file-sort)
+ described above.
+ )
+ findex(_pick_variant)
+-xitem(tt(_pick_variant) [ tt(-b) var(builtin-label) ] [ tt(-c)
+-var(command) ] [ tt(-r) var(name) ])
++xitem(tt(_pick_variant) [ tt(-b) var(builtin-label) ] [ tt(-c) var(command) ] [ tt(-r) var(name) ])
+ item(   var(label)tt(=)var(pattern) ... var(label) [ var(args) ... ])(
+ This function is used to resolve situations where a single command name
+ requires more than one type of handling, either because it
+diff --git a/Doc/ztexi.yo b/Doc/ztexi.yo
+index ed0236b..513452b 100644
+--- a/Doc/ztexi.yo
++++ b/Doc/ztexi.yo
+@@ -193,8 +193,8 @@ def(startlist)(0)(\
+   startitem()\
+ )
+ def(endlist)(0)(\
+-  NOTRANS(@item)+NL()\
+-  enditem()\
++  enditem()+NL()\
++  NOTRANS(@sp 1)\
+ )
+ def(list)(1)(\
+   item(ARG1)()\
diff --git a/debian/rules b/debian/rules
index 79eaeaec8..20e5e5937 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,36 +2,24 @@
 INSTALL = install
 INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
 
-package=zsh
-ifeq (zsh-beta,$(package))
-snapshot_date := $(shell dpkg-parsechangelog | sed -n '/^Version: [0-9.][0-9.]*.*+20[0-9][0-9]\([0-9][0-9][0-9][0-9]\)-[0-9][0-9]*$$/ {s//\1/;p}')
-endif
-
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 H_LDFLAGS = $(LDFLAGS)
 
 CFLAGS += -Wall -g
-ifeq (zsh-beta,$(package))
-CFLAGS += -W
-endif
 
 CONFIGFLAGS =  --prefix=/usr
 CONFIGFLAGS += --mandir=/usr/share/man
 CONFIGFLAGS += --bindir=/bin
 CONFIGFLAGS += LDFLAGS="-Wl,--as-needed -g $(H_LDFLAGS)"
 
-ifeq (zsh-beta,$(package))
-CONFIGFLAGS += --program-suffix=-beta
-endif
-
 CONFIGFLAGS += --infodir=/usr/share/info
 CONFIGFLAGS += --enable-maildir-support
 CONFIGFLAGS += --enable-max-jobtable-size=256
-CONFIGFLAGS += --enable-etcdir=/etc/$(package)
+CONFIGFLAGS += --enable-etcdir=/etc/zsh
 CONFIGFLAGS += --enable-function-subdirs
-CONFIGFLAGS += --enable-site-fndir=/usr/local/share/$(package)/site-functions
-CONFIGFLAGS += --enable-fndir=/usr/share/$(package)/functions
+CONFIGFLAGS += --enable-site-fndir=/usr/local/share/zsh/site-functions
+CONFIGFLAGS += --enable-fndir=/usr/share/zsh/functions
 CONFIGFLAGS += --with-tcsetpgrp
 CONFIGFLAGS += --with-term-lib="ncursesw tinfo"
 CONFIGFLAGS += --enable-cap --enable-pcre
@@ -41,9 +29,7 @@ CONFIGFLAGS += --enable-additional-fpath=/usr/share/zsh/vendor-functions,/usr/sh
 
 STATICFLAGS =  --disable-dynamic
 STATICFLAGS += --enable-ldflags=-static
-ifneq (zsh-beta,$(package))
 STATICFLAGS += --disable-dynamic-nss
-endif
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 CONFIGFLAGS += --enable-zsh-debug
@@ -54,21 +40,14 @@ CONFIGFLAGS += --enable-zsh-hash-debug
 endif
 
 build: build-arch build-indep
-build-stamp: configure-stamp
-	dh_testdir
-ifeq (zsh-beta,$(package))
-	touch stamp-h.in
-endif
 
-build-arch: build-stamp
+build-arch: configure-stamp
 	dh_auto_build -B obj --parallel
 	HOME="$(CURDIR)/obj/testhome" dh_auto_test -B obj --parallel
 	touch $@
 
-build-indep: build-stamp
-ifeq (zsh,$(package))
+build-indep: configure-stamp
 	dh_auto_build -B obj --parallel -- pdf
-endif
 	touch $@
 
 build-static: configure-static-stamp
@@ -87,10 +66,6 @@ configure-stamp: configure
 	dh_testdir
 	chmod 755 configure
 	mkdir -p obj/testhome
-ifeq (zsh-beta,$(package))
-	test -f Config/version.mk.orig || cp Config/version.mk Config/version.mk.orig
-	sed -i -e 's/^VERSION=\([^+]*\)$$/VERSION=\1-cvs$(snapshot_date)/' Config/version.mk
-endif
 	dh_auto_configure -B obj -- $(CONFIGFLAGS)
 	touch $@
 
@@ -99,167 +74,154 @@ configure-static-stamp: configure
 	mkdir obj-static
 	dh_auto_configure -B obj-static -- $(CONFIGFLAGS) $(STATICFLAGS)
 #	cp debian/static.conf obj-static/Src/mymods.conf
-	sed -i -e 's/files.mdd link=no/files.mdd link=static/;s/stat.mdd link=no/stat.mdd link=static/' obj-static/config.modules
+	sed -i -e 's/files.mdd link=no/files.mdd link=static/;s/stat.mdd link=no/stat.mdd link=static/' \
+	    obj-static/config.modules
 	touch $@
 
 clean:
 	dh_testdir
 	dh_autoreconf_clean
-ifeq (zsh-beta,$(package))
-	test ! -f Config/version.mk.orig || mv Config/version.mk.orig Config/version.mk
-endif
 	rm -f build build-static
 	dh_auto_clean -B obj        --parallel
 	dh_auto_clean -B obj-static --parallel
-ifneq (zsh-beta,$(package))
 	dh_auto_clean               --parallel
-endif
 	dh_clean
 	rm -rf config.cache obj obj-static autom4te.cache
 
 binary-indep: build-indep
 	dh_testdir
 	dh_testroot
-	dh_installdocs -p$(package)-doc --link-doc=zsh-common
-	dh_installdirs -p$(package)-doc
+	dh_installdocs -pzsh-doc -pzsh-beta -pzsh-beta-doc --link-doc=zsh-common
+	dh_installdirs -pzsh-doc
 
 	cd obj && $(MAKE) install.info DESTDIR=$(CURDIR)/debian/zsh-doc
 	rm -f debian/zsh-doc/usr/share/info/dir*
-	cd obj && $(MAKE) install.html DESTDIR=$(CURDIR)/debian/zsh-doc htmldir=/usr/share/doc/$(package)-doc/html
+	cd obj && $(MAKE) install.html DESTDIR=$(CURDIR)/debian/zsh-doc htmldir=/usr/share/doc/zsh-doc/html
 # Work around texi2html unfriendliness
-	sed -i -e 's/<BODY.*>/<BODY LANG="EN">/' debian/zsh-doc/usr/share/doc/$(package)-doc/html/*.html
+	sed -i -e 's/<BODY.*>/<BODY LANG="EN">/' debian/zsh-doc/usr/share/doc/zsh-doc/html/*.html
+
+	dh_installchangelogs -pzsh-doc
+	dh_link                        -pzsh-beta -pzsh-beta-doc
+	dh_compress          -pzsh-doc -pzsh-beta -pzsh-beta-doc -Xpdf
+	dh_fixperms          -pzsh-doc -pzsh-beta -pzsh-beta-doc
+	dh_installdeb        -pzsh-doc -pzsh-beta -pzsh-beta-doc
+	dh_md5sums           -pzsh-doc -pzsh-beta -pzsh-beta-doc
+	dh_gencontrol        -pzsh-doc -pzsh-beta -pzsh-beta-doc
+	dh_builddeb                    -pzsh-beta -pzsh-beta-doc
+	dh_builddeb          -pzsh-doc -- -Zxz
 
-	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 -- -Zxz
-
-ifneq (zsh-beta,$(package))
 binary-arch: binary-arch-dynamic binary-arch-static binary-arch-dev
-else
-binary-arch: binary-arch-dynamic
-endif
 binary-arch-dynamic: build-arch
 	dh_testdir
 	dh_testroot
 
-	dh_installdirs -p$(package) -p$(package)-common -p$(package)-dbg
+	dh_installdirs -pzsh -pzsh-common -pzsh-dbg
 
-	cd obj && $(MAKE) install.man DESTDIR=$(CURDIR)/debian/$(package)-common
+	cd obj && $(MAKE) install.man DESTDIR=$(CURDIR)/debian/zsh-common
 	nroff -mandoc -Tascii Doc/zshbuiltins.1 | colcrt - | \
-	sed -e 's/�/{+|-}/' | ( cd debian/$(package)-common/usr/share/$(package)/help && \
+	sed -e 's/�/{+|-}/' | ( cd debian/zsh-common/usr/share/zsh/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/$(package)-common/usr/share/man/man1/*.1
-endif
-
 # functions
-	dh_installexamples -p$(package)-common -X.distfiles
-	cd debian/$(package)-common/usr/share/doc/$(package)-common/examples/; mv Example Functions
-	sed -i -e '1!b;s:^#!.*[ /]zsh:#!/bin/$(package):;s#/usr/local/bin#/usr/bin#' \
-	   debian/$(package)-common/usr/share/doc/$(package)-common/examples/Misc/*
+	dh_installexamples -pzsh-common -X.distfiles
+	cd debian/zsh-common/usr/share/doc/zsh-common/examples/; mv Example Functions
+	sed -i -e '1!b;s:^#!.*[ /]zsh:#!/bin/zsh:;s#/usr/local/bin#/usr/bin#' \
+	   debian/zsh-common/usr/share/doc/zsh-common/examples/Misc/*
 
-	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/$(package)-common
+	cd obj && $(MAKE) install.bin     DESTDIR=$(CURDIR)/debian/zsh INSTALL_PROGRAM='$(INSTALL_PROGRAM)'
+	cd obj && $(MAKE) install.modules DESTDIR=$(CURDIR)/debian/zsh INSTALL_PROGRAM='$(INSTALL_PROGRAM)'
+	cd obj && $(MAKE) install.fns     DESTDIR=$(CURDIR)/debian/zsh-common
 
-	rm -r debian/$(package)-common/usr/local
+	rm -r debian/zsh-common/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/zsh/bin/$(package) -fc 'setopt extendedglob; for i in debian/$(package)-common/'`cat obj/Src/zshpaths.temp`'; do zcompile -U -M $$i.zwc $$i/*~*.zwc(^/) ; chmod 644 $$i.zwc ; done'
+	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/zsh/bin/zsh -fc \
+            'setopt extendedglob; \
+	     for i in debian/zsh-common/'`cat obj/Src/zshpaths.temp`'; do \
+		 zcompile -U -M $$i.zwc $$i/*~*.zwc(^/);                  \
+		 chmod 644 $$i.zwc;                                       \
+	     done'
 
-ifneq (zsh-beta,$(package))
 	mv debian/zsh/bin/zsh debian/zsh/bin/zsh5
 	rm debian/zsh/bin/zsh-5.[0-9]*
 
-	dh_strip -p$(package) --dbg-package=$(package)-dbg
-endif
-
-	dh_link -p$(package) -p$(package)-common -p$(package)-dbg
-	dh_install -p$(package) -p$(package)-common -p$(package)-dbg
-
-	sed -i -e 's,^local HELPDIR=.*,local HELPDIR=$${HELPDIR:-/usr/share/$(package)/help},;s,:-more,:-/usr/bin/pager,;' debian/$(package)-common/usr/share/$(package)/functions/Misc/run-help
-	sed -i -e '1!b;s:^#!.*[ /]zsh:#!/bin/$(package):;s#/usr/local/bin#/usr/bin#;' `find debian/$(package)-common/usr/share/$(package)/functions -type f`
-	chmod 755 debian/$(package)-common/usr/share/$(package)/functions/Misc/checkmail \
-	          debian/$(package)-common/usr/share/$(package)/functions/Misc/harden    \
-	          debian/$(package)-common/usr/share/$(package)/functions/Misc/run-help  \
-	          debian/$(package)-common/usr/share/$(package)/functions/Misc/zkbd      \
-	          debian/$(package)-common/usr/share/$(package)/functions/Misc/zcalc
-
-	dh_shlibdeps         -p$(package)                     -p$(package)-dbg -- \
-		-dDepends    debian/zsh/bin/*                                     \
-		-dRecommends debian/zsh/usr/lib/$(package)/*/zsh/*.so
-	dh_installmenu                    -p$(package)-common
-	dh_installdocs       -p$(package) -p$(package)-common -p$(package)-dbg --link-doc=zsh-common
-	dh_installchangelogs              -p$(package)-common                  ChangeLog
-	dh_lintian           -p$(package) -p$(package)-common -p$(package)-dbg
-	dh_compress          -p$(package) -p$(package)-common -p$(package)-dbg
-	dh_fixperms          -p$(package) -p$(package)-common -p$(package)-dbg
-	dh_installdeb        -p$(package) -p$(package)-common -p$(package)-dbg
-	dh_md5sums           -p$(package) -p$(package)-common -p$(package)-dbg
-	dh_gencontrol        -p$(package) -p$(package)-common -p$(package)-dbg
-	dh_builddeb          -p$(package) -p$(package)-common                  -- -Zxz
-	dh_builddeb                                           -p$(package)-dbg
+	dh_strip   -pzsh              --dbg-package=zsh-dbg
+	dh_link    -pzsh -pzsh-common             -pzsh-dbg
+	dh_install -pzsh -pzsh-common             -pzsh-dbg
+
+	sed -i -e 's,^local HELPDIR=.*,local HELPDIR=$${HELPDIR:-/usr/share/zsh/help},; s,:-more,:-/usr/bin/pager,;' \
+		debian/zsh-common/usr/share/zsh/functions/Misc/run-help
+	sed -i -e '1!b;s:^#!.*[ /]zsh:#!/bin/zsh:;s#/usr/local/bin#/usr/bin#;' \
+		`find debian/zsh-common/usr/share/zsh/functions -type f`
+	chmod 755 debian/zsh-common/usr/share/zsh/functions/Misc/checkmail \
+	          debian/zsh-common/usr/share/zsh/functions/Misc/harden    \
+	          debian/zsh-common/usr/share/zsh/functions/Misc/run-help  \
+	          debian/zsh-common/usr/share/zsh/functions/Misc/zkbd      \
+	          debian/zsh-common/usr/share/zsh/functions/Misc/zcalc
+
+	dh_shlibdeps         -pzsh              -pzsh-dbg --   \
+		-dDepends    debian/zsh/bin/*                  \
+		-dRecommends debian/zsh/usr/lib/zsh/*/zsh/*.so
+
+	dh_installmenu             -pzsh-common
+	dh_installdocs       -pzsh -pzsh-common -pzsh-dbg --link-doc=zsh-common
+	dh_installchangelogs       -pzsh-common -pzsh-dbg ChangeLog
+	dh_lintian           -pzsh -pzsh-common -pzsh-dbg
+	dh_compress          -pzsh -pzsh-common -pzsh-dbg
+	dh_fixperms          -pzsh -pzsh-common -pzsh-dbg
+	dh_installdeb        -pzsh -pzsh-common -pzsh-dbg
+	dh_md5sums           -pzsh -pzsh-common -pzsh-dbg
+	dh_gencontrol        -pzsh -pzsh-common -pzsh-dbg
+	dh_builddeb          -pzsh -pzsh-common           -- -Zxz
+	dh_builddeb                             -pzsh-dbg
 
 binary-arch-static: build-static
 	dh_testdir
 	dh_testroot
 
-	dh_installdirs -p$(package)-static
-	dh_lintian     -p$(package)-static
+	dh_installdirs -pzsh-static
+	dh_lintian     -pzsh-static
 
 	# Do not symlink /usr/share/doc/zsh-static to
 	# /usr/share/doc/zsh-common because zsh-static has a uniqe,
 	# generated README.Debian
-	dh_installdocs -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/zsh-static/usr/share/doc/$(package)-static/README.Debian
-
-	dh_install     -p$(package)-static
-	mv debian/$(package)-static/bin/zsh debian/$(package)-static/bin/zsh5-static
-
-ifneq (zsh-beta,$(package))
-	dh_shlibdeps         -p$(package)-static
-endif
-
-	dh_strip             -p$(package)-static
-	dh_link              -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 -- -Zxz
-
+	dh_installdocs -pzsh-static
+	awk 'BEGIN { print "The following modules are statically-compiled into the static zsh binary:\n"; } /link=static/ { printf "%s (%s %s)\n", substr($$1,6), $$4, $$5; }' obj-static/config.modules >debian/zsh-static/usr/share/doc/zsh-static/README.Debian
+
+	dh_install     -pzsh-static
+	dh_strip       -pzsh-static
+	mv debian/zsh-static/bin/zsh debian/zsh-static/bin/zsh5-static
+
+	dh_installchangelogs -pzsh-static
+	dh_link              -pzsh-static
+	dh_compress          -pzsh-static
+	dh_fixperms          -pzsh-static
+	dh_installdeb        -pzsh-static
+	dh_md5sums           -pzsh-static
+	dh_gencontrol        -pzsh-static
+	dh_builddeb          -pzsh-static -- -Zxz
 
 binary-arch-dev: build-arch
 	dh_testdir
 	dh_testroot
 
-	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 --link-doc=zsh-common
-	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
-else
-binary:		binary-indep binary-arch
-endif
+	dh_installdirs       -pzsh-dev
+	dh_install           -pzsh-dev
+	cd debian/zsh-dev/usr/share/aclocal; mv aczshoot.m4 zshoot.m4
+	dh_installdocs       -pzsh-dev --link-doc=zsh-common
+	dh_installchangelogs -pzsh-dev
+	dh_compress          -pzsh-dev
+	dh_fixperms          -pzsh-dev
+	dh_installdeb        -pzsh-dev
+	dh_md5sums           -pzsh-dev
+	dh_gencontrol        -pzsh-dev
+	dh_builddeb          -pzsh-dev
+
+binary: binary-indep binary-arch binary-arch-static binary-arch-dev
 
 prebuild:
 	Util/preconfig
diff --git a/debian/zsh-beta-doc.postinst b/debian/zsh-beta-doc.postinst
new file mode 100644
index 000000000..d3e45d4c0
--- /dev/null
+++ b/debian/zsh-beta-doc.postinst
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    (configure)
+        :
+    ;;
+    (abort-upgrade|abort-remove|abort-deconfigure)
+	exit 0
+    ;;
+    (*)
+	echo "postinst called with unknown argument \`$1'" >&2
+	exit 0
+    ;;
+esac
+
+# Replace documentation directory with symlink
+docdir="/usr/share/doc/zsh-beta-doc"
+if [ -d $docdir -a ! -L $docdir ]; then
+    if rmdir $docdir 2>/dev/null; then
+        ln -sf zsh-common $docdir
+    fi
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/zsh-beta.links b/debian/zsh-beta.links
new file mode 100644
index 000000000..c8f5c8a8f
--- /dev/null
+++ b/debian/zsh-beta.links
@@ -0,0 +1,2 @@
+/usr/share/man/man1/zsh.1.gz /usr/share/man/man1/zsh-beta.1.gz
+/bin/zsh5 /bin/zsh-beta
diff --git a/debian/zsh-beta.postinst b/debian/zsh-beta.postinst
new file mode 100644
index 000000000..ad4ada573
--- /dev/null
+++ b/debian/zsh-beta.postinst
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    (configure)
+        :
+    ;;
+    (abort-upgrade|abort-remove|abort-deconfigure)
+	exit 0
+    ;;
+    (*)
+	echo "postinst called with unknown argument \`$1'" >&2
+	exit 0
+    ;;
+esac
+
+
+for conffile in zlogin zlogout zprofile zshenv zshrc; do
+    dpkg-maintscript-helper rm_conffile /etc/zsh-beta/$conffile 5 -- "$@"
+done
+rmdir /etc/zsh-beta || true
+
+update-alternatives --remove zsh-beta /usr/bin/zsh
+update-alternatives --remove zsh-beta /bin/zsh4
+update-alternatives --remove zsh-beta /bin/zsh5
+
+# Replace documentation directory with symlink
+docdir="/usr/share/doc/zsh-beta"
+if [ -d $docdir -a ! -L $docdir ]; then
+    if rmdir $docdir 2>/dev/null; then
+        ln -sf zsh-common $docdir
+    fi
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/zsh-beta.preinst b/debian/zsh-beta.preinst
new file mode 100644
index 000000000..a0d153c13
--- /dev/null
+++ b/debian/zsh-beta.preinst
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    (upgrade|install)
+        :
+    ;;
+    (abort-upgrade|abort-remove|abort-deconfigure)
+	exit 0
+    ;;
+    (*)
+	echo "postinst called with unknown argument \`$1'" >&2
+	exit 0
+    ;;
+esac
+
+for conffile in zlogin zlogout zprofile zshenv zshrc; do
+    dpkg-maintscript-helper rm_conffile /etc/zsh-beta/$conffile 5 -- "$@"
+done
+
+#DEBHELPER#
diff --git a/debian/zsh-dev.postinst b/debian/zsh-dev.postinst
new file mode 100644
index 000000000..60ce48d55
--- /dev/null
+++ b/debian/zsh-dev.postinst
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    (configure)
+        :
+    ;;
+    (abort-upgrade|abort-remove|abort-deconfigure)
+	exit 0
+    ;;
+    (*)
+	echo "postinst called with unknown argument \`$1'" >&2
+	exit 0
+    ;;
+esac
+
+# Replace documentation directory with symlink
+docdir="/usr/share/doc/zsh-dev"
+if [ -d $docdir -a ! -L $docdir ]; then
+    if rmdir $docdir 2>/dev/null; then
+        ln -sf zsh-common $docdir
+    fi
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/zsh-doc.postinst b/debian/zsh-doc.postinst
new file mode 100644
index 000000000..df10e1e7b
--- /dev/null
+++ b/debian/zsh-doc.postinst
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    (configure)
+        :
+    ;;
+    (abort-upgrade|abort-remove|abort-deconfigure)
+	exit 0
+    ;;
+    (*)
+	echo "postinst called with unknown argument \`$1'" >&2
+	exit 0
+    ;;
+esac
+
+# Replace documentation directory with symlink
+docdir="/usr/share/doc/zsh-doc"
+if [ -d $docdir -a ! -L $docdir ]; then
+    if rmdir $docdir 2>/dev/null; then
+        ln -sf zsh-common $docdir
+    fi
+fi
+
+#DEBHELPER#
+
+exit 0