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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2006-01-05 18:04:01 +0000 (Thu, 05 Jan 2006)
New Revision: 766

Removed:
   trunk/debian/README.shells
   trunk/debian/passwd.docs
Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
Remove the last references to add-shell and remove-shell


Deleted: trunk/debian/README.shells
===================================================================
--- trunk/debian/README.shells	2006-01-05 15:41:49 UTC (rev 765)
+++ trunk/debian/README.shells	2006-01-05 18:04:01 UTC (rev 766)
@@ -1,21 +0,0 @@
-/etc/shells micropolicy
-
-The expected audience of this is debian developers packaging programs
-meant to be used as login shells.
-
-/etc/shells is no longer a config file, but is maintained by the
-add-shell and remove-shell programs.  So, if a package contains
-something that the maintainer thinks ought to be a valid login shell,
-it's postinst should, (on initial install only, to allow a sysadmin to
-take it out again), run:
-
-/usr/sbin/add-shell /path/to/shell
-
-In the postrm, probably on remove, the package should call
-
-/usr/sbin/remove-shell /path/to/shell
-
-Packages using this mechanism must declare a dependency on 
-passwd (>= 1:4.0.3-10).  As the various shells start to use it, the
-default shells list will start getting shorter, but that's not
-expected to happen until at least sarge+1.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-01-05 15:41:49 UTC (rev 765)
+++ trunk/debian/changelog	2006-01-05 18:04:01 UTC (rev 766)
@@ -38,6 +38,7 @@
       Remove the /usr/share/passwd/shells files and the postinst code that
       installed it as /etc/shells. This is now done by debianutils.
       Closes: #342858
+    - Also remove README.shells, which should be distributed by debianutils.
     - debian/passwd.postrm:
       Do not remove /etc/shells on purge. Closes: #345659
     - Fix the version of an old entry in NEWS.Debian

Deleted: trunk/debian/passwd.docs
===================================================================
--- trunk/debian/passwd.docs	2006-01-05 15:41:49 UTC (rev 765)
+++ trunk/debian/passwd.docs	2006-01-05 18:04:01 UTC (rev 766)
@@ -1 +0,0 @@
-debian/README.shells

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2006-01-05 15:41:49 UTC (rev 765)
+++ trunk/debian/rules	2006-01-05 18:04:01 UTC (rev 766)
@@ -132,11 +132,6 @@
 	install -c -m 644 debian/useradd.default debian/passwd/etc/default/useradd
 	install -d debian/passwd/sbin
 	install -c -m 555 debian/shadowconfig.sh debian/passwd/sbin/shadowconfig
-	# 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