Build moderately functioning packages

8 files changed, 24 insertions, 22 deletions

diff --git a/libpam-modules.examples b/libpam-modules.examples
index 8585e47a..1fc16696 100644
--- a/libpam-modules.examples
+++ b/libpam-modules.examples
@@ -1 +1 @@
-build-tree/Linux-PAM-0.72/modules/pam_filter/upperLOWER
+Linux-PAM/modules/pam_filter/upperLOWER
diff --git a/libpam0g-dev.examples b/libpam0g-dev.examples
index ef3a0f30..78afb494 100644
--- a/libpam0g-dev.examples
+++ b/libpam0g-dev.examples
@@ -1,7 +1,7 @@
-build-tree/Linux-PAM-0.72/examples/Makefile
-build-tree/Linux-PAM-0.72/examples/blank.c
-build-tree/Linux-PAM-0.72/examples/check_user.c
-build-tree/Linux-PAM-0.72/examples/test.c
-build-tree/Linux-PAM-0.72/examples/vpass.c
-build-tree/Linux-PAM-0.72/examples/xsh.c
-build-tree/Linux-PAM-0.72/libpamc/test
+Linux-PAM/examples/Makefile
+Linux-PAM/examples/blank.c
+Linux-PAM/examples/check_user.c
+Linux-PAM/examples/test.c
+Linux-PAM/examples/vpass.c
+Linux-PAM/examples/xsh.c
+Linux-PAM/libpamc/test
diff --git a/libpam0g-dev.files b/libpam0g-dev.files
index a3c77045..cc53b1eb 100644
--- a/libpam0g-dev.files
+++ b/libpam0g-dev.files
@@ -2,6 +2,3 @@ usr/include/security/*
 usr/lib/libpam.a
 usr/lib/libpamc.a
 usr/lib/libpam_misc.a
-usr/lib/libpam.so
-usr/lib/libpamc.so
-usr/lib/libpam_misc.so
diff --git a/libpam0g-dev.links b/libpam0g-dev.links
new file mode 100644
index 00000000..f595eeb9
--- /dev/null
+++ b/libpam0g-dev.links
@@ -0,0 +1,3 @@
+/lib/libpam.so.0 usr/lib/libpam.so
+/lib/libpamc.so.0 usr/lib/libpamc.so
+/lib/libpam_misc.so.0 usr/lib/libpam_misc.so
diff --git a/libpam0g.dirs b/libpam0g.dirs
index 1443821f..b47d974f 100644
--- a/libpam0g.dirs
+++ b/libpam0g.dirs
@@ -1,9 +1,2 @@
-etc/pam.d
-sbin
 lib
-usr/lib
-usr/include
-usr/share/man/man3
-usr/share/man/man7
-usr/share/man/man8
 usr/share/doc
diff --git a/libpam0g.files b/libpam0g.files
new file mode 100644
index 00000000..d9178d41
--- /dev/null
+++ b/libpam0g.files
@@ -0,0 +1 @@
+lib/lib*.so.*
diff --git a/libpam0g.links b/libpam0g.links
new file mode 100644
index 00000000..0c2443b4
--- /dev/null
+++ b/libpam0g.links
@@ -0,0 +1,3 @@
+libpam.so.0.75 lib/libpam.so.0
+libpamc.so.0.75 lib/libpamc.so.0
+libpam_misc.so.0.75 lib/libpam_misc.so.0
diff --git a/rules b/rules
index 211ff04b..a84d035c 100755
--- a/rules
+++ b/rules
@@ -10,6 +10,7 @@ export DH_COMPAT
 
 BUILD_TREE=Linux-PAM
 
+pdoc=libpam-doc
 d = $(shell pwd)/debian
 dl = $(d)/local
 i = install -p -m 0644
@@ -34,7 +35,7 @@ configure: configure-stamp
 configure-stamp:
 	(cd $(BUILD_TREE) && \
 	sh configure --sysconfdir=/etc --prefix=/usr --enable-static-libpam \
-	--mandir=/usr/share/man --infodir=/usr/share/info --enable-securedir=/lib/security \
+	--mandir=/usr/share/man --infodir=/usr/share/info --libdir=/lib \
 	--sbindir=/sbin)
 	touch configure-stamp
 
@@ -81,12 +82,16 @@ binary-arch: build module_check $(dh_mak_deps)
 
 	$(MAKE) install -C $(BUILD_TREE) FAKEROOT=$(d)/tmp \
 		DIRS="libpam libpam_misc modules libpamc"
+	mkdir -p debian/tmp/etc/pam.d
 	$(i) $(dl)/pam.conf $(d)/tmp/etc
 	$(i) $(dl)/other $(d)/tmp/etc/pam.d
+	$(ie) -D  $(BUILD_TREE)/modules/pam_tally/pam_tally $(d)/tmp/usr/sbin/pam_tally
 	$(i) $(dl)/unix_chkpwd.8 $(d)/libpam-modules/usr/share/man/man8
-	dh_movefiles -plibpam-runtime -plibpam0g-dev -plibpam-cracklib
+	mkdir -p debian/tmp/usr/lib
+	mv debian/tmp/lib/*.a debian/tmp/usr/lib
+	dh_movefiles -plibpam-runtime -plibpam0g-dev -plibpam-cracklib -plibpam0g
 	dh_movefiles -plibpam-modules `cd $(d)/tmp && ls lib/security/*`
-
+	dh_link -A
 	dh_installman -plibpam-runtime $(BUILD_TREE)/doc/man/*.[578]
 	dh_installman -plibpam0g-dev $(BUILD_TREE)/doc/man/*.3
 	dh_installman -plibpam-runtime $(dl)/pam-undocumented.7
@@ -111,8 +116,8 @@ binary-arch: build module_check $(dh_mak_deps)
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -Xunix_chkpwd -a
+	dh_makeshlibs -plibpam0g -V "libpam0g (>= 0.75)"
 	dh_installdeb -a
-	dh_makeshlibs -plibpam0g -V "libpam0g (>= 0.72-1)"
 	dh_shlibdeps -a
 	dh_gencontrol -a
 	dh_md5sums -a