diff -u byobu-2.68/debian/changelog byobu-2.68/debian/changelog
--- byobu-2.68/debian/changelog
+++ byobu-2.68/debian/changelog
@@ -1,3 +1,13 @@
+byobu (2.68-0ubuntu1.1) lucid-proposed; urgency=low
+
+  * usr/bin/byobu-launch, usr/bin/byobu-launcher-install: exit 0 after
+    launching byobu to prevent the user from having to do the double-exit
+    when exiting or detaching, LP: #568306
+  * byobu-launcher-uninstall: create the directory, in case this script is
+    executed before byobu actually runs, LP: #580384
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Sun, 13 Jun 2010 11:59:44 -0500
+
 byobu (2.68-0ubuntu1) lucid; urgency=low
 
   * usr/lib/byobu/logo: update the default Ubuntu logo to match the
only in patch2:
unchanged:
--- byobu-2.68.orig/usr/bin/byobu-launcher-uninstall
+++ byobu-2.68/usr/bin/byobu-launcher-uninstall
@@ -31,6 +31,7 @@
 for i in ".profile" ".bashrc" ".bash_profile" ".zprofile"; do
 	remove_launcher "$HOME/$i"
 done
+mkdir -p "$HOME/.$PKG"
 touch "$HOME/.$PKG/disable-autolaunch"
 # install disabled motd printing; re-enable
 rm -f "$HOME"/.hushlogin
only in patch2:
unchanged:
--- byobu-2.68.orig/usr/bin/byobu-launcher-install
+++ byobu-2.68/usr/bin/byobu-launcher-install
@@ -21,7 +21,7 @@
 PKG="byobu"
 
 install_launcher() {
-	echo "\`echo \$- | grep -qs i\` && $PKG-launcher" >> "$1"
+	echo "\`echo \$- | grep -qs i\` && $PKG-launcher && exit 0" >> "$1"
 }
 
 # Sanitize the environment
only in patch2:
unchanged:
--- byobu-2.68.orig/usr/bin/byobu-launch
+++ byobu-2.68/usr/bin/byobu-launch
@@ -17,4 +17,4 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-`echo \$- | grep -qs i` && byobu-launcher
+`echo \$- | grep -qs i` && byobu-launcher && exit 0