diff -u plymouth-0.8.3/debian/control plymouth-0.8.3/debian/control
--- plymouth-0.8.3/debian/control
+++ plymouth-0.8.3/debian/control
@@ -1,8 +1,7 @@
 Source: plymouth
 Section: misc
 Priority: optional
-Maintainer: Daniel Baumann <daniel@lists.debian-maintainers.org>
-Uploaders: Daniel Baumann <daniel@debian.org>
+Maintainer: Julien Cristau <jcristau@debian.org>
 Build-Depends:
  debhelper (>= 7.0.50~), autotools-dev, libdrm-dev, libgtk2.0-dev,
  libpango1.0-dev (>= 1.21), libpng-dev, pkg-config, sharutils, quilt (>= 0.46-7)
diff -u plymouth-0.8.3/debian/changelog plymouth-0.8.3/debian/changelog
--- plymouth-0.8.3/debian/changelog
+++ plymouth-0.8.3/debian/changelog
@@ -1,3 +1,13 @@
+plymouth (0.8.3-9.1) testing; urgency=low
+
+  * Non-maintainer upload.
+  * Cherry-pick "[terminal] don't stomp over original tty lock settings".
+    Prevents setting tty1 in 'echo' mode after boot (closes: 595178).
+  * Set myself as maintainer for squeeze, Daniel doesn't want to support this
+    package there.
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 13 Oct 2010 17:20:32 +0200
+
 plymouth (0.8.3-9) unstable; urgency=high
 
   * Removing superfluous reference to intel_agp and drm in
only in patch2:
unchanged:
--- plymouth-0.8.3.orig/src/libply-splash-core/ply-terminal.c
+++ plymouth-0.8.3/src/libply-splash-core/ply-terminal.c
@@ -188,7 +188,8 @@
   if (tcsetattr (terminal->fd, TCSANOW, &term_attributes) != 0)
     return false;
 
-  if (ioctl (terminal->fd, TIOCGLCKTRMIOS, &locked_term_attributes) == 0)
+  if (!terminal->original_locked_term_attributes_saved &&
+      ioctl (terminal->fd, TIOCGLCKTRMIOS, &locked_term_attributes) == 0)
     {
       terminal->original_locked_term_attributes = locked_term_attributes;
       terminal->original_locked_term_attributes_saved = true;