--- byobu-2.13.orig/byobu-export
+++ byobu-2.13/byobu-export
@@ -85,22 +85,6 @@
 	exit 1
 }
 
-status_config() {
-	# Generate the status configuration
-	# Disable the menu, since configurator is not available
-	# Enable user@host in its place
-	for i in $(ls /usr/lib/$PKG/); do
-		case "$i" in
-			cpu_count|cpu_freq|date|hostname|load_average|logo|mem_available|mem_used|reboot_required|release|time|updates_available|whoami)
-				echo "$i=1"
-			;;
-			*)
-				echo "$i=0"
-			;;
-		esac
-	done
-}
-
 hr() {
 	echo "###############################################################################"
 }
@@ -135,10 +119,10 @@
 sources() {
 	# insert the common profile, replace the status exe path
 	echo
-	cat $SHARE/profiles/common | sed "s:$PKG-status:\$HOME/.$PKG/$PKG-status:"
+	cat $SHARE/profiles/common | sed "s:$PKG-:\$HOME/.$PKG/$PKG-:"
 	hr
 	echo
-	cat $SHARE/keybindings/common
+	cat $SHARE/keybindings/f-keys
 	hr
 	echo
 	hr
@@ -229,11 +213,12 @@
 # Copy status scripts
 cp -a /usr/lib/$PKG/* "$DIR/.$PKG/bin"
 cp -a /usr/bin/$PKG-status "$DIR/.$PKG"
+cp -a /usr/bin/$PKG-janitor "$DIR/.$PKG"
 
 # Generate the monolithic profile
 header > "$PROFILE"
 sources >> "$PROFILE"
-status_config > "$STATUS"
+cat /etc/$PKG/statusrc > "$STATUS"
 
 # Some gardening
 # Drop additional "source" calls
--- byobu-2.13.orig/screen-launcher-install
+++ byobu-2.13/screen-launcher-install
@@ -23,7 +23,7 @@
 install_screen_launcher() {
 	dest=$1
 	launcher="screen-launcher"
-	launcher_line="\`echo \$- | grep -qs i\` && [ -x $launcher ] && $launcher"
+	launcher_line="\`echo \$- | grep -qs i\` && $launcher"
 	# Add it at the end
 	echo "$launcher_line" >> "$dest"
 	# Hush login, since byobu will handle motd printing
--- byobu-2.13.orig/byobu-janitor
+++ byobu-2.13/byobu-janitor
@@ -0,0 +1,70 @@
+#!/bin/sh -e
+#
+#    byobu-janitor - a collection of byobu tasks that ensure  a clean
+#                    environtment and smooth upgrades
+#
+#    Copyright (C) 2009 Canonical Ltd.
+#
+#    Authors: Dustin Kirkland <kirkland@canonical.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+PKG="byobu"
+FLAG="/var/run/screen/S-$USER/$PKG.reload-required"
+
+# Exit immediately, if we're not forced, and there is no reload flag
+if [ "$1" != "--force" ] && [ ! -e "$FLAG" ]; then
+	exit 0
+fi
+
+# Set the rest of the variables
+OLDPKG="screen-profiles"
+DEFAULT_PROFILE="light"
+PROFILE="$HOME/.$PKG/profile"
+
+# Affects: Upgrades from screen-profiles
+# If the old config dir exists, but the new one doesn't, provide a migration mechanism.
+if [ -d "$HOME/.$OLDPKG" ] && [ ! -e "$HOME/.$PKG" ]; then
+	# Rename the config dir
+	mv -f "$HOME/.$OLDPKG" "$HOME/.$PKG"
+	ln -sf "$HOME/.$PKG" "$HOME/.$OLDPKG"
+	# Replace all instances of the old package name with the new
+	sed -i "s/$OLDPKG/$PKG/g" "$HOME/.$PKG"/*
+	# Fix the chosen profile symlink
+	if [ -h "$PROFILE" ]; then
+		# Determine the chosen profile color
+		profile=`readlink "$PROFILE" | sed "s:^.*-::"`
+		# Try to set that color, if it exists, otherwise set to default
+		select-screen-profile -s "$profile" >/dev/null 2>&1 || select-screen-profile -s "$DEFAULT_PROFILE" >/dev/null 2>&1
+	fi
+fi
+
+# Affects: First runs with no configuration
+# Seed the configuration
+[ -d "$HOME/.$PKG" ] || mkdir -p "$HOME/.$PKG"
+[ -r "$PROFILE" ] || select-screen-profile -s "$DEFAULT_PROFILE" >/dev/null 2>&1
+[ -s "$HOME/.$PKG/keybindings" ] || echo "source /usr/share/$PKG/keybindings/common" > "$HOME/.$PKG/keybindings"
+[ -r "$HOME/.$PKG/status" ] || touch "$HOME/.$PKG/status"
+[ -r "$HOME/.$PKG/windows" ] || touch "$HOME/.$PKG/windows"
+[ -r "$HOME/.screenrc" ] || touch "$HOME/.screenrc"
+
+# Affects: Upgrades from <= byobu-2.11
+# The status scripts used to have hyphens in their name, but now use
+# underscores such that we can source the file as a shell snippet;
+# fix existing status configuration.
+sed -i "s/-/_/g" "$HOME/.$PKG/status"
+sed -i "s/^disk.*=/disk=/" "$HOME/.$PKG/status"
+sed -i "s/^network.*=/network=/" "$HOME/.$PKG/status"
+
+# Clean up flag
+rm -f "$FLAG"
--- byobu-2.13.orig/byobu-config
+++ byobu-2.13/byobu-config
@@ -27,11 +27,13 @@
 from snack import *
 
 HOME=os.getenv("HOME")
+USER=os.getenv("USER")
 PKG="byobu"
 SHARE='/usr/share/'+PKG
 DOC='/usr/share/doc/'+PKG
 DEF_ESC="A"
-RELOAD = "If you are using the default set of keybindings, press\n<F5> to activate these changes.\n\nOtherwise, exit this screen session and start a new one."
+RELOAD = "If you are using the default set of keybindings, press\n<F5> or <ctrl-a-R> to activate these changes.\n\nOtherwise, exit this screen session and start a new one."
+RELOAD_FLAG="/var/run/screen/S-"+USER+"/"+PKG+".reload-required"
 ESC = ''
 snack.hotkeys[ESC] = ord(ESC)
 snack.hotkeys[ord(ESC)] = ESC
@@ -54,6 +56,10 @@
         return None
     return cr
 
+def reload_required():
+    f = open(RELOAD_FLAG,'w')
+    f.close()
+
 def terminal_size():                    ### decide on *some* terminal size
     cr = ioctl_GWINSZ(0) or ioctl_GWINSZ(1) or ioctl_GWINSZ(2)  # try open fds
     if not cr:                                                  # ...then ctty
@@ -72,14 +78,14 @@
 
 def menu(screen, size, isInstalled):
     if isInstalled:
-        installtext=_("Remove screen by default at login")
+        installtext=_("Byobu currently launches at login (toggle)")
     else:
-        installtext=_("Install screen by default at login")
+        installtext=_("Byobu currently does not launch at login (toggle)")
 
 
     li = Listbox(height = 8, width = 60, returnExit = 1)
     li.append(_("Help"), 1)
-    li.append(_("Change screen profile"), 2)
+    li.append(_("Change Byobu's colors"), 2)
     li.append(_("Toggle status notifications"), 3)
     li.append(_("Change keybinding set"), 4)
     li.append(_("Change escape sequence"), 5)
@@ -141,6 +147,7 @@
 
     if bb.buttonPressed(g.runOnce()) != "cancel":
         commands.getoutput('select-screen-profile --set %s' % li.current())
+	reload_required()
         button = messagebox(screen, 60, 4, _("Message"), _(RELOAD), \
             buttons=((_("Menu"), )))
     return 100
@@ -157,6 +164,7 @@
     g.add(bb, 0, 1, padding=(1,1,0,0))
     if bb.buttonPressed(g.runOnce()) != "cancel":
         switch_keybindings(li.current())
+	reload_required()
         button = messagebox(screen, 60, 4, _("Message"), _(RELOAD), \
             buttons=((_("Menu"), )))
     return 100
@@ -226,7 +234,13 @@
         f.close()
 
 def readwindows():
-    f=open(HOME+'/.'+PKG+'/windows', 'r')
+    if not os.path.isfile(HOME+'/.'+PKG+'/windows'):
+        windowsfile=SHARE+'/windows/common'
+    elif os.path.getsize(HOME+'/.'+PKG+'/windows') == 0:
+        windowsfile=SHARE+'/windows/common'
+    else:
+        windowsfile=HOME+'/.'+PKG+'/windows'
+    f=open(windowsfile)
     try:
         li=[]
         for line in f.readlines():
@@ -330,6 +344,7 @@
                 item[0] = r.getEntryValue(count)[1]
             count=count+1
         writestatus(itemlist)
+	reload_required()
         button = messagebox(screen, 60, 4, _("Message"), _(RELOAD), \
             buttons=((_("Menu"), )))
     return 100
@@ -360,7 +375,7 @@
             r.append(win[1],count,selected=win[0])
        count=count+1
 
-    bb = ButtonBar(screen, ((_("Apply"), "apply"), (_("Cancel"), "cancel"), ESC), compact = 1)
+    bb = ButtonBar(screen, ((_("Apply"), "apply"), (_("Cancel"), "cancel", ESC)), compact = 1)
 
     g = GridForm(screen, _("Select window(s) to create by default:"), 2, 4 )
     g.add(rl, 0, 0, anchorLeft=1, anchorTop=1, padding=(4,0,0,1))
@@ -382,7 +397,7 @@
     if not isInstalled:
         out = commands.getoutput("bash /usr/share/"+PKG+"/screen-launcher-install")
         if out == "":
-            out = _("Screen will be launched automatically next time you login.")
+            out = _("Byobu will be launched automatically next time you login.")
 
         button = messagebox(screen, 60, 2, "Message", out, \
         buttons=((_("Menu"), )))
@@ -390,7 +405,7 @@
     else:
         out = commands.getoutput("bash /usr/share/"+PKG+"/screen-launcher-uninstall")
         if out == "":
-            out = _("Screen will not be used next time you login.")
+            out = _("Byobu will not be used next time you login.")
 
         button = messagebox(screen, 60, 2, _("Message"), out, \
         buttons=((_("Menu"), )))
@@ -459,6 +474,7 @@
     screen.popWindow()
     if bb.buttonPressed(which) != "cancel":
         setesckey(esc.value())
+	reload_required()
         button = messagebox(screen, 60, 4, _("Message"), \
             _(RELOAD), \
             buttons=((_("Menu"), )))
@@ -473,7 +489,7 @@
     size = terminal_size()
     screen = SnackScreen()
     screen.drawRootText(1,0,_(' Byobu Configuration Menu'))
-    screen.pushHelpLine(_('<Tab>/<Alt-Tab> between elements | <Return> Validates'))
+    screen.pushHelpLine(_('<Tab>/<Alt-Tab> between elements | <Enter> selects | <Esc> exits'))
 
     config = SafeConfigParser()
 
--- byobu-2.13.orig/byobu
+++ byobu-2.13/byobu
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
-#    screen wrapper script
-#    Copyright (C) 2008 Canonical Ltd.
+#    byobu - screen wrapper script
+#    Copyright (C) 2008-2009 Canonical Ltd.
 #
 #    Authors: Dustin Kirkland <kirkland@canonical.com>
 #
@@ -17,92 +17,20 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-OLDPKG="screen-profiles"
 PKG="byobu"
-SCREEN_REAL="screen"
 
-# Upgrade old config dir to the new name
-[ -d "$HOME/.$OLDPKG" -a ! -e "$HOME/.$PKG" ] && mv -f "$HOME/.$OLDPKG" "$HOME/.$PKG"
+# Sanitize the environment
+byobu-janitor
 
-# Create the .$PKG directory, if it doesn't already exist
-[ -d "$HOME/.$PKG" ] || mkdir -p "$HOME/.$PKG"
-
-# Use $SCREENRC if non-empty, and readable; otherwise, use the one in $HOME
-[ -n "$SCREENRC" -a -r "$SCREENRC" ] || SCREENRC="$HOME/.screenrc"
-
-# If $SCREENRC exists but $HOME/.$PKG/profile does not,
-# this shows that the user has an existing custom screen configuration,
-# and thus we will not force $PKG on them.
-if [ -r "$SCREENRC" -a ! -e "$HOME/.$PKG/profile" -a ! -h "$HOME/.$PKG/profile" ]; then
-	exec $SCREEN_REAL -c "$SCREENRC" "$@"
-	exit $?
-fi
-
-# If the user is running byobu with some arguments, but has not selected
-# their profile yet, don't bother them with profile selection at this time
-if [ $# -gt 0 -a ! -h "$HOME/.$PKG/profile" ]; then
-	exec $SCREEN_REAL "$@"
-	exit $?
-fi
-
-DEFAULT_PROFILE="light"
-
-# Ensure that the user has selected a screen profile
-profile="$HOME/.$PKG/profile"
-[ -h "$profile" ] || select-screen-profile -s "$DEFAULT_PROFILE"
-
-# Previously, profiles were prepended with ubuntu-.
-# This is no longer the case, for cross-distro compatibility.
-# Try to fix broken symlinks for upgrading users, or prompt to reselect.
-if [ -h "$profile" -a ! -r "$profile" ]; then
-	if stat "$profile" | head -n1 | grep -qs ".*->.*ubuntu\-.*"; then
-		newsrc=$(stat "$profile" | head -n1 | sed "s/.*\`//" | sed "s/'.*//" | sed "s/ubuntu-//")
-		if [ -r "$newsrc" ]; then
-			ln -sf "$newsrc" "$profile"
-		else
-			select-screen-profile -s "$DEFAULT_PROFILE"
-		fi
-	elif stat "$profile" | head -n1 | grep -qs ".*->.*plain'$"; then
-		ln -sf "/usr/share/$PKG/profiles/NONE" "$profile"
-	else
-		select-screen-profile -s "$DEFAULT_PROFILE"
-	fi
-fi
-
-if [ ! -r "$profile" ]; then
-	echo
-	echo "Your selected profile is not accessible."
-	echo
-	echo "Either select a different profile:"
-	echo " $ select-screen-profile"
-	echo
-	echo "Or install the extras package:"
-	echo " $ sudo apt-get install $PKG-extras"
-	echo
-	exit 1
-fi
-
-# Ensure that their keybindings are seeded
-[ -s "$HOME/.$PKG/keybindings" ] || echo "source /usr/share/$PKG/keybindings/common" > "$HOME/.$PKG/keybindings"
-sed -i "s/$OLDPKG/$PKG/g" "$HOME/.$PKG/keybindings"
-
-# Ensure that their default windows are seeded
-[ -r "$HOME/.$PKG/windows" ] || touch "$HOME/.$PKG/windows"
-if grep -qs "^[^#]" "$HOME/.$PKG/windows"; then
-	# User has some default windows, so don't launch motd+shell
-	DEFAULT_WINDOW=
-else
-	# User has no default windows, so launch motd+shell
-	DEFAULT_WINDOW="$SHELL -c motd+shell"
-fi
-
-# Ensure that the user's $SCREENRC at least exists
-[ -r "$SCREENRC" ] || touch "$SCREENRC"
+# Launch motd+shell, unless the user has default windows set to launch
+[ -n "$SHELL" ] || SHELL="/bin/sh"
+[ -x "$SHELL" ] || SHELL="/bin/sh"
+DEFAULT_WINDOW="$SHELL -c motd+shell"
+grep -qs "^[^#]" "$HOME/.$PKG/windows" && DEFAULT_WINDOW=
 
 # Now let's execute screen!
 if [ "$#" = "0" ]; then
-	[ -n "$SHELL" -a -x "$SHELL" ] || SHELL="/bin/sh"
-	exec $SCREEN_REAL -c "/usr/share/$PKG/profiles/byoburc" $DEFAULT_WINDOW
+	exec screen -c "/usr/share/$PKG/profiles/byoburc" $DEFAULT_WINDOW
 else
-	exec $SCREEN_REAL -c "$HOME/.$PKG/profile" "$@"
+	exec screen -c "$HOME/.$PKG/profile" "$@"
 fi
--- byobu-2.13.orig/byobu-status
+++ byobu-2.13/byobu-status
@@ -17,87 +17,40 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-###########################################################
-# We should be really "nice" about gathering status:
-#renice 10 $$ >/dev/null 2>&1 || true
-#ionice -c3 -p $$ >/dev/null 2>&1 || true
-# However, this *really* slows down startup.
-# We need a good way of only doing this for updates,
-# but not at screen startup.
-###########################################################
-
 PKG="byobu"
 
-migrate() {
-	OLDPKG="screen-profiles"
-        # Rename the config dir
-        mv "$HOME/.$OLDPKG" "$HOME/.$PKG"
-        ln -s "$HOME/.$PKG" "$HOME/.$OLDPKG"
-        # Replace all instances of the old package name with the new
-        find "$HOME/.$PKG" -type f | xargs sed -i "s/$OLDPKG/$PKG/g"
-        # Fix the chosen profile symlink
-        if [ -h "$HOME/.$PKG/profile" ]; then
-                # Determine the chosen profile color
-                profile=`stat "$HOME/.$PKG/profile" | head -n1 | sed "s:^.*[/-]::" | sed "s:'$::"`
-                # Try to set that color, if it exists, otherwise default to light
-                select-screen-profile -s "$profile" || select-screen-profile -s "light"
-        fi
+find_script () {
+	# Allow for local status scripts
+	if [ -x "$HOME/.$PKG/bin/$1" ]; then
+		echo "$HOME/.$PKG/bin/$1"
+	elif [ -x "/usr/lib/$PKG/$1" ]; then
+		echo "/usr/lib/$PKG/$1"
+	else
+		echo "/bin/true"
+	fi
 }
 
-# If the old config dir exists, but the new one doesn't, provide a migration mechanism
-[ -d "$HOME/.$OLDPKG" -a ! -d "$HOME/.$PKG" ] && migrate
-
-# Allow for local status scripts
-if [ -d "$HOME/.$PKG/bin" ]; then
-	DIR="$HOME/.$PKG/bin"
-elif [ -d "/usr/lib/$PKG" ]; then
-	DIR="/usr/lib/$PKG"
-else
-	exit 1
-fi
-
-# Source status file
-if [ -r "$HOME/.$PKG/status" ]; then
-	if ! . "$HOME/.$PKG/status" ; then
-		# If sourcing fails, try replacing - with _
-		sed -i "s/-/_/g" "$HOME/.$PKG/status"
+# Source configuration
+[ -r "/etc/$PKG/statusrc" ] && . "/etc/$PKG/statusrc"
+[ -r "$HOME/.$PKG/status" ] && . "$HOME/.$PKG/status"
+
+export P="$1"
+if [ "$P" = "--detail" ]; then
+	VER=
+	if which dpkg-query >/dev/null; then
+		VER=`dpkg-query --show $PKG | awk '{print "-" $2 }'`
 	fi
-fi
-
-P="$1"
-case "$P" in
-	# default = on, user must override to turn off
-	cpu_count|cpu_freq|date|load_average|logo|mem_available|mem_used|menu|reboot_required|release|time|updates_available|uptime)
-		eval x=\$$P
-		export $P
-		[ "$x" = "0" ] && exit 0
-	;;
-	# default = off, user must override to turn on
-	arch|battery|disk|ec2_cost|hostname|ip_address|mail|network|processes|users|temp_c|temp_f|whoami|wifi_quality)
-		eval x=\$$P
-		export $P
+	printf "$PKG$VER Detailed Status Navigation\n  Expand all - zr\t\tCollapse all - zm\n  Expand one - zo\t\tCollapse one - zc\n\n"
+	for i in `ls "$DIR"`; do
+		[ "$i" = "menu" ] && continue
+		script=`find_script $i`
+		short=`$script --short | sed 's/^\s*//' | sed 's/\s*$//' | sed 's/.{[^}]*}//g'` || true
+		detail=`$script --detail | sed '/^$/d' | sed 's/^/\t/g'` || true
+		printf "%s\n\t(%s)\n" "$short" "$i"
+		[ -n "$detail" ] && printf "%s\n" "$detail"
+	done
+else
+		eval x="\$$P" || exit 1
 		[ "$x" = "1" ] || exit 0
-	;;
-	--detail)
-		VER=
-		if which dpkg-query >/dev/null; then
-			VER=`dpkg-query --show $PKG | awk '{print "-" $2 }'`
-		fi
-		printf "$PKG$VER Detailed Status Navigation\n  Expand all - zr\t\tCollapse all - zm\n  Expand one - zo\t\tCollapse one - zc\n\n"
-		for i in `ls "$DIR"`; do
-			[ "$i" = "menu" ] && continue
-			short=`"$DIR"/$i --short | sed 's/^\s*//' | sed 's/\s*$//' | sed 's/.{[^}]*}//g'` || true
-			detail=`"$DIR"/$i --detail | sed '/^$/d' | sed 's/^/\t/g'` || true
-			printf "%s\n\t(%s)\n" "$short" "$i"
-			[ -n "$detail" ] && printf "%s\n" "$detail"
-		done
-		exit 0
-	;;
-	*)
-		exit 1
-	;;
-esac
-
-if [ -f "$DIR"/"$P" -a -x "$DIR"/"$P" ]; then
-	exec "$DIR"/"$P"
+		exec $(find_script "$P")
 fi
--- byobu-2.13.orig/statusrc
+++ byobu-2.13/statusrc
@@ -0,0 +1,47 @@
+#    statusrc
+#      Byobu's default status notifications
+#      Override these in $HOME/.byobu/status
+#
+#    Copyright (C) 2009 Canonical Ltd.
+#
+#    Authors: Dustin Kirkland <kirkland@canonical.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+arch=0
+battery=0
+cpu_count=1
+cpu_freq=1
+date=1
+disk=0
+ec2_cost=0
+hostname=0
+ip_address=0
+load_average=1
+logo=1
+mail=0
+mem_available=1
+mem_used=1
+menu=1
+network=0
+processes=0
+reboot_required=1
+release=1
+temp_c=0
+temp_f=0
+time=1
+users=0
+updates_available=1
+uptime=1
+whoami=0
+wifi_quality=0
--- byobu-2.13.orig/byobu.1
+++ byobu-2.13/byobu.1
@@ -1,4 +1,4 @@
-.TH byobu 1 "11 Feb 2009" byobu "byobu"
+.TH byobu 1 "19 June 2009" byobu "byobu"
 .SH NAME
 byobu \- wrapper script for seeding a user's byobu configuration and launching screen
 
@@ -45,7 +45,7 @@
 
 \fBprocesses\fP \- total number of processes running on the system; displayed in the lower bar in black text on a dark yellow background with a trailing '&' indicating 'background processes'
 
-\fBreboot_required\fP \- symbol present if a reboot is required following a system update; displayed in the lower bar white text on a blue background by the symbol '(@)' which visually looks like a 'cycle your machine' logo
+\fBreboot_required\fP \- symbol present if a reboot is required following a system update; displayed in the lower bar white text on a blue background by the symbol '(@)' which visually looks like a 'cycle your machine' logo; additionally, reboot_required will print '<F5>' in white text on a blue background, if Byobu requires you to reload your profile to affect some changes.
 
 \fBrelease\fP \- distribution and version information about the release running on the current system as reported by \fBlsb_release(1)\fP or \fI/etc/issue\fP; displayed in the lower bar in bold black text toward the left on a grey background
 
@@ -91,9 +91,7 @@
 
 \fBCtrl-a R\fP \- Reload profile
 
-\fBCtrl-a (\fP \- Turn key bindings on
-
-\fBCtrl-a )\fP \- Turn key bindings off
+\fBCtrl-a !\fP \- Toggle key bindings on and off
 
 \fBCtrl-a k\fP \- Kill the current window
 
--- byobu-2.13.orig/windows/common
+++ byobu-2.13/windows/common
@@ -1,2 +1,5 @@
-# Default windows
-screen -t shell 0 motd+shell
+# Default windows examples
+#screen -t notify-osd -M tail -f $HOME/.cache/notify-osd.log
+#screen -t top top
+#screen -t web elinks
+#screen -t shell motd+shell
--- byobu-2.13.orig/testing/time_notifications
+++ byobu-2.13/testing/time_notifications
@@ -9,7 +9,12 @@
 }
 
 TIMEFORMAT="%R"
-for i in $(ls bin); do
+if [ -n "$1" ]; then
+	list="$1"
+else
+	list=$(ls bin)
+fi
+for i in $list; do
 	freq=`grep "byobu-status $i" ./profiles/common | awk '{print $3}'`
 	echo -n "$i $freq "
 	time loop $i
--- byobu-2.13.orig/profiles/profile.skel
+++ byobu-2.13/profiles/profile.skel
@@ -23,7 +23,7 @@
 source /usr/share/byobu/profiles/common
 
 # Window tabs, second to last line
-caption always "%{kW}%?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{kW}%?%+Lw%? %= %{= Wk}%110`%109`%122`%111`"
+caption always "%{kW}%?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{kW}%?%+Lw%? %= %{= Wk}%110`%109`%122`%111`%10`"
 
 # Status string, last line
 hardstatus string '%99`%{= Wk} %100`%112`%= %102`%101`%127`%114`%115`%108`%125`%126`%113`%119`%117`%116`%106`%104`%103`%105`%107`%123`%120`%121`'
--- byobu-2.13.orig/profiles/common
+++ byobu-2.13/profiles/common
@@ -32,6 +32,7 @@
 #   ~600   ~10 minutes
 #   ~180   ~3 minutes
 #   ~60    ~1 minute
+backtick 10 	86399	86399		byobu-janitor
 backtick 99  	86011	86011		byobu-status logo
 backtick 100	599	599		byobu-status release
 backtick 101 	181	181		byobu-status updates_available
--- byobu-2.13.orig/po/es.po
+++ byobu-2.13/po/es.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the Byobu package.
 # Nicolas Valcarcel <nvalcarcel@ubuntu.com>, 2008.
 #
-#: byobu-config:306
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-16 18:04-0500\n"
+"POT-Creation-Date: 2009-06-19 15:01-0500\n"
 "PO-Revision-Date: 2008-12-22 01:01-0500\n"
 "Last-Translator: Nicolas Valcarcel <nvalcarcel@ubuntu.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,138 +16,132 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: byobu-config:71
-msgid "Remove screen by default at login"
+#: byobu-config:75
+msgid "Do not launch Byobu by default at login"
 msgstr ""
 
-#: byobu-config:73
-msgid "Install screen by default at login"
+#: byobu-config:77
+msgid "Launch Byobu by default at login"
 msgstr ""
 
-#: byobu-config:77
+#: byobu-config:81
 msgid "Help"
 msgstr ""
 
-#: byobu-config:78
-msgid "Change screen profile"
+#: byobu-config:82
+msgid "Change Byobu's colors"
 msgstr ""
 
-#: byobu-config:79
+#: byobu-config:83
 msgid "Toggle status notifications"
 msgstr ""
 
-#: byobu-config:80
+#: byobu-config:84
 msgid "Change keybinding set"
 msgstr ""
 
-#: byobu-config:81
+#: byobu-config:85
 msgid "Change escape sequence"
 msgstr ""
 
-#: byobu-config:82
+#: byobu-config:86
 msgid "Create new window(s)"
 msgstr ""
 
-#: byobu-config:83
+#: byobu-config:87
 msgid "Manage default windows"
 msgstr ""
 
-#: byobu-config:85
-msgid "Exit"
-msgstr ""
-
-#: byobu-config:87 byobu-config:472
+#: byobu-config:91 byobu-config:475
 msgid " Byobu Configuration Menu"
 msgstr ""
 
-#: byobu-config:98
+#: byobu-config:102
 msgid "Okay"
 msgstr ""
 
-#: byobu-config:98 byobu-config:134 byobu-config:150
-#: byobu-config:185 byobu-config:313 byobu-config:355
-#: byobu-config:433
+#: byobu-config:102 byobu-config:136 byobu-config:154 byobu-config:189
+#: byobu-config:321 byobu-config:363 byobu-config:436
 msgid "Cancel"
 msgstr ""
 
-#: byobu-config:116 byobu-config:143 byobu-config:157
-#: byobu-config:326 byobu-config:380 byobu-config:388
-#: byobu-config:461
+#: byobu-config:121 byobu-config:145 byobu-config:161 byobu-config:334
+#: byobu-config:388 byobu-config:396 byobu-config:464
 msgid "Menu"
 msgstr ""
 
-#: byobu-config:117
+#: byobu-config:122
 msgid "Byobu Help"
 msgstr ""
 
-#: byobu-config:134 byobu-config:150 byobu-config:185
-#: byobu-config:313 byobu-config:355 byobu-config:433
+#: byobu-config:136 byobu-config:154 byobu-config:189 byobu-config:321
+#: byobu-config:363 byobu-config:436
 msgid "Apply"
 msgstr ""
 
-#: byobu-config:136
+#: byobu-config:138
 msgid "Which profile would you like to use?"
 msgstr ""
 
-#: byobu-config:142 byobu-config:156 byobu-config:325
-#: byobu-config:387 byobu-config:459
+#: byobu-config:144 byobu-config:160 byobu-config:333 byobu-config:395
+#: byobu-config:462
 msgid "Message"
 msgstr ""
 
-#: byobu-config:151
+#: byobu-config:155
 msgid "Which set of keybindings would you like to use?"
 msgstr ""
 
-#: byobu-config:165
+#: byobu-config:169
 msgid "Title: "
 msgstr ""
 
-#: byobu-config:167
+#: byobu-config:171
 msgid "Command: "
 msgstr ""
 
-#: byobu-config:169
+#: byobu-config:173
 msgid "Presets: "
 msgstr ""
 
-#: byobu-config:183
+#: byobu-config:187
 msgid "Add to default windows"
 msgstr ""
 
-#: byobu-config:187
+#: byobu-config:191
 msgid "Create new window(s):"
 msgstr ""
 
-#: byobu-config:314
+#: byobu-config:322
 msgid "Toggle status notifications:"
 msgstr ""
 
-#: byobu-config:347
+#: byobu-config:355
 msgid "Windows:"
 msgstr ""
 
-#: byobu-config:357
+#: byobu-config:365
 msgid "Select window(s) to create by default:"
 msgstr ""
 
-#: byobu-config:377
+#: byobu-config:385
 msgid "Screen will be launched automatically next time you login."
 msgstr ""
 
-#: byobu-config:385
+#: byobu-config:393
 msgid "Screen will not be used next time you login."
 msgstr ""
 
-#: byobu-config:432
+#: byobu-config:435
 msgid "Escape key: ctrl-"
 msgstr ""
 
-#: byobu-config:435
+#: byobu-config:438
 msgid "Change escape sequence:"
 msgstr ""
 
-#: byobu-config:473
-msgid "<Tab>/<Alt-Tab> between elements | <Return> Validates"
+#: byobu-config:476
+msgid "<Tab>/<Alt-Tab> between elements | <Enter> selects | <Esc> exits"
 msgstr ""
 
 #~ msgid "Error:"
--- byobu-2.13.orig/po/fr.po
+++ byobu-2.13/po/fr.po
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the Byobu package.
 # Nicolas Barcet <nicolas.barcet@ubuntu.com>, 2008.
 #
-#: byobu-config:306
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-16 18:04-0500\n"
+"POT-Creation-Date: 2009-06-19 15:01-0500\n"
 "PO-Revision-Date: 2008-12-17 23:42+0100\n"
 "Last-Translator: Nicolas Barcet <nicolas.barcet@ubuntu.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,138 +16,132 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: byobu-config:71
-msgid "Remove screen by default at login"
+#: byobu-config:75
+msgid "Do not launch Byobu by default at login"
 msgstr ""
 
-#: byobu-config:73
-msgid "Install screen by default at login"
+#: byobu-config:77
+msgid "Launch Byobu by default at login"
 msgstr ""
 
-#: byobu-config:77
+#: byobu-config:81
 msgid "Help"
 msgstr ""
 
-#: byobu-config:78
-msgid "Change screen profile"
+#: byobu-config:82
+msgid "Change Byobu's colors"
 msgstr ""
 
-#: byobu-config:79
+#: byobu-config:83
 msgid "Toggle status notifications"
 msgstr ""
 
-#: byobu-config:80
+#: byobu-config:84
 msgid "Change keybinding set"
 msgstr ""
 
-#: byobu-config:81
+#: byobu-config:85
 msgid "Change escape sequence"
 msgstr ""
 
-#: byobu-config:82
+#: byobu-config:86
 msgid "Create new window(s)"
 msgstr ""
 
-#: byobu-config:83
+#: byobu-config:87
 msgid "Manage default windows"
 msgstr ""
 
-#: byobu-config:85
-msgid "Exit"
-msgstr ""
-
-#: byobu-config:87 byobu-config:472
+#: byobu-config:91 byobu-config:475
 msgid " Byobu Configuration Menu"
 msgstr ""
 
-#: byobu-config:98
+#: byobu-config:102
 msgid "Okay"
 msgstr ""
 
-#: byobu-config:98 byobu-config:134 byobu-config:150
-#: byobu-config:185 byobu-config:313 byobu-config:355
-#: byobu-config:433
+#: byobu-config:102 byobu-config:136 byobu-config:154 byobu-config:189
+#: byobu-config:321 byobu-config:363 byobu-config:436
 msgid "Cancel"
 msgstr ""
 
-#: byobu-config:116 byobu-config:143 byobu-config:157
-#: byobu-config:326 byobu-config:380 byobu-config:388
-#: byobu-config:461
+#: byobu-config:121 byobu-config:145 byobu-config:161 byobu-config:334
+#: byobu-config:388 byobu-config:396 byobu-config:464
 msgid "Menu"
 msgstr ""
 
-#: byobu-config:117
+#: byobu-config:122
 msgid "Byobu Help"
 msgstr ""
 
-#: byobu-config:134 byobu-config:150 byobu-config:185
-#: byobu-config:313 byobu-config:355 byobu-config:433
+#: byobu-config:136 byobu-config:154 byobu-config:189 byobu-config:321
+#: byobu-config:363 byobu-config:436
 msgid "Apply"
 msgstr ""
 
-#: byobu-config:136
+#: byobu-config:138
 msgid "Which profile would you like to use?"
 msgstr ""
 
-#: byobu-config:142 byobu-config:156 byobu-config:325
-#: byobu-config:387 byobu-config:459
+#: byobu-config:144 byobu-config:160 byobu-config:333 byobu-config:395
+#: byobu-config:462
 msgid "Message"
 msgstr ""
 
-#: byobu-config:151
+#: byobu-config:155
 msgid "Which set of keybindings would you like to use?"
 msgstr ""
 
-#: byobu-config:165
+#: byobu-config:169
 msgid "Title: "
 msgstr ""
 
-#: byobu-config:167
+#: byobu-config:171
 msgid "Command: "
 msgstr ""
 
-#: byobu-config:169
+#: byobu-config:173
 msgid "Presets: "
 msgstr ""
 
-#: byobu-config:183
+#: byobu-config:187
 msgid "Add to default windows"
 msgstr ""
 
-#: byobu-config:187
+#: byobu-config:191
 msgid "Create new window(s):"
 msgstr ""
 
-#: byobu-config:314
+#: byobu-config:322
 msgid "Toggle status notifications:"
 msgstr ""
 
-#: byobu-config:347
+#: byobu-config:355
 msgid "Windows:"
 msgstr ""
 
-#: byobu-config:357
+#: byobu-config:365
 msgid "Select window(s) to create by default:"
 msgstr ""
 
-#: byobu-config:377
+#: byobu-config:385
 msgid "Screen will be launched automatically next time you login."
 msgstr ""
 
-#: byobu-config:385
+#: byobu-config:393
 msgid "Screen will not be used next time you login."
 msgstr ""
 
-#: byobu-config:432
+#: byobu-config:435
 msgid "Escape key: ctrl-"
 msgstr ""
 
-#: byobu-config:435
+#: byobu-config:438
 msgid "Change escape sequence:"
 msgstr ""
 
-#: byobu-config:473
-msgid "<Tab>/<Alt-Tab> between elements | <Return> Validates"
+#: byobu-config:476
+msgid "<Tab>/<Alt-Tab> between elements | <Enter> selects | <Esc> exits"
 msgstr ""
 
 #~ msgid "Error:"
--- byobu-2.13.orig/po/byobu.pot
+++ byobu-2.13/po/byobu.pot
@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: byobu-config:306
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-16 18:04-0500\n"
+"POT-Creation-Date: 2009-06-19 15:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,136 +16,130 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: byobu-config:71
-msgid "Remove screen by default at login"
+#: byobu-config:75
+msgid "Do not launch Byobu by default at login"
 msgstr ""
 
-#: byobu-config:73
-msgid "Install screen by default at login"
+#: byobu-config:77
+msgid "Launch Byobu by default at login"
 msgstr ""
 
-#: byobu-config:77
+#: byobu-config:81
 msgid "Help"
 msgstr ""
 
-#: byobu-config:78
-msgid "Change screen profile"
+#: byobu-config:82
+msgid "Change Byobu's colors"
 msgstr ""
 
-#: byobu-config:79
+#: byobu-config:83
 msgid "Toggle status notifications"
 msgstr ""
 
-#: byobu-config:80
+#: byobu-config:84
 msgid "Change keybinding set"
 msgstr ""
 
-#: byobu-config:81
+#: byobu-config:85
 msgid "Change escape sequence"
 msgstr ""
 
-#: byobu-config:82
+#: byobu-config:86
 msgid "Create new window(s)"
 msgstr ""
 
-#: byobu-config:83
+#: byobu-config:87
 msgid "Manage default windows"
 msgstr ""
 
-#: byobu-config:85
-msgid "Exit"
-msgstr ""
-
-#: byobu-config:87 byobu-config:472
+#: byobu-config:91 byobu-config:475
 msgid " Byobu Configuration Menu"
 msgstr ""
 
-#: byobu-config:98
+#: byobu-config:102
 msgid "Okay"
 msgstr ""
 
-#: byobu-config:98 byobu-config:134 byobu-config:150
-#: byobu-config:185 byobu-config:313 byobu-config:355
-#: byobu-config:433
+#: byobu-config:102 byobu-config:136 byobu-config:154 byobu-config:189
+#: byobu-config:321 byobu-config:363 byobu-config:436
 msgid "Cancel"
 msgstr ""
 
-#: byobu-config:116 byobu-config:143 byobu-config:157
-#: byobu-config:326 byobu-config:380 byobu-config:388
-#: byobu-config:461
+#: byobu-config:121 byobu-config:145 byobu-config:161 byobu-config:334
+#: byobu-config:388 byobu-config:396 byobu-config:464
 msgid "Menu"
 msgstr ""
 
-#: byobu-config:117
+#: byobu-config:122
 msgid "Byobu Help"
 msgstr ""
 
-#: byobu-config:134 byobu-config:150 byobu-config:185
-#: byobu-config:313 byobu-config:355 byobu-config:433
+#: byobu-config:136 byobu-config:154 byobu-config:189 byobu-config:321
+#: byobu-config:363 byobu-config:436
 msgid "Apply"
 msgstr ""
 
-#: byobu-config:136
+#: byobu-config:138
 msgid "Which profile would you like to use?"
 msgstr ""
 
-#: byobu-config:142 byobu-config:156 byobu-config:325
-#: byobu-config:387 byobu-config:459
+#: byobu-config:144 byobu-config:160 byobu-config:333 byobu-config:395
+#: byobu-config:462
 msgid "Message"
 msgstr ""
 
-#: byobu-config:151
+#: byobu-config:155
 msgid "Which set of keybindings would you like to use?"
 msgstr ""
 
-#: byobu-config:165
+#: byobu-config:169
 msgid "Title: "
 msgstr ""
 
-#: byobu-config:167
+#: byobu-config:171
 msgid "Command: "
 msgstr ""
 
-#: byobu-config:169
+#: byobu-config:173
 msgid "Presets: "
 msgstr ""
 
-#: byobu-config:183
+#: byobu-config:187
 msgid "Add to default windows"
 msgstr ""
 
-#: byobu-config:187
+#: byobu-config:191
 msgid "Create new window(s):"
 msgstr ""
 
-#: byobu-config:314
+#: byobu-config:322
 msgid "Toggle status notifications:"
 msgstr ""
 
-#: byobu-config:347
+#: byobu-config:355
 msgid "Windows:"
 msgstr ""
 
-#: byobu-config:357
+#: byobu-config:365
 msgid "Select window(s) to create by default:"
 msgstr ""
 
-#: byobu-config:377
+#: byobu-config:385
 msgid "Screen will be launched automatically next time you login."
 msgstr ""
 
-#: byobu-config:385
+#: byobu-config:393
 msgid "Screen will not be used next time you login."
 msgstr ""
 
-#: byobu-config:432
+#: byobu-config:435
 msgid "Escape key: ctrl-"
 msgstr ""
 
-#: byobu-config:435
+#: byobu-config:438
 msgid "Change escape sequence:"
 msgstr ""
 
-#: byobu-config:473
-msgid "<Tab>/<Alt-Tab> between elements | <Return> Validates"
+#: byobu-config:476
+msgid "<Tab>/<Alt-Tab> between elements | <Enter> selects | <Esc> exits"
 msgstr ""
--- byobu-2.13.orig/po/ru.po
+++ byobu-2.13/po/ru.po
@@ -2,13 +2,12 @@
 # translation of byobu.po to
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#: byobu-config:306
 # byobu <dubrsl@altlinux.ru>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-16 18:04-0500\n"
+"POT-Creation-Date: 2009-06-19 15:01-0500\n"
 "PO-Revision-Date: 2009-05-14 16:31+0300\n"
 "Last-Translator: byobu <dubrsl@altlinux.ru>\n"
 "Language-Team: \n"
@@ -17,137 +16,144 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: byobu-config:71
-msgid "Remove screen by default at login"
-msgstr "Убрать screen из загрузки по умолчанию"
-
-#: byobu-config:73
-msgid "Install screen by default at login"
+#: byobu-config:75
+#, fuzzy
+msgid "Do not launch Byobu by default at login"
 msgstr "Установить screen загружаться по умолчанию"
 
 #: byobu-config:77
+#, fuzzy
+msgid "Launch Byobu by default at login"
+msgstr "Установить screen загружаться по умолчанию"
+
+#: byobu-config:81
 msgid "Help"
 msgstr "Помощь"
 
-#: byobu-config:78
-msgid "Change screen profile"
-msgstr "Изменить профайл screen"
+#: byobu-config:82
+msgid "Change Byobu's colors"
+msgstr ""
 
-#: byobu-config:79
+#: byobu-config:83
 msgid "Toggle status notifications"
 msgstr "Переключатель состояния уведомлений"
 
-#: byobu-config:80
+#: byobu-config:84
 msgid "Change keybinding set"
 msgstr "Изменить привязки клавиш"
 
-#: byobu-config:81
+#: byobu-config:85
 msgid "Change escape sequence"
 msgstr "Изменение Escape-последовательности"
 
-#: byobu-config:82
+#: byobu-config:86
 msgid "Create new window(s)"
 msgstr "Создать новое окно"
 
-#: byobu-config:83
+#: byobu-config:87
 msgid "Manage default windows"
 msgstr "Управление окном по умолчанию"
 
-#: byobu-config:85
-msgid "Exit"
-msgstr "Выход"
-
-#: byobu-config:87 byobu-config:472
+#: byobu-config:91 byobu-config:475
 msgid " Byobu Configuration Menu"
 msgstr "Конфигурационное меню Byobu"
 
-#: byobu-config:98
+#: byobu-config:102
 msgid "Okay"
 msgstr "Ok"
 
-#: byobu-config:98 byobu-config:134 byobu-config:150
-#: byobu-config:185 byobu-config:313 byobu-config:355
-#: byobu-config:433
+#: byobu-config:102 byobu-config:136 byobu-config:154 byobu-config:189
+#: byobu-config:321 byobu-config:363 byobu-config:436
 msgid "Cancel"
 msgstr "Отмена"
 
-#: byobu-config:116 byobu-config:143 byobu-config:157
-#: byobu-config:326 byobu-config:380 byobu-config:388
-#: byobu-config:461
+#: byobu-config:121 byobu-config:145 byobu-config:161 byobu-config:334
+#: byobu-config:388 byobu-config:396 byobu-config:464
 msgid "Menu"
 msgstr "Меню"
 
-#: byobu-config:117
+#: byobu-config:122
 msgid "Byobu Help"
 msgstr "Помощь Byobu"
 
-#: byobu-config:134 byobu-config:150 byobu-config:185
-#: byobu-config:313 byobu-config:355 byobu-config:433
+#: byobu-config:136 byobu-config:154 byobu-config:189 byobu-config:321
+#: byobu-config:363 byobu-config:436
 msgid "Apply"
 msgstr "Применить"
 
-#: byobu-config:136
+#: byobu-config:138
 msgid "Which profile would you like to use?"
 msgstr "Какой профайл вы желаете использовать?"
 
-#: byobu-config:142 byobu-config:156 byobu-config:325
-#: byobu-config:387 byobu-config:459
+#: byobu-config:144 byobu-config:160 byobu-config:333 byobu-config:395
+#: byobu-config:462
 msgid "Message"
 msgstr "Сообщение"
 
-#: byobu-config:151
+#: byobu-config:155
 msgid "Which set of keybindings would you like to use?"
 msgstr "Какой набор привязок к клавишам хотели бы Вы использовать?"
 
-#: byobu-config:165
+#: byobu-config:169
 msgid "Title: "
 msgstr "Заголовок:"
 
-#: byobu-config:167
+#: byobu-config:171
 msgid "Command: "
 msgstr "Команда:"
 
-#: byobu-config:169
+#: byobu-config:173
 msgid "Presets: "
 msgstr "Задает:"
 
-#: byobu-config:183
+#: byobu-config:187
 msgid "Add to default windows"
 msgstr "Добавьте к окнам значения по умолчанию"
 
-#: byobu-config:187
+#: byobu-config:191
 msgid "Create new window(s):"
 msgstr "создать новое окно(а)"
 
-#: byobu-config:314
+#: byobu-config:322
 msgid "Toggle status notifications:"
 msgstr "Переключатель состояния уведомлений:"
 
-#: byobu-config:347
+#: byobu-config:355
 msgid "Windows:"
 msgstr "Окно:"
 
-#: byobu-config:357
+#: byobu-config:365
 msgid "Select window(s) to create by default:"
 msgstr "Выберите окно(на), чтобы создать по умолчанию:"
 
-#: byobu-config:377
+#: byobu-config:385
 msgid "Screen will be launched automatically next time you login."
-msgstr "Screen будет запущен автоматически следующий раз, когда Вы залогинитесь."
+msgstr ""
+"Screen будет запущен автоматически следующий раз, когда Вы залогинитесь."
 
-#: byobu-config:385
+#: byobu-config:393
 msgid "Screen will not be used next time you login."
-msgstr "Screen не будет запущен автоматически следующий раз, когда Вы залогинитесь."
+msgstr ""
+"Screen не будет запущен автоматически следующий раз, когда Вы залогинитесь."
 
-#: byobu-config:432
+#: byobu-config:435
 msgid "Escape key: ctrl-"
 msgstr ""
 
-#: byobu-config:435
+#: byobu-config:438
 msgid "Change escape sequence:"
 msgstr "Изменить Escape-последовательность"
 
-#: byobu-config:473
-msgid "<Tab>/<Alt-Tab> between elements | <Return> Validates"
+#: byobu-config:476
+#, fuzzy
+msgid "<Tab>/<Alt-Tab> between elements | <Enter> selects | <Esc> exits"
 msgstr "<Tab>/<Alt-Tab> между элементами | <Return> Приминение"
 
+#~ msgid "Remove screen by default at login"
+#~ msgstr "Убрать screen из загрузки по умолчанию"
+
+#~ msgid "Change screen profile"
+#~ msgstr "Изменить профайл screen"
+
+#~ msgid "Exit"
+#~ msgstr "Выход"
--- byobu-2.13.orig/debian/changelog
+++ byobu-2.13/debian/changelog
@@ -1,8 +1,49 @@
-byobu (2.13) unreleased; urgency=low
+byobu (2.13-0ubuntu2) karmic; urgency=low
 
-  * UNRELEASED
+  * debian/postinst: remove set -x debugging
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 19 Jun 2009 00:50:53 -0500
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Sun, 21 Jun 2009 21:11:40 -0500
+
+byobu (2.13-0ubuntu1) karmic; urgency=low
+
+  [ Dustin Kirkland ]
+  * bin/updates_available: direct which out to devnull
+  * screen-launcher-install: no need to check for executability of
+    screen-launcher
+  * byobu-config: improve the verbage of some of the menus, per
+    review with the Canonical Design Team
+  * statusrc, byobu-status, byobu-export, debian/install: source default
+    status states, rather than the big case statement, performance
+    improvement for all status, also reduces the number of places to
+    touch when a new status script is added
+  * byobu-status: move all of the cleanup hacks to byobu-janitor; create
+    a find_script() function that allows for scripts in both /usr/lib and
+    $HOME/.byobu
+  * byobu, byobu-janitor, debian/install, profiles/common,
+    profiles/profile.skel: remove janitorial logic scattered across
+    several scripts and put it in a single place; call this script before
+    launching byobu, and then only once a day or when the user refreshes
+    their profile
+  * bin/reboot_required, byobu-janitor, byobu-status, byobu.1,
+    debian/postinst: display an <F5> next to the reboot symbol, if a byobu
+    reload is required; flag this in the postinst, after upgrading byobu
+  * byobu-config: add note about ctrl-a-R to reload profile, flag the
+    reload-required file when making changes
+  * byobu-janitor: add fix for the collapsed disk* and network* status
+    items
+  * byobu-config, windows/common: add some examples in the common windows
+    file, all disabled by default;  in byobu-config, if the user's windows
+    file is empty, show the examples in the default window management
+    panel
+  * bin/ec2_cost, bin/ip_address, bin/network: get default interface from
+    /proc/net/route, much more efficient
+  * bin/network: read bytes sent/received straight from /proc; more
+    efficient
+
+  [ Ciemon Dunville ]
+  * byobu.1: reflect the keybinding toggle change to Ctrl-a-!
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Sun, 21 Jun 2009 12:44:19 -0500
 
 byobu (2.12-0ubuntu1) karmic; urgency=low
 
--- byobu-2.13.orig/debian/release.sh
+++ byobu-2.13/debian/release.sh
@@ -31,8 +31,13 @@
 
 gpg --armor --sign --detach-sig ../"$PKG"_*.orig.tar.gz
 
+sudo alien --to-rpm ../$PKG"_"$MAJOR.$minor"_all.deb"
+sudo alien --to-rpm ../$PKG"-extras_"$MAJOR.$minor"_all.deb"
+mv -f *.rpm ..
+rsync -aP ../*rpm kirkland@people.ubuntu.com:~kirkland/public_html/$PKG/rpm
+
 $PKG-export -c light -f /tmp/$PKG-export.tar.gz
-puc /tmp/$PKG-export.tar.gz
+rsync -aP /tmp/$PKG-export.tar.gz kirkland@people.ubuntu.com:~kirkland/public_html
 
 echo
 echo
--- byobu-2.13.orig/debian/postinst
+++ byobu-2.13/debian/postinst
@@ -11,4 +11,12 @@
         dpkg-divert --package "$PKG" --rename --remove /usr/bin/screen
 fi
 
+# Notify users that they should reload their profile
+DIR="/var/run/screen"
+for d in $(ls "$DIR"); do
+	touch "$DIR/$d/$PKG.reload-required"
+	u=$(echo "$d" | sed "s:^S-::")
+	chown $u:$u "$DIR/$d/$PKG.reload-required"
+done
+
 #DEBHELPER#
--- byobu-2.13.orig/debian/install
+++ byobu-2.13/debian/install
@@ -7,12 +7,14 @@
 profiles/dark usr/share/byobu/profiles
 profiles/light usr/share/byobu/profiles
 keybindings/* usr/share/byobu/keybindings
+statusrc etc/byobu
 windows/common usr/share/byobu/windows
 select-screen-profile usr/bin
 byobu usr/bin
 byobu-config usr/bin
 byobu-status usr/bin
 byobu-status-detail usr/bin
+byobu-janitor usr/bin
 screen-launcher-install usr/share/byobu
 screen-launcher-uninstall usr/share/byobu
 motd+shell usr/bin
--- byobu-2.13.orig/bin/network
+++ byobu-2.13/bin/network
@@ -23,7 +23,7 @@
 if [ -r "$HOME/.$PKG/network" ]; then
 	interface=`cat "$HOME/.$PKG/network"`
 else
-	interface=`/sbin/route -n | tail -n 1 | sed "s/^.* //"`
+	interface=`tail -n1 /proc/net/route  | awk '{print $1}'`
 fi
 
 if [ "$1" = "--detail" ]; then
@@ -32,7 +32,6 @@
 fi
 
 t2=`date +%s`
-ifconfig=`ifconfig "$interface" | grep "RX bytes:"`
 for i in up down; do
 	cache="/var/run/screen/S-$USER/$PKG.network_$i"
 	t1=`stat -c %Y "$cache"` 2>/dev/null || t1=0
@@ -43,10 +42,10 @@
 		x1=`cat "$cache"` 2>/dev/null || tx1=0
 		if [ "$i" = "up" ]; then
 			symbol="^"
-			x2=`echo "$ifconfig" | sed "s/^.*TX bytes://" | awk '{print $1}'`
+			x2=`grep -m1 "$interface:" /proc/net/dev | sed "s/^.*://" | awk '{print $9}'`
 		else
 			symbol="v"
-			x2=`echo "$ifconfig" | sed "s/^.*RX bytes://" | awk '{print $1}'`
+			x2=`grep -m1 "$interface:" /proc/net/dev | sed "s/^.*://" | awk '{print $1}'`
 		fi
 		echo "$x2" > "$cache"
 		rate=`echo "$t1" "$t2" "$x1" "$x2" | awk '{printf "%.0f", ($4 - $3) / ($2 - $1) / 1024 }'`
--- byobu-2.13.orig/bin/reboot_required
+++ byobu-2.13/bin/reboot_required
@@ -17,15 +17,18 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-flag="/var/run/reboot-required"
+PKG="byobu"
+reboot="/var/run/reboot-required"
+reload="/var/run/screen/S-$USER/$PKG.reload-required"
 case "$1" in
 	--detail)
-		ls -alF "$flag" 2>&1
+		ls -alF "$reboot" "$reload" 2>&1
 	;;
 	--short)
-		[ -e "$flag" ] && printf "Yes" || printf "No"
+		[ -e "$reboot" ] && printf "Yes" || printf "No"
 	;;
 	*)
-		[ -e "$flag" ] && printf "\005{=b bW}(@)\005{-} " || exit 0
+		[ -e "$reboot" ] && printf "\005{=b bW}(@)\005{-} "
+		[ -e "$reload" ] && printf "\005{=b bW}<F5>\005{-} "
 	;;
 esac
--- byobu-2.13.orig/bin/updates_available
+++ byobu-2.13/bin/updates_available
@@ -97,13 +97,13 @@
 if [ -x /usr/lib/update-notifier/apt-check ]; then
 	# If apt-check binary exists, use it
 	/usr/lib/update-notifier/apt-check 2>&1 | tail -n 1 | sed "s/;/ /" > $mycache &
-elif which apt-get 2>/dev/null; then
+elif which apt-get >/dev/null; then
 	# If apt-get exists, use it
 	apt-get -s -o Debug::NoLocking=true upgrade | grep -c ^Inst > $mycache &
-elif which zypper; then
+elif which zypper >/dev/null; then
 	# If zypper exists, use it
 	zypper --no-refresh lu --best-effort | grep 'v |' | wc -l > $mycache &
-elif which yum; then
+elif which yum >/dev/null; then
 	# If yum exists, use it
 	# TODO: We need a better way of counting updates available from a RH expert
 	yum list updates | egrep -v "Updated Packages|Loaded plugins" | wc -l > $mycache &
--- byobu-2.13.orig/bin/ec2_cost
+++ byobu-2.13/bin/ec2_cost
@@ -50,7 +50,7 @@
 TX_RATE="0.17"
 
 # Auto detect network interface
-IF=`/sbin/route -n | grep "0\.0\.0\.0" | tail -n1 | awk '{print $8}'`
+IF=`tail -n1 /proc/net/route  | awk '{print $1}'`
 
 ifconfig_out=`/sbin/ifconfig "$IF"`
 
--- byobu-2.13.orig/bin/mem_available
+++ byobu-2.13/bin/mem_available
@@ -24,7 +24,8 @@
 	exit 0
 fi
 
-. "$HOME/.$PKG/status" 2>/dev/null || true
+. "/etc/$PKG/statusrc"
+. "$HOME/.$PKG/status"
 [ "$mem_used" = "1" ] && comma="," || whitespace=" "
 
 mem=`free | grep -m 1 "^Mem:" | awk '{print $2}'`
--- byobu-2.13.orig/bin/ip_address
+++ byobu-2.13/bin/ip_address
@@ -24,11 +24,12 @@
 	exit 0
 fi
 
-. "$HOME/.$PKG/status" 2>/dev/null || true
+. "/etc/$PKG/statusrc"
+. "$HOME/.$PKG/status"
 [ "$hostname" = "1" ] && space=" "
 [ "$whoami" = "1" ] && space=" "
 
-interface=`/sbin/route -n | tail -n 1 | sed "s/^.* //"`
+interface=`tail -n1 /proc/net/route  | awk '{print $1}'`
 ipaddr=`/sbin/ifconfig "$interface" | grep "inet addr:" | sed "s/^.*inet addr://" | sed "s/ .*$//"`
 
 printf "%s\005{+b }%s\005{-}" "$space" "$ipaddr"
--- byobu-2.13.orig/bin/hostname
+++ byobu-2.13/bin/hostname
@@ -24,7 +24,8 @@
 	exit 0
 fi
 
-. "$HOME/.$PKG/status" 2>/dev/null || true
+. "/etc/$PKG/statusrc"
+. "$HOME/.$PKG/status"
 [ "$whoami" = "1" ] && at="@"
 
 printf "\005{+b }%s%s\005{-}" "$at" $(hostname -s 2>/dev/null || hostname)