[Pkg-zsh-commits] [zsh] 03/04: Simplify Simon's patch by making /usr/share/doc/zsh/doc a symlink to ../zsh-common

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch debian
in repository zsh.

commit 7b632623b115b81dbda65791f6c51a62a1a9e999
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Wed Nov 12 00:25:39 2014 +0100

    Simplify Simon's patch by making /usr/share/doc/zsh/doc a symlink to ../zsh-common
    
    Avoids unpack errors probably caused by having _two_ binary packages
    containing the directory which was previously a symlink.
---
 debian/rules           | 13 -------------
 debian/zsh-common.dirs |  1 -
 debian/zsh.links       |  3 +++
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/debian/rules b/debian/rules
index a82db99..8408b9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -155,15 +155,6 @@ binary-indep: build-indep binary-arch-dynamic
 	dh_installchangelogs    -pzsh-doc -pzsh-common
 	dh_lintian           -i
 	dh_compress          -i                        -Xpdf
-	set -e; cd debian/zsh-common/usr/share/doc/zsh-common; for x in *; do \
-		case "$$x" in \
-			(copyright|changelog.Debian.gz) \
-				;; \
-			(*) \
-				ln -s ../zsh-common/$$x ../zsh/$$x; \
-				;; \
-		esac; \
-	done
 	dh_fixperms          -i
 	dh_installdeb        -i
 	dh_md5sums           -i
@@ -193,10 +184,6 @@ binary-arch-dynamic: build-arch
 
 	dh_installdocs -pzsh             -pzsh-dbg --link-doc=zsh
 	dh_installchangelogs -pzsh
-	# These are in zsh-common and there is no Policy reason why
-	# they can't be
-	rm -v -f debian/zsh/usr/share/doc/zsh/changelog
-	rm -v -f debian/zsh/usr/share/doc/zsh/NEWS.Debian
 
 binary-arch-static: build-static
 	dh_testdir
diff --git a/debian/zsh-common.dirs b/debian/zsh-common.dirs
index 51addab..bf201bb 100644
--- a/debian/zsh-common.dirs
+++ b/debian/zsh-common.dirs
@@ -1,4 +1,3 @@
 etc/zsh
-usr/share/doc/zsh
 usr/share/man
 usr/share/zsh/help
diff --git a/debian/zsh.links b/debian/zsh.links
new file mode 100644
index 0000000..cb996f2
--- /dev/null
+++ b/debian/zsh.links
@@ -0,0 +1,3 @@
+/usr/share/doc/zsh-common/changelog.gz /usr/share/doc/zsh/changelog.gz
+/usr/share/doc/zsh-common/examples /usr/share/doc/zsh/examples
+/usr/share/doc/zsh-common /usr/share/doc/zsh/doc

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git