[Python-modules-commits] [sip4] 01/01: Specify empty DH_OPTIONS when using dh_installdocs with -p argument.

Dmitry Shachnev mitya57 at moszumanska.debian.org
Thu Jan 25 16:04:11 UTC 2018


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

mitya57 pushed a commit to branch debian/master
in repository sip4.

commit 650520ce63703148271641f1152402e9154f5d7a
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Jan 25 19:03:29 2018 +0300

    Specify empty DH_OPTIONS when using dh_installdocs with -p argument.
    
    Otherwise it will apply --link-doc to the other arch-any packages,
    because DH_OPTIONS contains -a.
---
 debian/changelog | 1 +
 debian/rules     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0b893f7..3f6be63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ sip4 (4.19.7+dfsg-1) UNRELEASED; urgency=medium
   * New upstream bugfix release.
   * Bump years in debian/copyright.
   * Bump Standards-Version to 4.1.3, no changes needed.
+  * Specify empty DH_OPTIONS when using dh_installdocs with -p argument.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 25 Jan 2018 12:41:02 +0300
 
diff --git a/debian/rules b/debian/rules
index cae1b3a..35f88a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -170,8 +170,8 @@ endif
 # don't call strip twice (or make the -dbg doc directories symlinks twice),
 # it's in binary-common
 ifneq (,$(findstring -a, $(DH_OPTIONS)))
-	dh_installdocs -ppython-sip-dbg --link-doc=python-sip
-	dh_installdocs -ppython3-sip-dbg --link-doc=python3-sip
+	DH_OPTIONS= dh_installdocs -ppython-sip-dbg --link-doc=python-sip
+	DH_OPTIONS= dh_installdocs -ppython3-sip-dbg --link-doc=python3-sip
 	DH_OPTIONS= dh_strip -ppython-sip-dev
 	DH_OPTIONS= dh_strip -ppython-sip -Npython-sip-dev --dbg-package=python-sip-dbg
 	DH_OPTIONS= dh_strip -ppython3-sip-dev

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sip4.git



More information about the Python-modules-commits mailing list