diff --recursive --new-file --unified --exclude=.svn --exclude=.git /ram/gitcmp/user-setup/1.24/svn/debian/changelog /ram/gitcmp/user-setup/1.24/git/debian/changelog
--- /ram/gitcmp/user-setup/1.24/svn/debian/changelog	2009-05-20 13:22:19.947277000 +0200
+++ /ram/gitcmp/user-setup/1.24/git/debian/changelog	2009-08-06 23:23:40.679160006 +0200
@@ -1,3 +1,11 @@
+user-setup (1.25) unstable; urgency=low
+
+  * Brown paper bag release
+  * Do not use chpasswd when the password has been preseeded.
+    Thanks to Nicolas François for pointing this.
+
+ -- Christian Perrier <bubulle@debian.org>  Wed, 20 May 2009 19:31:55 +0200
+
 user-setup (1.24) unstable; urgency=low
 
   [ Colin Watson ]
diff --recursive --new-file --unified --exclude=.svn --exclude=.git /ram/gitcmp/user-setup/1.24/svn/user-setup-apply /ram/gitcmp/user-setup/1.24/git/user-setup-apply
--- /ram/gitcmp/user-setup/1.24/svn/user-setup-apply	2009-05-20 08:44:27.473462000 +0200
+++ /ram/gitcmp/user-setup/1.24/git/user-setup-apply	2009-08-06 23:23:40.687159648 +0200
@@ -30,10 +30,11 @@
 	PASSWD="$2"
 	if [ "$3" = true ]; then
 		$chroot $ROOT usermod --password=$PASSWD $USER
-	fi
-	$chroot $ROOT chpasswd $OPTS <<EOF
+	else
+		$chroot $ROOT chpasswd $OPTS <<EOF
 $USER:$PASSWD
 EOF
+	fi
 }
 
 # Enable/disable shadow passwords.
