diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2013-01-19 02:34:56 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2013-04-18 21:48:00 +0200 |
| commit | b3343504ebdccbde080ea21c7e83faf2c1260e42 (patch) | |
| tree | 22a6e4274876e4c5f40e3dbff43243ed18a2496a | |
| parent | 014da817fb7969306ff26195b8b91e4db8380833 (diff) | |
| download | zsh-b3343504ebdccbde080ea21c7e83faf2c1260e42.tar.gz zsh-b3343504ebdccbde080ea21c7e83faf2c1260e42.zip | |
Use dh_installdocs --link-doc instead of dh_link for /usr/share/doc/zsh*
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 6 | ||||
| -rw-r--r-- | debian/zsh-dbg.links | 1 | ||||
| -rw-r--r-- | debian/zsh.links | 1 |
4 files changed, 4 insertions, 6 deletions
diff --git a/debian/control b/debian/control index d5d4a0dd0..f614197da 100644 --- a/debian/control +++ b/debian/control @@ -112,7 +112,7 @@ Package: zsh-dbg Architecture: any Section: debug Priority: extra -Depends: zsh (= ${binary:Version}), zsh-common (= ${source:Version}), ${misc:Depends} +Depends: zsh (= ${binary:Version}), ${misc:Depends} 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/rules b/debian/rules index 638a910a9..b1c07e99f 100755 --- a/debian/rules +++ b/debian/rules @@ -120,6 +120,7 @@ endif binary-indep: build-indep dh_testdir dh_testroot + dh_installdocs -p$(package)-doc --link-doc=zsh-common dh_installdirs -p$(package)-doc cd obj && $(MAKE) install.info DESTDIR=$(CURDIR)/debian/zsh-doc @@ -128,7 +129,6 @@ binary-indep: build-indep # Work around texi2html unfriendliness sed -i -e 's/<BODY.*>/<BODY LANG="EN">/' debian/zsh-doc/usr/share/doc/$(package)-doc/html/*.html - dh_installdocs -p$(package)-doc dh_installchangelogs -p$(package)-doc dh_compress -p$(package)-doc -Xpdf dh_fixperms -p$(package)-doc @@ -197,7 +197,7 @@ endif -dDepends debian/zsh/bin/* \ -dRecommends debian/zsh/usr/lib/$(package)/*/zsh/*.so dh_installmenu -p$(package)-common - dh_installdocs -p$(package)-common + dh_installdocs -p$(package) -p$(package)-common -p$(package)-dbg --link-doc=zsh-common dh_installchangelogs -p$(package)-common ChangeLog dh_lintian -p$(package) -p$(package)-common -p$(package)-dbg dh_compress -p$(package) -p$(package)-common -p$(package)-dbg @@ -243,7 +243,7 @@ binary-arch-dev: build-arch dh_installdirs -p$(package)-dev dh_install -p$(package)-dev cd debian/$(package)-dev/usr/share/aclocal; mv aczshoot.m4 zshoot.m4 - dh_installdocs -p$(package)-dev + dh_installdocs -p$(package)-dev --link-doc=zsh-common dh_installchangelogs -p$(package)-dev dh_compress -p$(package)-dev dh_fixperms -p$(package)-dev diff --git a/debian/zsh-dbg.links b/debian/zsh-dbg.links deleted file mode 100644 index 9900cfa7e..000000000 --- a/debian/zsh-dbg.links +++ /dev/null @@ -1 +0,0 @@ -/usr/share/doc/zsh-common /usr/share/doc/zsh-dbg diff --git a/debian/zsh.links b/debian/zsh.links deleted file mode 100644 index 850eba7eb..000000000 --- a/debian/zsh.links +++ /dev/null @@ -1 +0,0 @@ -/usr/share/doc/zsh-common /usr/share/doc/zsh
\ No newline at end of file |