[Pkg-shadow-commits] r588 - trunk/debian

[Alexander Gattin]

Author: xrgtn-guest
Date: 2005-10-11 17:49:05 +0000 (Tue, 11 Oct 2005)
New Revision: 588

Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
conditionally pack login.defs & related files into "login" pkg for the Hurd platform

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-10-11 06:40:26 UTC (rev 587)
+++ trunk/debian/changelog	2005-10-11 17:49:05 UTC (rev 588)
@@ -37,6 +37,8 @@
                            removed
     - debian/rules:
       - pack upstream's NEWS file into login and passwd. Closes: #331487
+      - pack login.defs and its manpages into "passwd" instead of "login"
+        package for the Hurd platform. Closes: #249372
     - debian/passwd.config, debian/passwd.templates:
       - allow preseeding the root (and user) password with a MD5 hash
         Closes: #275343, #304352

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2005-10-11 06:40:26 UTC (rev 587)
+++ trunk/debian/rules	2005-10-11 17:49:05 UTC (rev 588)
@@ -91,7 +91,14 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_movefiles
+	dh_movefiles -Xlogin.defs
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+	dh_install -p passwd --sourcedir debian/tmp/ --autodest \
+	    usr/share/man{/*,}/man5/login.defs.5
+else
+	dh_install -p login --sourcedir debian/tmp/ --autodest \
+	    usr/share/man{/*,}/man5/login.defs.5
+endif
 	dh_installdirs
 	ln -sf vipw debian/passwd/usr/sbin/vigr
 	ln -sf cppw debian/passwd/usr/sbin/cpgr
@@ -117,7 +124,11 @@
 	dh_installpam -p passwd --name=newusers
 	dh_installpam -p login
 	dh_installpam -p login --name=su
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+	install -c -m 444 debian/login.defs debian/passwd/etc/login.defs
+else
 	install -c -m 444 debian/login.defs debian/login/etc/login.defs
+endif
 	install -c -m 444 debian/securetty.$(DEB_HOST_ARCH_OS) debian/login/etc/securetty
 	install -d debian/passwd/usr/share/passwd
 	install -c -m 644 debian/useradd.default debian/passwd/etc/default/useradd
@@ -159,10 +170,10 @@
 	dh_compress
 	dh_shlibdeps
 	dh_installdebconf
-ifneq ($(DEB_HOST_ARCH_OS),hurd)
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+	echo "loginpam=login, libpam-modules (>= 0.72-5)" >> debian/passwd.substvars
+else
 	echo "loginpam=login (>= 970502-1), libpam-modules (>= 0.72-5)" >> debian/passwd.substvars
-else
-	echo "loginpam=login, libpam-modules (>= 0.72-5)" >> debian/passwd.substvars
 endif
 	dh_installdeb
 	dh_gencontrol