4 files changed, 29 insertions, 5 deletions
diff --git a/debian/control b/debian/control
index 08dfdce15..97afee573 100644
--- a/debian/control
+++ b/debian/control
@@ -125,3 +125,23 @@ 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
+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
+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/rules b/debian/rules
index 9b2e31bdd..fc7b1ab57 100755
--- a/debian/rules
+++ b/debian/rules
@@ -107,11 +107,13 @@ binary-indep: build-indep
 
 	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_link                               -pzsh-beta -pzsh-beta-doc
+	dh_compress          -p$(package)-doc -pzsh-beta -pzsh-beta-doc -Xpdf
+	dh_fixperms          -p$(package)-doc -pzsh-beta -pzsh-beta-doc
+	dh_installdeb        -p$(package)-doc -pzsh-beta -pzsh-beta-doc
+	dh_md5sums           -p$(package)-doc -pzsh-beta -pzsh-beta-doc
+	dh_gencontrol        -p$(package)-doc -pzsh-beta -pzsh-beta-doc
+	dh_builddeb                           -pzsh-beta -pzsh-beta-doc
 	dh_builddeb          -p$(package)-doc -- -Zxz
 
 binary-arch: binary-arch-dynamic binary-arch-static binary-arch-dev
diff --git a/debian/zsh-beta-doc.links b/debian/zsh-beta-doc.links
new file mode 100644
index 000000000..084922b0c
--- /dev/null
+++ b/debian/zsh-beta-doc.links
@@ -0,0 +1 @@
+/usr/share/doc/zsh-doc /usr/share/doc/zsh-beta-doc
diff --git a/debian/zsh-beta.links b/debian/zsh-beta.links
new file mode 100644
index 000000000..87ad4e608
--- /dev/null
+++ b/debian/zsh-beta.links
@@ -0,0 +1 @@
+/usr/share/doc/zsh /usr/share/doc/zsh-beta