From e0504e0fcc40f29f3c9ec165bf2d6d40489542dd Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 3 Sep 2009 16:00:43 -0700 Subject: use dh_listpackages instead of DH_INTERNAL_OPTIONS, per Joey --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index b0c0e1ca..e5f8ffbe 100755 --- a/debian/rules +++ b/debian/rules @@ -49,7 +49,7 @@ override_dh_installman: # dh_fixperms doesn't want override_dh_fixperms: dh_fixperms -ifeq (,$(findstring -i, $(DH_INTERNAL_OPTIONS))) +ifeq (,$(findstring libpam-modules, $(shell dh_listpackages))) chgrp shadow $(d)/libpam-modules/sbin/unix_chkpwd chmod 02755 $(d)/libpam-modules/sbin/unix_chkpwd endif -- cgit v1.2.3 From f27f8b1bd4906cd4c4050d64e53bc00ccfb6047b Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 3 Sep 2009 16:39:53 -0700 Subject: Drop dh_makeshlibs -V; everything from lenny on should use the .symbols file instead, making the shlibs redundant so we don't need to care what version gets listed there. --- debian/rules | 6 ------ 1 file changed, 6 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index e5f8ffbe..bb26739c 100755 --- a/debian/rules +++ b/debian/rules @@ -53,9 +53,3 @@ ifeq (,$(findstring libpam-modules, $(shell dh_listpackages))) chgrp shadow $(d)/libpam-modules/sbin/unix_chkpwd chmod 02755 $(d)/libpam-modules/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)" -- cgit v1.2.3 From b3bbdebae5e1a22ef9a98e3b6eccd3dedc0f3212 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 7 Sep 2009 11:48:03 -0700 Subject: guard the other libpam-modules-specific bit, and get the sense of the dh_listpackages check right --- debian/rules | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index bb26739c..d8cc37ed 100755 --- a/debian/rules +++ b/debian/rules @@ -34,7 +34,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 @@ -49,7 +51,7 @@ override_dh_installman: # dh_fixperms doesn't want override_dh_fixperms: dh_fixperms -ifeq (,$(findstring libpam-modules, $(shell dh_listpackages))) +ifneq (,$(findstring libpam-modules, $(shell dh_listpackages))) chgrp shadow $(d)/libpam-modules/sbin/unix_chkpwd chmod 02755 $(d)/libpam-modules/sbin/unix_chkpwd endif -- cgit v1.2.3