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

[Christian Perrier]

Author: bubulle
Date: 2005-12-11 19:15:36 +0000 (Sun, 11 Dec 2005)
New Revision: 694

Removed:
   trunk/debian/shells
Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/passwd.postinst
   trunk/debian/rules
Log:
Stop providing a template shells file and install it if /etc/shells is
missing. This is now debianutils job.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-12-05 22:11:31 UTC (rev 693)
+++ trunk/debian/changelog	2005-12-11 19:15:36 UTC (rev 694)
@@ -9,6 +9,10 @@
     - 502_fix_generated_man_pages
       remove the occurences of ’ which is not supported by the current version
       of docbook-xsl in Debian. Closes: #341489
+    - debian/rules, debian/shells, debian/passwd.postinst:
+      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
   * Debconf translation updates:
     - Basque updated. Closes: #342102
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2005-12-05 22:11:31 UTC (rev 693)
+++ trunk/debian/control	2005-12-11 19:15:36 UTC (rev 694)
@@ -8,7 +8,7 @@
 
 Package: passwd
 Architecture: any
-Depends: ${shlibs:Depends}, ${loginpam}, debianutils (>= 2.15)
+Depends: ${shlibs:Depends}, ${loginpam}, debianutils (>= 2.15.2)
 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 (<< 0.5.0.0.20050915-1), manpages-ko (<< 20010901-0.1), manpages-pl (<= 20020406-1), manpages-es-extra (<< 0.8a-14), manpages-ru (<< 0.98-3), manpages-zh
 Section: admin

Modified: trunk/debian/passwd.postinst
===================================================================
--- trunk/debian/passwd.postinst	2005-12-05 22:11:31 UTC (rev 693)
+++ trunk/debian/passwd.postinst	2005-12-11 19:15:36 UTC (rev 694)
@@ -2,12 +2,6 @@
 
 test -f /usr/share/debconf/confmodule && . /usr/share/debconf/confmodule
 
-# only install /etc/shells on package install
-if test -z "$2" && test ! -f /etc/shells
-then
-	cp -p /usr/share/passwd/shells /etc/shells
-fi
-
 case "$1" in
 configure)
     rm -f /etc/pam.d/passwd.pre-upgrade 2>/dev/null

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2005-12-05 22:11:31 UTC (rev 693)
+++ trunk/debian/rules	2005-12-11 19:15:36 UTC (rev 694)
@@ -128,9 +128,7 @@
 	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
-	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
 	# add-shell and remove-shell now provided by debianutils

Deleted: trunk/debian/shells
===================================================================
--- trunk/debian/shells	2005-12-05 22:11:31 UTC (rev 693)
+++ trunk/debian/shells	2005-12-11 19:15:36 UTC (rev 694)
@@ -1,15 +0,0 @@
-# /etc/shells: valid login shells
-/bin/ash
-/bin/bash
-/bin/csh
-/bin/sh
-/usr/bin/es
-/usr/bin/ksh
-/bin/ksh
-/usr/bin/rc
-/usr/bin/tcsh
-/bin/tcsh
-/usr/bin/zsh
-/bin/sash
-/bin/zsh
-/usr/bin/esh