From ba72a9a7a25103995076c0a4254fdc5aafc5e5eb Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@ubuntu.com>
Date: Fri, 26 Jul 2013 16:38:56 -0500
Subject: [PATCH] usr/bin/byobu-disable-prompt, usr/bin/byobu-enable-prompt,
 usr/bin/Makefile.am, usr/share/byobu/profiles/ps1.sh,
 usr/share/man/man1/byobu-disable-prompt.1,
 usr/share/man/man1/byobu-enable-prompt.1,

---
 debian/changelog                                     |  8 ++++----
 usr/bin/Makefile.am                                  |  2 +-
 ...obu-disable-color-prompt => byobu-disable-prompt} |  4 ++--
 ...byobu-enable-color-prompt => byobu-enable-prompt} |  6 +++---
 usr/share/man/man1/Makefile.am                       |  2 +-
 usr/share/man/man1/byobu-disable-color-prompt.1      |  1 -
 usr/share/man/man1/byobu-disable-prompt.1            |  1 +
 ...u-enable-color-prompt.1 => byobu-enable-prompt.1} | 12 ++++++------
 8 files changed, 18 insertions(+), 18 deletions(-)
 rename usr/bin/{byobu-disable-color-prompt => byobu-disable-prompt} (90%)
 rename usr/bin/{byobu-enable-color-prompt => byobu-enable-prompt} (93%)
 delete mode 100644 usr/share/man/man1/byobu-disable-color-prompt.1
 create mode 100644 usr/share/man/man1/byobu-disable-prompt.1
 rename usr/share/man/man1/{byobu-enable-color-prompt.1 => byobu-enable-prompt.1} (64%)

diff --git a/debian/changelog b/debian/changelog
index a5101ba4..a675018b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,10 @@ byobu (5.48) unreleased; urgency=low
   * usr/lib/byobu/include/shutil:
     - drop "bright" designations, which don't seem to be working properly
       most places
-  * usr/bin/byobu-disable-color-prompt, usr/bin/byobu-enable-color-
-    prompt, usr/bin/Makefile.am, usr/share/byobu/profiles/ps1.sh,
-    usr/share/man/man1/byobu-disable-color-prompt.1,
-    usr/share/man/man1/byobu-enable-color-prompt.1,
+  * usr/bin/byobu-disable-prompt, usr/bin/byobu-enable-prompt,
+    usr/bin/Makefile.am, usr/share/byobu/profiles/ps1.sh,
+    usr/share/man/man1/byobu-disable-prompt.1,
+    usr/share/man/man1/byobu-enable-prompt.1,
     usr/share/man/man1/Makefile.am:
     - add a utility that installs and uninstalls a nicer color prompt
       into the local shell configuration
diff --git a/usr/bin/Makefile.am b/usr/bin/Makefile.am
index e0b07cb8..d00fae9b 100644
--- a/usr/bin/Makefile.am
+++ b/usr/bin/Makefile.am
@@ -1,4 +1,4 @@
-bin_SCRIPTS = byobu  byobu-config  byobu-ctrl-a  byobu-disable  byobu-disable-color-prompt  byobu-enable  byobu-enable-color-prompt  byobu-export  byobu-janitor  byobu-keybindings  byobu-launch  byobu-launcher  byobu-launcher-install  byobu-launcher-uninstall  byobu-layout  byobu-quiet  byobu-reconnect-sockets  byobu-select-backend  byobu-select-profile  byobu-select-session  byobu-silent  byobu-status  byobu-status-detail  byobu-shell byobu-ugraph byobu-ulevel
+bin_SCRIPTS = byobu  byobu-config  byobu-ctrl-a  byobu-disable  byobu-disable-prompt  byobu-enable  byobu-enable-prompt  byobu-export  byobu-janitor  byobu-keybindings  byobu-launch  byobu-launcher  byobu-launcher-install  byobu-launcher-uninstall  byobu-layout  byobu-quiet  byobu-reconnect-sockets  byobu-select-backend  byobu-select-profile  byobu-select-session  byobu-silent  byobu-status  byobu-status-detail  byobu-shell byobu-ugraph byobu-ulevel
 
 install-exec-hook:
 	cd $(DESTDIR)$(bindir) && rm -f byobu-screen && $(LN_S) byobu byobu-screen
diff --git a/usr/bin/byobu-disable-color-prompt b/usr/bin/byobu-disable-prompt
similarity index 90%
rename from usr/bin/byobu-disable-color-prompt
rename to usr/bin/byobu-disable-prompt
index 0b84d3c7..632d7893 100755
--- a/usr/bin/byobu-disable-color-prompt
+++ b/usr/bin/byobu-disable-prompt
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-#    byobu-disable-color-prompt
+#    byobu-disable-prompt
 #    Copyright (C) 2013 Dustin Kirkland
 #
 #    Authors: Dustin Kirkland <kirkland@byobu.co>
@@ -22,6 +22,6 @@ PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
-$BYOBU_SED -i -e "/^PS1=.*#byobu-color-prompt#$/d" "$HOME/.bashrc"
+$BYOBU_SED -i -e "/^PS1=.*#byobu-prompt#$/d" "$HOME/.bashrc"
 
 # vi: syntax=sh ts=4 noexpandtab
diff --git a/usr/bin/byobu-enable-color-prompt b/usr/bin/byobu-enable-prompt
similarity index 93%
rename from usr/bin/byobu-enable-color-prompt
rename to usr/bin/byobu-enable-prompt
index f8fc701b..2c4b7f6e 100755
--- a/usr/bin/byobu-enable-color-prompt
+++ b/usr/bin/byobu-enable-prompt
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-#    byobu-enable-color-prompt
+#    byobu-enable-prompt
 #    Copyright (C) 2013 Dustin Kirkland
 #
 #    Authors: Dustin Kirkland <kirkland@byobu.co>
@@ -22,9 +22,9 @@ PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
 . "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
-byobu-disable-color-prompt || true
+byobu-disable-prompt || true
 cat >>"$HOME/.bashrc" <<EOF
-PS1="${debian_chroot:+($debian_chroot)}\[\e[00;31m\]\u\[\e[00;30m\]@\[\e[00;36m\]\h\[\e[00m\]:\[\e[00;32m\]\w\[\e[00m\]\$ " #byobu-color-prompt#
+PS1="${debian_chroot:+($debian_chroot)}\[\e[00;31m\]\u\[\e[00;30m\]@\[\e[00;36m\]\h\[\e[00m\]:\[\e[00;32m\]\w\[\e[00m\]\$ " #byobu-prompt#
 EOF
 
 echo
diff --git a/usr/share/man/man1/Makefile.am b/usr/share/man/man1/Makefile.am
index 069e6089..a24ab81a 100644
--- a/usr/share/man/man1/Makefile.am
+++ b/usr/share/man/man1/Makefile.am
@@ -1 +1 @@
-man_MANS = byobu.1 byobu-config.1 byobu-ctrl-a.1 byobu-disable.1 byobu-disable-color-prompt.1 byobu-enable.1 byobu-enable-color-prompt.1 byobu-export.1 byobu-janitor.1 byobu-keybindings.1 byobu-launch.1 byobu-launcher.1 byobu-launcher-install.1 byobu-launcher-uninstall.1 byobu-layout.1  byobu-quiet.1 byobu-reconnect-sockets.1 byobu-screen.1 byobu-select-backend.1 byobu-select-profile.1 byobu-select-session.1 byobu-shell.1 byobu-silent.1 byobu-status.1 byobu-status-detail.1 byobu-tmux.1
+man_MANS = byobu.1 byobu-config.1 byobu-ctrl-a.1 byobu-disable.1 byobu-disable-prompt.1 byobu-enable.1 byobu-enable-prompt.1 byobu-export.1 byobu-janitor.1 byobu-keybindings.1 byobu-launch.1 byobu-launcher.1 byobu-launcher-install.1 byobu-launcher-uninstall.1 byobu-layout.1  byobu-quiet.1 byobu-reconnect-sockets.1 byobu-screen.1 byobu-select-backend.1 byobu-select-profile.1 byobu-select-session.1 byobu-shell.1 byobu-silent.1 byobu-status.1 byobu-status-detail.1 byobu-tmux.1
diff --git a/usr/share/man/man1/byobu-disable-color-prompt.1 b/usr/share/man/man1/byobu-disable-color-prompt.1
deleted file mode 100644
index 920e43be..00000000
--- a/usr/share/man/man1/byobu-disable-color-prompt.1
+++ /dev/null
@@ -1 +0,0 @@
-.so man1/byobu-enable-color-prompt.1
diff --git a/usr/share/man/man1/byobu-disable-prompt.1 b/usr/share/man/man1/byobu-disable-prompt.1
new file mode 100644
index 00000000..4d8b244b
--- /dev/null
+++ b/usr/share/man/man1/byobu-disable-prompt.1
@@ -0,0 +1 @@
+.so man1/byobu-enable-prompt.1
diff --git a/usr/share/man/man1/byobu-enable-color-prompt.1 b/usr/share/man/man1/byobu-enable-prompt.1
similarity index 64%
rename from usr/share/man/man1/byobu-enable-color-prompt.1
rename to usr/share/man/man1/byobu-enable-prompt.1
index a75a31e7..0a0b6c4e 100644
--- a/usr/share/man/man1/byobu-enable-color-prompt.1
+++ b/usr/share/man/man1/byobu-enable-prompt.1
@@ -1,16 +1,16 @@
-.TH byobu-enable-color-prompt 1 "26 July 2013" byobu "byobu"
+.TH byobu-enable-prompt 1 "26 July 2013" byobu "byobu"
 .SH NAME
-byobu-enable-color-prompt, byobu-disable-color-prompt \- add and remove a nice color prompt to your shell configuration
+byobu-enable-prompt, byobu-disable-prompt \- add and remove a nice color prompt to your shell configuration
 
 .SH SYNOPSIS
-\fBbyobu-enable-color-prompt\fP
+\fBbyobu-enable-prompt\fP
 .TP
-\fBbyobu-disable-color-prompt\fP
+\fBbyobu-disable-prompt\fP
 
 .SH DESCRIPTION
-\fBbyobu-enable-color-prompt\fP will add one line to your \fI~/.bashrc\fP.
+\fBbyobu-enable-prompt\fP will add one line to your \fI~/.bashrc\fP.
 
-\fBbyobu-disable-color-prompt\fP will remove its color configuration from \fI~/.bashrc\fP.
+\fBbyobu-disable-prompt\fP will remove its color configuration from \fI~/.bashrc\fP.
 
 .SH "BUGS"