[Pkg-shadow-devel] Ubuntu shadow 1:4.1.1-6ubuntu3

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.7
Date: Tue, 17 Mar 2009 13:32:55 +0000
Source: shadow
Binary: passwd login
Architecture: source
Version: 1:4.1.1-6ubuntu3
Distribution: jaunty
Urgency: low
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Colin Watson <cjwatson at ubuntu.com>
Description: 
 login      - system login tools
 passwd     - change and administer password and group data
Launchpad-Bugs-Fixed: 340841
Changes: 
 shadow (1:4.1.1-6ubuntu3) jaunty; urgency=low
 .
   [ Bryan McLellan ]
   * Don't do the vm-builder root password check on fresh installations
     (LP: #340841).
Files: 
 7e7de1e86adcad59038e427d9a1cfd6d 1710 admin required shadow_4.1.1-6ubuntu3.dsc
 a04e87d090aba533e615a661cdf65415 92578 admin required shadow_4.1.1-6ubuntu3.diff.gz
Original-Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 1:4.1.1-6ubuntu2/debian/changelog 1:4.1.1-6ubuntu3/debian/changelog
--- 1:4.1.1-6ubuntu2/debian/changelog	2009-03-17 15:22:59.000000000 +0000
+++ 1:4.1.1-6ubuntu3/debian/changelog	2009-03-17 15:22:58.000000000 +0000
@@ -1,3 +1,11 @@
+shadow (1:4.1.1-6ubuntu3) jaunty; urgency=low
+
+  [ Bryan McLellan ]
+  * Don't do the vm-builder root password check on fresh installations
+    (LP: #340841).
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Tue, 17 Mar 2009 13:32:55 +0000
+
 shadow (1:4.1.1-6ubuntu2) jaunty; urgency=low
 
   * debian/securetty.linux (LP: #316841)
diff -pruN 1:4.1.1-6ubuntu2/debian/passwd.postinst 1:4.1.1-6ubuntu3/debian/passwd.postinst
--- 1:4.1.1-6ubuntu2/debian/passwd.postinst	2009-03-17 15:22:59.000000000 +0000
+++ 1:4.1.1-6ubuntu3/debian/passwd.postinst	2009-03-17 15:22:58.000000000 +0000
@@ -18,7 +18,7 @@ configure)
     # Fix root password of '!' for vm-builder installed instances. Unrelated
     # to passwd, but seems best place. /var/log/installer won't exist in
     # vm-builder created images
-    if dpkg --compare-versions "$2" lt "1:4.1.1-5ubuntu3" && \
+    if dpkg --compare-versions "$2" lt-nl "1:4.1.1-5ubuntu3" && \
        test ! -d "/var/log/installer"; then
         if printf '!\0' | unix_chkpwd root nullok ; then
             echo 'root:!' | chpasswd -e