Switch all packages over to dh_install

6 files changed, 5 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index a2d6e3e3..6d7a9567 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +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
+  * Switch all packages over to dh_install
 
  -- Steve Langasek <vorlon@debian.org>  Tue, 01 Sep 2009 22:23:47 -0700
 
diff --git a/debian/libpam-cracklib.files b/debian/libpam-cracklib.install
index 29ad0417..29ad0417 100644
--- a/debian/libpam-cracklib.files
+++ b/debian/libpam-cracklib.install
diff --git a/debian/libpam0g-dev.files b/debian/libpam0g-dev.files
deleted file mode 100644
index cc53b1eb..00000000
--- a/debian/libpam0g-dev.files
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/security/*
-usr/lib/libpam.a
-usr/lib/libpamc.a
-usr/lib/libpam_misc.a
diff --git a/debian/libpam0g-dev.install b/debian/libpam0g-dev.install
new file mode 100644
index 00000000..c51c0567
--- /dev/null
+++ b/debian/libpam0g-dev.install
@@ -0,0 +1,2 @@
+usr/include/security/*
+lib/*.a			usr/lib
diff --git a/debian/libpam0g.files b/debian/libpam0g.install
index d9178d41..d9178d41 100644
--- a/debian/libpam0g.files
+++ b/debian/libpam0g.install
diff --git a/debian/rules b/debian/rules
index fdafa93c..377bce65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,9 +116,8 @@ binary-arch: install
 	dh_testroot -a
 
 	mkdir -p debian/tmp/usr/lib
-	mv debian/tmp/lib/*.a debian/tmp/usr/lib
-	dh_movefiles  -plibpam0g-dev -plibpam-cracklib -plibpam0g
-	dh_install -plibpam-modules
+	dh_install -a -Nlibpam-cracklib -X pam_cracklib
+	dh_install -plibpam-cracklib
 	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