From 28aab33ec79c69ff1f5fc421076193429b0bc1fb Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@x200>
Date: Mon, 3 May 2010 09:03:47 -0500
Subject: [PATCH] bin/byobu, bin/byobu-janitor, share/byobu/profiles/byoburc:
 add support for different window sets, LP: #517796

---
 debian/changelog                 | 2 ++
 usr/bin/byobu                    | 1 +
 usr/bin/byobu-janitor            | 1 +
 usr/share/byobu/profiles/byoburc | 1 +
 4 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 04fc8cc6..8afe1ef2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ byobu (2.74) unreleased; urgency=low
 
   * usr/lib/byobu/disk_io: fix regex to support RAID devices, LP: #572855
   * debian/postinst: make debconf question failsafe, LP: #569041
+  * bin/byobu, bin/byobu-janitor, share/byobu/profiles/byoburc: add support
+    for different window sets, LP: #517796
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 28 Apr 2010 23:11:14 -0500
 
diff --git a/usr/bin/byobu b/usr/bin/byobu
index 30f6b794..a427c56c 100755
--- a/usr/bin/byobu
+++ b/usr/bin/byobu
@@ -40,6 +40,7 @@ printf "\033]0;${USER}@$(hostname) - ${PKG}\007"
 
 # Launch motd+shell, unless the user has default windows set to launch
 grep -qs "^[^#]" "$HOME/.$PKG/windows" && DEFAULT_WINDOW= || DEFAULT_WINDOW="motd+shell"
+[ -r "$BYOBU_WINDOWS" ] && cat "$BYOBU_WINDOWS" > "$HOME/.$PKG/.windows-tmp"
 
 # Check if our terminfo supports 256 colors
 [ -x /usr/bin/tput ] && [ $(/usr/bin/tput colors 2>/dev/null || echo 0) -eq 256 ] && SCREEN_TERM="-T screen-256color"
diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor
index 618b174b..05f4f444 100755
--- a/usr/bin/byobu-janitor
+++ b/usr/bin/byobu-janitor
@@ -90,6 +90,7 @@ fi
 [ -r "$HOME/.$PKG/status" ] || $(grep -A 999999 BEGIN_CUT_HERE /etc/$PKG/statusrc | grep -B 999999 END_CUT_HERE | grep -v CUT > "$HOME/.$PKG/status")
 [ -r "$HOME/.$PKG/windows" ] || touch "$HOME/.$PKG/windows"
 [ -r "$HOME/.screenrc" ] || touch "$HOME/.screenrc"
+echo > "$HOME/.$PKG/.windows-tmp"
 
 # Affects: Upgrades from <= byobu-2.11
 # The status scripts used to have hyphens in their name, but now use
diff --git a/usr/share/byobu/profiles/byoburc b/usr/share/byobu/profiles/byoburc
index 09437bdc..9530ff44 100644
--- a/usr/share/byobu/profiles/byoburc
+++ b/usr/share/byobu/profiles/byoburc
@@ -21,4 +21,5 @@
 
 source $HOME/.byobu/profile
 source $HOME/.byobu/windows
+source $HOME/.byobu/.windows-tmp
 source $HOME/.screenrc