From 78c079fbddcd87bc7d1972a9871062803a8d321e Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@ubuntu.com>
Date: Mon, 23 Aug 2010 17:18:53 -0400
Subject: [PATCH] usr/bin/byobu-janitor: fix upgrades where one's window list
 might have motd+shell, LP: #589715

---
 debian/changelog      | 2 ++
 usr/bin/byobu-janitor | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8cae42a0..2d578a03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ byobu (3.2) unreleased; urgency=low
   * configure.ac: POSIX sed doesn't include -i option, LP: #619328, #622640
   * usr/bin/byobu-janitor: improve dash replacement in status config,
     LP: #598488
+  * usr/bin/byobu-janitor: fix upgrades where one's window list might have
+    motd+shell, LP: #589715
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 03 Aug 2010 15:19:23 -0400
 
diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor
index 4bc036b8..c8e9e165 100755
--- a/usr/bin/byobu-janitor
+++ b/usr/bin/byobu-janitor
@@ -151,5 +151,11 @@ if grep -qs " $PKG-launcher$" "$HOME"/.profile; then
 	$PKG-launcher-install
 fi
 
+# Affects: Upgrades from <= byobu-2.78 which might have "motd+shell"
+# in their window list; update this to just "shell"
+if grep -qs "motd+shell" "$HOME/.$PKG/windows"; then
+	sed -i "s/motd+shell/shell/g" "$HOME/.$PKG/windows" || true
+fi
+
 # Clean up flag
 rm -f "$FLAG"