From 09a71bd12b4f658c5ebe2ad93989b5a2e79488da Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@canonical.com>
Date: Tue, 5 May 2009 18:24:28 -0500
Subject: [PATCH] fix up some more stray string changes for byobu rename

Signed-off-by: Dustin Kirkland <kirkland@canonical.com>
---
 byobu                   |  3 ++-
 byobu-config            |  6 +++---
 byobu.1                 | 15 +++++++++++++++
 profiles/NONE           |  4 ++--
 select-screen-profile.1 |  2 +-
 5 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 byobu.1

diff --git a/byobu b/byobu
index 28a6be64..c6062c37 100755
--- a/byobu
+++ b/byobu
@@ -20,7 +20,7 @@
 OLDPKG="screen-profiles"
 PKG="byobu"
 
-# Upgrad old config dir to the new name
+# Upgrade old config dir to the new name
 [ -d "$HOME/.$OLDKPG" -a ! -e "$HOME/.$PKG" ] && mv -f "$HOME/.$OLDPKG" "$HOME/.$PKG"
 
 # Create the .$PKG directory, if it doesn't already exist
@@ -76,6 +76,7 @@ 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"
diff --git a/byobu-config b/byobu-config
index 7380c9e1..cb2ac57c 100755
--- a/byobu-config
+++ b/byobu-config
@@ -85,7 +85,7 @@ def menu(screen, size, isInstalled):
     li.append(installtext, 8)
     bb = ButtonBar(screen, ((_("Exit"), )), compact = 1)
 
-    g = GridForm(screen, _(" Screen Profiles Configuration Menu"), 1, 2)
+    g = GridForm(screen, _(" Byobu Configuration Menu"), 1, 2)
     g.add(li, 0, 0, padding=(4,2,4,2))
     g.add(bb, 0, 1, padding=(1,1,0,0))
 
@@ -115,7 +115,7 @@ def help(screen, size, config):
 
     t = Textbox(70, 14, text, scroll=0)
     bb = ButtonBar(screen, ((_("Menu"), )), compact = 1)
-    g = GridForm(screen, _("Screen Profiles Help"), 1, 3)
+    g = GridForm(screen, _("Byobu Help"), 1, 3)
     g.add(t, 0, 0, padding=(0,0,0,0))
     g.add(bb, 0, 2, padding=(1,1,0,0))
 
@@ -463,7 +463,7 @@ def main():
 
     size = terminal_size()
     screen = SnackScreen()
-    screen.drawRootText(1,0,_(' Screen Profiles Configuration Menu'))
+    screen.drawRootText(1,0,_(' Byobu Configuration Menu'))
     screen.pushHelpLine(_('<Tab>/<Alt-Tab> between elements | <Return> Validates'))
 
     config = SafeConfigParser()
diff --git a/byobu.1 b/byobu.1
new file mode 100644
index 00000000..6db39e07
--- /dev/null
+++ b/byobu.1
@@ -0,0 +1,15 @@
+.TH byobu 1 "11 Feb 2009" byobu "byobu"
+.SH NAME
+byobu \- wrapper script for seeding a user's byobu configuration and launching screen
+
+.SH DESCRIPTION
+\fBbyobu\fP is a simple script that sanitizes a user's ~/.byobu directory, and launches screen in the byobu configuration.
+
+.TP
+\fIhttp://launchpad.net/byobu\fP
+.PD
+
+.SH AUTHOR
+This manpage and the utility was written by Dustin Kirkland <kirkland@canonical.com> for Ubuntu systems (but may be used by others).  Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 published by the Free Software Foundation.
+
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL.
diff --git a/profiles/NONE b/profiles/NONE
index 27c2816b..8bdf1379 100644
--- a/profiles/NONE
+++ b/profiles/NONE
@@ -1,8 +1,8 @@
 ###############################################################################
-#    Screen Profile
+#    NONE
 #      This configuration profile is the most basic, plain profile,
 #      (the default one that ships with screen).
-#      To clarify that this *disables* screen profiles, let's call this profile
+#      To clarify that this *disables* byobu, let's call this profile
 #      "NONE".
 #
 #    Copyright (C) 2008 Canonical Ltd.
diff --git a/select-screen-profile.1 b/select-screen-profile.1
index 9a22a998..1bdbfc67 100644
--- a/select-screen-profile.1
+++ b/select-screen-profile.1
@@ -3,7 +3,7 @@
 select\-screen\-profile \- Screen Profile Selector
 
 .SH DESCRIPTION
-\fBselect\-screen\-profile\fP is an application that lists the available screen profiles on a system and prompts the user to select one.
+\fBselect\-screen\-profile\fP is an application that lists the available byobu screen profiles on a system and prompts the user to select one.
 
 The selected profile will be symbolically linked into the current user's $HOME/.byobu/profile, if that file does not yet exist, or is currently a symbolic link.