[Pkg-zsh-commits] [SCM] Debian zsh package branch, debian, updated. debian/5.0.2-2-48-g15b0943

[Axel Beckert]

The following commit has been merged in the debian branch:
commit 3c846aa4e7fdc87d0cf8f19d306364a2a458da54
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Thu May 9 20:21:59 2013 +0200

    Install zsh-beta{,-doc} symlinks to /usr/share/doc/zsh-common via dh_installdocs

diff --git a/debian/control b/debian/control
index b58d9b8..b199c14 100644
--- a/debian/control
+++ b/debian/control
@@ -131,7 +131,7 @@ Package: zsh-beta
 Architecture: all
 Section: oldlibs
 Priority: extra
-Depends: ${misc:Depends}, zsh
+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
@@ -142,7 +142,7 @@ Package: zsh-beta-doc
 Architecture: all
 Section: oldlibs
 Priority: extra
-Depends: ${misc:Depends}, zsh-doc
+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
diff --git a/debian/rules b/debian/rules
index 88bc850..20e5e59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,7 +91,7 @@ clean:
 binary-indep: build-indep
 	dh_testdir
 	dh_testroot
-	dh_installdocs -pzsh-doc --link-doc=zsh-common
+	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
diff --git a/debian/zsh-beta-doc.links b/debian/zsh-beta-doc.links
deleted file mode 100644
index 084922b..0000000
--- a/debian/zsh-beta-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/doc/zsh-doc /usr/share/doc/zsh-beta-doc
diff --git a/debian/zsh-beta.links b/debian/zsh-beta.links
deleted file mode 100644
index 87ad4e6..0000000
--- a/debian/zsh-beta.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/doc/zsh /usr/share/doc/zsh-beta

-- 
Debian zsh package