From 7b632623b115b81dbda65791f6c51a62a1a9e999 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Wed, 12 Nov 2014 00:25:39 +0100 Subject: 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(-) create mode 100644 debian/zsh.links diff --git a/debian/rules b/debian/rules index a82db996b..8408b9c1e 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 51addab78..bf201bbea 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 000000000..cb996f26c --- /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 -- cgit v1.2.3