[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 76452cb381759957902b0879d890fb7dc700a5c6
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Thu May 9 21:46:00 2013 +0200

    zsh{,-dbg,-doc,-dev,-beta,-beta-doc}: .postinst + zsh-common versioned dep
    
    Add versioned dependencies on zsh-common and add postinst scripts to
    replace  /usr/share/doc/zsh* directories with symlinks to
    /usr/share/doc/zsh-common.

diff --git a/debian/control b/debian/control
index b199c14..9a4fd17 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ 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
@@ -65,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
@@ -95,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
@@ -113,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
diff --git a/debian/zsh-dbg.postinst b/debian/zsh-beta-doc.postinst
similarity index 91%
copy from debian/zsh-dbg.postinst
copy to debian/zsh-beta-doc.postinst
index dac01ba..d3e45d4 100644
--- a/debian/zsh-dbg.postinst
+++ b/debian/zsh-beta-doc.postinst
@@ -16,7 +16,7 @@ case "$1" in
 esac
 
 # Replace documentation directory with symlink
-docdir="/usr/share/doc/zsh-dbg"
+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
diff --git a/debian/zsh-dbg.postinst b/debian/zsh-beta.postinst
similarity index 92%
copy from debian/zsh-dbg.postinst
copy to debian/zsh-beta.postinst
index dac01ba..d3799dc 100644
--- a/debian/zsh-dbg.postinst
+++ b/debian/zsh-beta.postinst
@@ -16,7 +16,7 @@ case "$1" in
 esac
 
 # Replace documentation directory with symlink
-docdir="/usr/share/doc/zsh-dbg"
+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
diff --git a/debian/zsh-dbg.postinst b/debian/zsh-dev.postinst
similarity index 92%
copy from debian/zsh-dbg.postinst
copy to debian/zsh-dev.postinst
index dac01ba..60ce48d 100644
--- a/debian/zsh-dbg.postinst
+++ b/debian/zsh-dev.postinst
@@ -16,7 +16,7 @@ case "$1" in
 esac
 
 # Replace documentation directory with symlink
-docdir="/usr/share/doc/zsh-dbg"
+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
diff --git a/debian/zsh-dbg.postinst b/debian/zsh-doc.postinst
similarity index 92%
copy from debian/zsh-dbg.postinst
copy to debian/zsh-doc.postinst
index dac01ba..df10e1e 100644
--- a/debian/zsh-dbg.postinst
+++ b/debian/zsh-doc.postinst
@@ -16,7 +16,7 @@ case "$1" in
 esac
 
 # Replace documentation directory with symlink
-docdir="/usr/share/doc/zsh-dbg"
+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

-- 
Debian zsh package