Merge lp:~mathiaz/byobu/launcher-exists into lp:byobu

[Mathias Gug]

[Dustin Kirkland  (kirkland)]

review: Approve

=== modified file 'byobu-launcher-install'
--- byobu-launcher-install	2009-06-23 07:30:59 +0000
+++ byobu-launcher-install	2009-09-04 19:42:27 +0000
@@ -23,7 +23,7 @@
 install_launcher() {
 	dest=$1
 	launcher="byobu-launcher"
-	launcher_line="\`echo \$- | grep -qs i\` && $launcher"
+	launcher_line="\`echo \$- | grep -qs i\` && which $launcher > /dev/null && $launcher"
 	# Add it at the end
 	echo "$launcher_line" >> "$dest"
 	# Hush login, since byobu will handle motd printing
 
=== modified file 'debian/changelog'
--- debian/changelog	2009-09-01 00:30:20 +0000
+++ debian/changelog	2009-09-04 19:42:27 +0000
@@ -1,7 +1,12 @@
 byobu (2.31) unreleased; urgency=low
 
+  [ Dustin Kirkland ]
   * UNRELEASED
 
+  [ Mathias Gug ]
+  * Check that byobu-launcher exists before calling it (chroots use the same
+    .profile as the main system but may not have byobu installed).
+
  -- Dustin Kirkland <[e-mail]>  Mon, 31 Aug 2009 19:30:20 -0500
 
 byobu (2.30-0ubuntu1) karmic; urgency=low