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

Thu Apr 18 22:06:54 UTC 2013

The following commit has been merged in the debian branch:
commit b3343504ebdccbde080ea21c7e83faf2c1260e42
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sat Jan 19 02:34:56 2013 +0100

    Use dh_installdocs --link-doc instead of dh_link for /usr/share/doc/zsh*

diff --git a/debian/control b/debian/control
index d5d4a0d..f614197 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 638a910..b1c07e9 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 9900cfa..0000000
--- 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 850eba7..0000000
--- a/debian/zsh.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/doc/zsh-common /usr/share/doc/zsh
\ No newline at end of file

-- 
Debian zsh package

