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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2006-05-31 21:52:12 +0000 (Wed, 31 May 2006)
New Revision: 1010

Modified:
   trunk/debian/changelog
   trunk/debian/passwd.install
   trunk/debian/rules
Log:
limits.5 is no more installed by upstream


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-05-31 21:41:48 UTC (rev 1009)
+++ trunk/debian/changelog	2006-05-31 21:52:12 UTC (rev 1010)
@@ -5,6 +5,9 @@
   * Debian specific fixes:
     - 504_undef_USE_PAM.dpatch: do not use PAM for chgpasswd
       Closes: #369439
+    - debian/rules, debian/passwd.install: cleanup
+      The limits.5 man page is no more installed by upstream. (It wasn't
+      neither on Debian).
   * Read /etc/default/locale in su PAM config file
     Closes: #369391
 

Modified: trunk/debian/passwd.install
===================================================================
--- trunk/debian/passwd.install	2006-05-31 21:41:48 UTC (rev 1009)
+++ trunk/debian/passwd.install	2006-05-31 21:52:12 UTC (rev 1010)
@@ -54,7 +54,6 @@
 usr/share/man/man1/expiry.1
 usr/share/man/man1/gpasswd.1
 usr/share/man/man1/passwd.1
-usr/share/man/man5/limits.5
 usr/share/man/man5/login.access.5
 usr/share/man/man5/passwd.5
 usr/share/man/man5/porttime.5

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2006-05-31 21:41:48 UTC (rev 1009)
+++ trunk/debian/rules	2006-05-31 21:52:12 UTC (rev 1010)
@@ -53,10 +53,6 @@
 	/bin/sh ./debian/recode_manpages.sh login
 
 binary-install/passwd::
-	# Bug #288106. This used to be renamed to limits.conf.5
-	# but does not reflect what we do in Debian
-	# so we'd better forget about that man page
-	rm -f debian/passwd/usr/share/man/man5/limits.5 || true
 	install -c -m 444 man/shadowconfig.8 debian/passwd/usr/share/man/man8
 	install -c -m 444 man/ja/shadowconfig.8 debian/passwd/usr/share/man/ja/man8
 	install -c -m 444 man/pl/shadowconfig.8 debian/passwd/usr/share/man/pl/man8