usr/bin/byobu, usr/share/byobu/profiles/byoburc,

usr/share/byobu/profiles/Makefile.am,
usr/share/byobu/profiles/screenrc: support using ~/.byoburc, instead of
~/.screenrc, if present; some users seem to want to use byobu and screen
separately, and keep their profiles separate, LP: #731529

debian/changelog

@@ -26,6 +26,11 @@ byobu (3.30) unreleased; urgency=low
     - fix ctrl-f5
   * debian/source/format, === removed directory debian/source: remove these
     until bzr builddeb bug gets fixed
+  * usr/bin/byobu, usr/share/byobu/profiles/byoburc,
+    usr/share/byobu/profiles/Makefile.am,
+    usr/share/byobu/profiles/screenrc: support using ~/.byoburc, instead of
+    ~/.screenrc, if present; some users seem to want to use byobu and screen
+    separately, and keep their profiles separate, LP: #731529
 
   [ Chaskiel Grundman ]
   * debian/postinst: correctly fix old-school screen-profiles era diversions

usr/bin/byobu

@@ -79,7 +79,13 @@ if [ -S "$SSH_AUTH_SOCK" ] && [ ! -h "$SSH_AUTH_SOCK" ]; then
 	ln -sf "$SSH_AUTH_SOCK" "$DATA/.ssh-agent"
 fi
 
+# Some users want to maintain a separate ~/.byoburc from ~/.screenrc,
+# if they use both screen and byobu on the same system
+if [ -r "$HOME/.byoburc" ]; then
 	PROFILE="-c $BYOBU_PREFIX/share/$PKG/profiles/byoburc"
+else
+	PROFILE="-c $BYOBU_PREFIX/share/$PKG/profiles/screenrc"
+fi
 NAME="-S $PKG"
 # Zero out $NAME if user has specified a -S
 for i in $@; do

usr/share/byobu/profiles/Makefile.am

@@ -1,2 +1,2 @@
 profilesdir = $(datadir)/@PACKAGE@/profiles
-profiles_DATA = byoburc  common  NONE
+profiles_DATA = byoburc  screenrc  common  NONE

usr/share/byobu/profiles/byoburc

@@ -1,8 +1,11 @@
 ###############################################################################
-#    Load both the profile, and the default windows, used at startup but not
+#    Load:
-#    profile refresh
+#     * the stock byobu profile
+#     * any windows
+#     * and the local .byoburc (instead of .screenrc)
+#    Used at startup but not profile refresh
 #
-#    Copyright (C) 2009 Canonical Ltd.
+#    Copyright (C) 2009-2011 Canonical Ltd.
 #
 #    Authors: Dustin Kirkland <kirkland@canonical.com>
 #
@@ -21,4 +24,4 @@
 
 source $HOME/.byobu/profile
 source $BYOBU_WINDOWS
-source $HOME/.screenrc
+source $HOME/.byoburc

usr/share/byobu/profiles/screenrc

@@ -0,0 +1,27 @@
+###############################################################################
+#    Load:
+#     * the stock byobu profile
+#     * any windows
+#     * and the local .screenrc (instead of .byoburc)
+#    Used at startup but not profile refresh
+#
+#    Copyright (C) 2009-2011 Canonical Ltd.
+#
+#    Authors: Dustin Kirkland <kirkland@canonical.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+###############################################################################
+
+source $HOME/.byobu/profile
+source $BYOBU_WINDOWS
+source $HOME/.screenrc