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

Christian Perrier pkg-shadow-devel@lists.alioth.debian.org
Wed, 08 Jun 2005 21:46:51 +0000


Author: bubulle
Date: 2005-06-08 21:46:51 +0000 (Wed, 08 Jun 2005)
New Revision: 207

Modified:
   trunk/debian/changelog
   trunk/debian/passwd.files
   trunk/debian/rules
Log:
Do not install limits.5 and limits.conf.5 man pages anymore
as they do not reflect the way we deal with limits in Debian (with PAM)
Closes: #288106


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-06-08 21:30:21 UTC (rev 206)
+++ trunk/debian/changelog	2005-06-08 21:46:51 UTC (rev 207)
@@ -4,6 +4,9 @@
     - Add a comment about potential sensitive information exposure
       when LOG_UNKFAIL_ENAB is set in login.defs
       Closes: #298773
+    - Remove limits.5 and limits.conf.5 man pages which do not
+      reflect the way we deal with limits in Debian
+      Closes: #288106
   * Debconf translation updates:
     - Estonian added. Close: #312471
   * Man pages translation updates:

Modified: trunk/debian/passwd.files
===================================================================
--- trunk/debian/passwd.files	2005-06-08 21:30:21 UTC (rev 206)
+++ trunk/debian/passwd.files	2005-06-08 21:46:51 UTC (rev 207)
@@ -27,8 +27,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/limits.conf.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	2005-06-08 21:30:21 UTC (rev 206)
+++ trunk/debian/rules	2005-06-08 21:46:51 UTC (rev 207)
@@ -87,7 +87,10 @@
 	ln -sf vipw debian/passwd/usr/sbin/vigr
 	ln -sf cppw debian/passwd/usr/sbin/cpgr
 	ln -sf newgrp debian/login/usr/bin/sg
-	mv debian/passwd/usr/share/man/man5/limits.5 debian/passwd/usr/share/man/man5/limits.conf.5
+	# 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/dpasswd.8 debian/passwd/usr/share/man/man8
 	install -c -m 444 man/ja/dpasswd.8 debian/passwd/usr/share/man/ja/man8
 	install -c -m 444 man/pl/dpasswd.8 debian/passwd/usr/share/man/pl/man8