From 1433649a2e3f665402c6ffa91c133b797fa156ce Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@ubuntu.com>
Date: Wed, 7 Aug 2013 12:49:26 +0100
Subject: [PATCH] releasing 5.54

---
 debian/changelog      |  8 +++++---
 usr/bin/byobu-janitor | 12 ++++++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 852b2cf6..717f1006 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-byobu (5.54) unreleased; urgency=low
+byobu (5.54-0ubuntu1) saucy; urgency=low
 
-  * UNRELEASED
+  * usr/bin/byobu-janitor: LP: #1208844
+    - only enable the byobu prompt by default if the bashrc is stock;
+      ie, hasn't been locally modified
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 06 Aug 2013 22:56:38 +0100
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 07 Aug 2013 12:49:24 +0100
 
 byobu (5.53-0ubuntu1) saucy; urgency=low
 
diff --git a/usr/bin/byobu-janitor b/usr/bin/byobu-janitor
index b3ae88c8..625a67e4 100755
--- a/usr/bin/byobu-janitor
+++ b/usr/bin/byobu-janitor
@@ -113,9 +113,17 @@ killall -u $USER byobu-statusd >/dev/null 2>&1 || true
 # Clean up flag (new and old)
 rm -f "$FLAG" "/var/run/screen/S-$USER/$PKG.reload-required"
 
-# Affects: Upgrades from <= byobu 5.50, install byobu prompt
+# Affects: Upgrades from <= byobu 5.50, install byobu prompt if using stock bashrc
 if ! (grep -qs "#byobu-prompt#$" "$HOME/.bashrc") && ! [ -e "$BYOBU_CONFIG_DIR/prompt" ]; then
-	printf "[ -r $BYOBU_CONFIG_DIR/prompt ] && . $BYOBU_CONFIG_DIR/prompt   #byobu-prompt#\n" >> "$HOME/.bashrc"
+	if $BYOBU_TEST diff >/dev/null 2>&1; then
+		if  diff /etc/skel/.bashrc "$HOME/.bashrc" >/dev/null 2>&1; then
+			printf "[ -r $BYOBU_CONFIG_DIR/prompt ] && . $BYOBU_CONFIG_DIR/prompt   #byobu-prompt#\n" >> "$HOME/.bashrc"
+		fi
+	elif $BYOBU_TEST md5sum >/dev/null 2>&1; then
+		if [ "$(cat /etc/skel/.bashrc | md5sum)" = "$(cat $HOME/.bashrc | md5sum)" ]; then
+			printf "[ -r $BYOBU_CONFIG_DIR/prompt ] && . $BYOBU_CONFIG_DIR/prompt   #byobu-prompt#\n" >> "$HOME/.bashrc"
+		fi
+	fi
 fi
 [ -r "$BYOBU_CONFIG_DIR/prompt" ] || printf "[ -r ${BYOBU_PREFIX}/share/${PKG}/profiles/bashrc ] && . ${BYOBU_PREFIX}/share/${PKG}/profiles/bashrc  #byobu-prompt#\n" > "$BYOBU_CONFIG_DIR/prompt"