summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/libpam-modules.files5
-rw-r--r--debian/libpam-modules.install6
-rwxr-xr-xdebian/rules2
4 files changed, 8 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 0373ec2f..a2d6e3e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
pam (1.1.0-3) UNRELEASED; urgency=low
* Bump debian/compat to 7, so we can use sane contents in debian/*.install
+ * Switch libpam-modules over to dh_install
-- Steve Langasek <vorlon@debian.org> Tue, 01 Sep 2009 22:23:47 -0700
diff --git a/debian/libpam-modules.files b/debian/libpam-modules.files
deleted file mode 100644
index 35ddef04..00000000
--- a/debian/libpam-modules.files
+++ /dev/null
@@ -1,5 +0,0 @@
-etc/security/
-sbin/unix_chkpwd
-sbin/unix_update
-sbin/pam_tally
-sbin/mkhomedir_helper
diff --git a/debian/libpam-modules.install b/debian/libpam-modules.install
new file mode 100644
index 00000000..348012e8
--- /dev/null
+++ b/debian/libpam-modules.install
@@ -0,0 +1,6 @@
+etc/security/* etc/security
+sbin/unix_chkpwd sbin
+sbin/unix_update sbin
+sbin/pam_tally sbin
+sbin/mkhomedir_helper sbin
+lib/security/*.so lib/security
diff --git a/debian/rules b/debian/rules
index 6a4b1268..fdafa93c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -118,7 +118,7 @@ binary-arch: install
mkdir -p debian/tmp/usr/lib
mv debian/tmp/lib/*.a debian/tmp/usr/lib
dh_movefiles -plibpam0g-dev -plibpam-cracklib -plibpam0g
- dh_movefiles -plibpam-modules `cd $(d)/tmp && ls lib/security/*.so`
+ dh_install -plibpam-modules
mkdir -p debian/libpam-cracklib/usr/share/pam-configs
$(i) $(d)/pam-configs/cracklib debian/libpam-cracklib/usr/share/pam-configs/cracklib
dh_link -a