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

[Christian Perrier]

Author: bubulle
Date: 2005-11-20 15:05:55 +0000 (Sun, 20 Nov 2005)
New Revision: 661

Removed:
   trunk/debian/initial-passwd-udeb.postinst
   trunk/debian/initial-passwd-udeb.templates
Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/rules
Log:
Get rid of initial-passwd-udeb. The udeb with the shortest life ever..:)


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-11-19 19:30:59 UTC (rev 660)
+++ trunk/debian/changelog	2005-11-20 15:05:55 UTC (rev 661)
@@ -4,6 +4,8 @@
   * Debian packaging fixes:
     - debian/rules, debian/login.links, debian/passwd.links:
       Use dh_link for setting up symlinks
+    - get rid of initial-passwd-udeb as D-I will now use its
+      own udeb (user-setup-udeb)
   * Debconf translation updates:
     - Portuguese updated. Closes: #338767
     - Korean updated. Closes: #339011
@@ -14,7 +16,7 @@
     - 460_vipw-quiet: vipw logs "unchanged" message to stdout
       and offers a quiet mode. Closes: #190252
 
- -- Christian Perrier <bubulle at debian.org>  Sat, 12 Nov 2005 10:43:18 +0100
+ -- Christian Perrier <bubulle at debian.org>  Sun, 20 Nov 2005 16:04:54 +0100
 
 shadow (1:4.0.13-6) unstable; urgency=low
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2005-11-19 19:30:59 UTC (rev 660)
+++ trunk/debian/control	2005-11-20 15:05:55 UTC (rev 661)
@@ -35,13 +35,3 @@
  workgroup type situations). The su program allows changing your effective
  user ID (useful being able to execute commands as another user).
 
-Package: initial-passwd-udeb
-XC-Package-Type: udeb
-Section: debian-installer
-Priority: extra
-Architecture: all
-Depends: cdebconf-udeb, base-installer
-XB-Installer-Menu-Item: 71
-Description: Set up users and passwords
- This package sets up initial users and passwords. (If this package isn't
- used, base-config will do the same job after the first reboot.)

Deleted: trunk/debian/initial-passwd-udeb.postinst
===================================================================
--- trunk/debian/initial-passwd-udeb.postinst	2005-11-19 19:30:59 UTC (rev 660)
+++ trunk/debian/initial-passwd-udeb.postinst	2005-11-20 15:05:55 UTC (rev 661)
@@ -1,39 +0,0 @@
-#! /bin/sh -e
-
-. /usr/share/debconf/confmodule
-
-db_get debian-installer/locale
-if [ "$RET" ]; then
-	TARGETLANG="$RET"
-else
-	TARGETLANG=C
-fi
-
-db_get debconf/priority
-TARGETPRIO="$RET"
-
-target_debconf () {
-	env -u DEBIAN_HAS_FRONTEND -u DEBIAN_FRONTEND \
-		-u DEBCONF_REDIR -u DEBCONF_OLD_FD_BASE \
-		DEBCONF_READFD=0 DEBCONF_WRITEFD=3 \
-		DEBIAN_PRIORITY="$TARGETPRIO" \
-		LANG="$TARGETLANG" DEBCONF_RECONFIGURE=1 \
-		chroot /target debconf -o base-config "$@"
-}
-
-debconf-copydb -p ^passwd/ configdb target_configdb
-
-# Ideally, dpkg-reconfigure wouldn't create a new frontend every time. In
-# the meantime, we reimplement a couple of bits of it. Note that
-# DEBCONF_RECONFIGURE=1 is set in target_debconf above.
-
-version="$(LANG="$TARGETLANG" chroot /target dpkg --status passwd | \
-	   grep ^Version: | sed 's/^Version: //')"
-CODE=0
-target_debconf -f passthrough \
-	/var/lib/dpkg/info/passwd.config reconfigure "$version" || CODE="$?"
-if [ "$CODE" = 30 ]; then
-	exit 10
-else
-	exit $CODE
-fi

Deleted: trunk/debian/initial-passwd-udeb.templates
===================================================================
--- trunk/debian/initial-passwd-udeb.templates	2005-11-19 19:30:59 UTC (rev 660)
+++ trunk/debian/initial-passwd-udeb.templates	2005-11-20 15:05:55 UTC (rev 661)
@@ -1,3 +0,0 @@
-Template: debian-installer/initial-passwd-udeb/title
-Type: title
-_Description: Set up users and passwords

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2005-11-19 19:30:59 UTC (rev 660)
+++ trunk/debian/rules	2005-11-20 15:05:55 UTC (rev 661)
@@ -168,8 +168,6 @@
 	dh_compress
 	dh_shlibdeps
 	dh_installdebconf
-	echo >> debian/initial-passwd-udeb/DEBIAN/templates
-	po2debconf --podir=debian/po --encoding=utf8 debian/passwd.templates >> debian/initial-passwd-udeb/DEBIAN/templates
 ifeq ($(DEB_HOST_ARCH_OS),hurd)
 	echo "loginpam=login, libpam-modules (>= 0.72-5)" >> debian/passwd.substvars
 else