merge from trunk

1 files changed, 3 insertions, 7 deletions

diff --git a/debian/rules b/debian/rules
index c70cbc42..7f4ed318 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,9 @@ override_dh_compress:
 # .install files don't have "except for" handling, so we need to exclude
 # our module that doesn't match right here
 override_dh_install:
+ifneq (,$(findstring libpam-modules, $(shell dh_listpackages)))
 	dh_install -plibpam-modules -Xpam_cracklib
+endif
 	dh_install -Nlibpam-modules
 
 # again, excluding files by hand; also, build our local manpage for pam_getenv
@@ -56,13 +58,7 @@ override_dh_link:
 # dh_fixperms doesn't want
 override_dh_fixperms:
 	dh_fixperms
-ifeq (,$(findstring -i, $(DH_INTERNAL_OPTIONS)))
+ifneq (,$(findstring libpam-modules, $(shell dh_listpackages)))
 	chgrp shadow $(d)/libpam-modules-bin/sbin/unix_chkpwd
 	chmod 02755 $(d)/libpam-modules-bin/sbin/unix_chkpwd
 endif
-
-# ideally, dh_makeshlibs could compute this from the symbols file; or we
-# could drop it since anyone building against this package should have a
-# dpkg-shlibdeps available that knows about symbols files?
-override_dh_makeshlibs:
-	dh_makeshlibs -V "libpam0g (>= 1.1.0)"