From 7e81b4361913a154868f774e7d90407aa6442e64 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@x200>
Date: Mon, 28 Jun 2010 07:13:21 -0500
Subject: [PATCH] byobu, byobu-select-session: name new byobu sessions, only
 select byobu sessions, LP: #599334

---
 debian/changelog             | 2 ++
 usr/bin/byobu                | 6 +++---
 usr/bin/byobu-select-session | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9a502d9e..3f01ff2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ byobu (2.81) unreleased; urgency=low
   * debian/release,sh, debian/release-build.sh: drop, no longer needed,
     now in lp:~kirkland/+junk/bin
   * usr/bin/byobu-janitor: clean up launch gardening code
+  * byobu, byobu-select-session: name new byobu sessions, only select byobu
+    sessions, LP: #599334
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 16 Jun 2010 12:46:29 -0500
 
diff --git a/usr/bin/byobu b/usr/bin/byobu
index 1a78f783..17853de2 100755
--- a/usr/bin/byobu
+++ b/usr/bin/byobu
@@ -70,7 +70,7 @@ if [ "$#" = "0" ]; then
 	out=$(screen -wipe 2>/dev/null) || true
 	if [ "$CUSTOM_WINDOW_SET" = "1" ]; then
 		# Start new custom window set session
-		exec screen $SCREEN_TERM $PROFILE
+		exec screen $SCREEN_TERM -S $PKG $PROFILE
 	else
 		case "$out" in
 			*\(*\)*)
@@ -79,11 +79,11 @@ if [ "$#" = "0" ]; then
 			;;
 			*)
 				# Start new default session
-				exec screen $SCREEN_TERM $PROFILE $DEFAULT_WINDOW
+				exec screen $SCREEN_TERM -S $PKG $PROFILE $DEFAULT_WINDOW
 			;;
 		esac
 	fi
 else
 	# Launch with command line args
-	exec screen $SCREEN_TERM $PROFILE "$@"
+	exec screen $SCREEN_TERM -S $PKG $PROFILE "$@"
 fi
diff --git a/usr/bin/byobu-select-session b/usr/bin/byobu-select-session
index 92615c5b..5a60b708 100755
--- a/usr/bin/byobu-select-session
+++ b/usr/bin/byobu-select-session
@@ -20,12 +20,13 @@
 
 import commands, os, sys
 
+PKG = "byobu"
 SHELL = os.getenv("SHELL", "/bin/bash")
 sessions = []
 choice = ""
 sessions.append(0)
 i = 0
-output = commands.getoutput('screen -ls | sed "s/\s\+/ /g" | grep "^\s"')
+output = commands.getoutput('screen -ls "' + PKG + '" | sed "s/\s\+/ /g" | grep "^\s"')
 if output:
 	for s in output.split("\n"):
 		items = s.split(" ")