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

[Christian Perrier]

Author: bubulle
Date: 2005-10-10 20:56:26 +0000 (Mon, 10 Oct 2005)
New Revision: 582

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/rules
Log:
No more install add-shell and remove-shell (and their man pages) which are
moved to debianutils
Depend on debianutils (>= 2.15), ie the version with the utilities
Closes: #a_bunch_of_old_bugs


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-10-10 20:32:36 UTC (rev 581)
+++ trunk/debian/changelog	2005-10-10 20:56:26 UTC (rev 582)
@@ -39,6 +39,12 @@
     - debian/login.defs:
       - document the obsoleted by PAM ENV_HZ variable. Closes: #265613
       - better document the real use of USERGROUPS_ENAB. Closes: #282822
+    - debian/add-shell, debian/remove-shell, debian/add-shell.8, 
+      debian/remove-shell.8:
+      - utilities moved to debianutils. Add a versioned "Depends" line on
+        debianutils so that passwd cannot be upgraded when the new
+        debianutils version including these utilities isn't available
+        Closes: #208514, #268656, #269573, #293171
   * Debconf translation updates:
     - Swedish updated. Closes: #332711
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2005-10-10 20:32:36 UTC (rev 581)
+++ trunk/debian/control	2005-10-10 20:56:26 UTC (rev 582)
@@ -8,7 +8,7 @@
 
 Package: passwd
 Architecture: any
-Depends: ${shlibs:Depends}, ${loginpam}
+Depends: ${shlibs:Depends}, ${loginpam}, debianutils (>= 2.15)
 Conflicts: shadow-passwd, pam-apps, suidregister (<< 0.50), debconf (<< 0.5)
 Replaces: manpages (<=1.15-2), manpages-de (<< 0.4-9), manpages-fr (<<1.64.0-1), manpages-hu (<< 20010119-3), manpages-it, manpages-ja, manpages-ko, manpages-pl (<= 20020406-1), manpages-es-extra (<< 0.8a-14), manpages-ru (<< 0.98-3),manpages-zh
 Section: admin

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2005-10-10 20:32:36 UTC (rev 581)
+++ trunk/debian/rules	2005-10-10 20:56:26 UTC (rev 582)
@@ -124,10 +124,11 @@
 	install -c -m 444 debian/shells debian/passwd/usr/share/passwd/shells
 	install -d debian/passwd/sbin
 	install -c -m 555 debian/shadowconfig.sh debian/passwd/sbin/shadowconfig
-	install -c -m 555 debian/add-shell.sh debian/passwd/usr/sbin/add-shell
-	install -c -m 555 debian/remove-shell.sh debian/passwd/usr/sbin/remove-shell
-	install -c -m 444 debian/add-shell.8 debian/passwd/usr/share/man/man8
-	install -c -m 444 debian/remove-shell.8 debian/passwd/usr/share/man/man8
+	# add-shell and remove-shell now provided by debianutils
+	#install -c -m 555 debian/add-shell.sh debian/passwd/usr/sbin/add-shell
+	#install -c -m 555 debian/remove-shell.sh debian/passwd/usr/sbin/remove-shell
+	#install -c -m 444 debian/add-shell.8 debian/passwd/usr/share/man/man8
+	#install -c -m 444 debian/remove-shell.8 debian/passwd/usr/share/man/man8
 	install -c -m 444 debian/cpgr.8 debian/passwd/usr/share/man/man8
 	install -c -m 444 debian/cppw.8 debian/passwd/usr/share/man/man8
 	# Lintian overrides files