[Pkg-openldap-devel] [openldap] 01/02: Include scripts-common in smbk5pwd scripts

[Ryan Tandy]

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

rtandy-guest pushed a commit to branch master
in repository openldap.

commit 8cd7109d1a7ee1b0269810fd7d26ed0b8434b460
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Tue Nov 1 19:52:27 2016 -0700

    Include scripts-common in smbk5pwd scripts
---
 debian/dh_installscripts-common | 9 ++++++---
 debian/rules                    | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/dh_installscripts-common b/debian/dh_installscripts-common
index 9936b4f..7bc561c 100755
--- a/debian/dh_installscripts-common
+++ b/debian/dh_installscripts-common
@@ -5,9 +5,10 @@ use Debian::Debhelper::Dh_Lib;
 
 init();
 
+my $scriptscommon = $ARGV[0];
+
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
-	my $ext=pkgext($package);
 
 	if (! -d "$tmp/DEBIAN") {
 		next;
@@ -15,8 +16,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 	foreach my $file (qw{postinst preinst prerm postrm config}) {
 		my $f="$tmp/DEBIAN/$file";
-		if ($f) {
-			complex_doit("perl -pe 's~#SCRIPTSCOMMON#~qx{cat debian/${ext}scripts-common}~eg' -i $f");
+		if (! -e $f) {
+			next;
 		}
+		print "changing $f with $scriptscommon\n";
+		complex_doit("perl -pe 's~#SCRIPTSCOMMON#~qx{cat $scriptscommon}~eg' -i $f");
 	}
 }
diff --git a/debian/rules b/debian/rules
index 3f79d0c..024bf75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -199,7 +199,7 @@ endif
 ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
 override_dh_installdeb:
 	dh_installdeb
-	perl -w debian/dh_installscripts-common -p slapd
+	perl -w debian/dh_installscripts-common -pslapd -pslapd-smbk5pwd debian/slapd.scripts-common
 endif
 
 override_dh_auto_clean:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git