From 4c8f23e182189ece75dce045fa15dc2fd59a9a6b Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@canonical.com>
Date: Tue, 26 May 2009 16:48:59 +0200
Subject: [PATCH]   * byobu, debian/postrm, debian/preinst, debian/rules,
 screen-launcher:     remove the dpkg diversion on /usr/bin/screen as this has
 proven     to be controversial; users will need to call "byobu" to launch    
 a byobu-style screen session

Signed-off-by: Dustin Kirkland <kirkland@canonical.com>
---
 byobu            | 12 +-----------
 debian/changelog |  7 +++++--
 debian/postrm    |  2 +-
 debian/preinst   |  6 ++++--
 debian/rules     |  1 -
 screen-launcher  |  4 ++--
 6 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/byobu b/byobu
index a5ad29fb..bf8ed83a 100755
--- a/byobu
+++ b/byobu
@@ -19,17 +19,7 @@
 
 OLDPKG="screen-profiles"
 PKG="byobu"
-
-# Support Debian/Ubuntu's diversion for /usr/bin/screen, but also
-# Red Hat and others who do not divert
-if [ -x "/usr/bin/screen.real" ]; then
-	SCREEN_REAL="/usr/bin/screen.real"
-elif [ -x "/usr/bin/screen" -a "$0" != "/usr/bin/screen" ]; then
-	SCREEN_REAL="/usr/bin/screen"
-else
-	echo "ERROR: Cannot determine your actual screen binary" 1>&2
-	exit 1
-fi
+SCREEN_REAL="/usr/bin/screen"
 
 # Upgrade old config dir to the new name
 [ -d "$HOME/.$OLDKPG" -a ! -e "$HOME/.$PKG" ] && mv -f "$HOME/.$OLDPKG" "$HOME/.$PKG"
diff --git a/debian/changelog b/debian/changelog
index 01a82e87..f10e6bec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 byobu (2.6) unreleased; urgency=low
 
-  * UNRELEASED
+  * byobu, debian/postrm, debian/preinst, debian/rules, screen-launcher:
+    remove the dpkg diversion on /usr/bin/screen as this has proven
+    to be controversial; users will need to call "byobu" to launch
+    a byobu-style screen session
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 26 May 2009 12:00:27 +0200
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 26 May 2009 16:47:40 +0200
 
 byobu (2.5-0ubuntu1) karmic; urgency=low
 
diff --git a/debian/postrm b/debian/postrm
index e324238b..6b941544 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -2,7 +2,7 @@
 
 PKG="byobu"
 
-if [ "$1" = "remove" ]; then
+if [ -x "/usr/bin/screen.real" ]; then
 	dpkg-divert --package "$PKG" --rename --remove /usr/bin/screen
 fi
 
diff --git a/debian/preinst b/debian/preinst
index 521673ba..597e1169 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -2,8 +2,10 @@
 
 PKG="byobu"
 
-if [ "$1" = install -o "$1" = upgrade ]; then
-	dpkg-divert --package "$PKG" --divert /usr/bin/screen.real --rename /usr/bin/screen
+if [ -x "/usr/bin/screen.real" ]; then
+	# Byobu used to divert the real /usr/bin/screen, but we don't
+	# do this anymore; clean up old diversion if upgrading
+        dpkg-divert --package "$PKG" --rename --remove /usr/bin/screen
 fi
 
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 85bed1d7..2cb0cc9d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,6 @@ install: build install-po
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_link usr/bin/byobu usr/bin/screen
 	dh_link usr/bin/byobu-status usr/bin/screen-profiles-status
 	dh_install -X.bzr
 
diff --git a/screen-launcher b/screen-launcher
index ca1edfee..87da1654 100755
--- a/screen-launcher
+++ b/screen-launcher
@@ -27,8 +27,8 @@
 
 out=`screen -ls 2>/dev/null` || true
 if echo "$out" | grep -qsi "^No Sockets found in "; then
-	# Start new session
-	exec screen
+	# Start new byobu session
+	exec byobu
 else
 	# Re-attach to an existing session
 	exec screen -xRR