* usr/bin/byobu-janitor.in, usr/lib/byobu/include/colors,

usr/lib/byobu/include/constants, usr/lib/byobu/include/Makefile.am,
  usr/lib/byobu/include/shutil, usr/share/byobu/profiles/tmux:
  - split the color definitions into their own file
  - have the constants source that file
  - use that file when creating the user's local color palette
  - use a bit more orange

debian/changelog

@@ -8,6 +8,13 @@ byobu (5.75) unreleased; urgency=medium
   * usr/share/byobu/profiles/bashrc: LP: #1259621
     - add a visual queue in the PS1 command prompt when running as the
       root user; prepend "!" in front of "root"
+  * usr/bin/byobu-janitor.in, usr/lib/byobu/include/colors,
+    usr/lib/byobu/include/constants, usr/lib/byobu/include/Makefile.am,
+    usr/lib/byobu/include/shutil, usr/share/byobu/profiles/tmux:
+    - split the color definitions into their own file
+    - have the constants source that file
+    - use that file when creating the user's local color palette
+    - use a bit more orange
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Sun, 16 Mar 2014 12:46:36 -0700
 

usr/bin/byobu-janitor.in

@@ -67,7 +67,7 @@ MC=0
 # Seed the configuration
 # Setup initial local user configuration
 [ -r "$BYOBU_CONFIG_DIR/color" ] || printf "BACKGROUND=k\nFOREGROUND=w\nMONOCHROME=$MC" > "$BYOBU_CONFIG_DIR/color"
-[ -r "$BYOBU_CONFIG_DIR/color.tmux" ] || printf "BYOBU_DARK=black\nBYOBU_LIGHT=white\nBYOBU_ACCENT=magenta\nBYOBU_HIGHLIGHT=red\nMONOCHROME=$MC" > "$BYOBU_CONFIG_DIR/color.tmux"
+[ -r "$BYOBU_CONFIG_DIR/color.tmux" ] || sed -e "s/^#.*//" -e "/^\s*$/d" "$BYOBU_PREFIX/lib/$PKG/include/colors"  > "$BYOBU_CONFIG_DIR/color.tmux"
 [ -r "$BYOBU_CONFIG_DIR/datetime.tmux" ] || printf 'BYOBU_DATE="%%Y-%%m-%%d "\nBYOBU_TIME="%%H:%%M:%%S"\n' > "$BYOBU_CONFIG_DIR/datetime.tmux"
 [ -r "$BYOBU_CONFIG_DIR/profile" ] || echo "source \$BYOBU_PREFIX/share/$PKG/profiles/common" > "$BYOBU_CONFIG_DIR/profile"
 [ -r "$BYOBU_CONFIG_DIR/profile.tmux" ] || echo "source \$BYOBU_PREFIX/share/$PKG/profiles/tmux" > "$BYOBU_CONFIG_DIR/profile.tmux"

usr/lib/byobu/include/Makefile.am

@@ -1,2 +1,2 @@
 inclibdirdir = $(prefix)/lib/@PACKAGE@/include
-inclibdir_SCRIPTS = common config.py constants cycle-status dirs icons mondrian notify_osd shutil ec2instancespricing.py select-session.py tmux-detach-all-but-current-client tmux-send-command-to-all-panes tmux-send-command-to-all-windows toggle-utf8
+inclibdir_SCRIPTS = common colors config.py constants cycle-status dirs icons mondrian notify_osd shutil ec2instancespricing.py select-session.py tmux-detach-all-but-current-client tmux-send-command-to-all-panes tmux-send-command-to-all-windows toggle-utf8

usr/lib/byobu/include/colors

@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+#    colors: some color values needed by all library status scripts
+#
+#    Copyright (C) 2014 Dustin Kirkland
+#
+#    Authors: Dustin Kirkland <kirkland@byobu.co>
+#
+#    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/>.
+
+# Default colors
+# Inspired by http://design.ubuntu.com/brand/colour-palette
+export BYOBU_DARK="\#333333"		# Cool grey
+export BYOBU_LIGHT="\#EEEEEE"		# Warm white
+export BYOBU_ACCENT="\#75507B"          # Aubergine
+export BYOBU_HIGHLIGHT="\#DD4814"       # Ubuntu orange
+export BYOBU_WINDOW_NAME="-"
+export BYOBU_DATE="%Y-%m-%d "
+export BYOBU_TIME="%H:%M:%S"

usr/lib/byobu/include/constants

@@ -21,6 +21,7 @@
 PKG="byobu"
 
 . "${BYOBU_PREFIX}/lib/${PKG}/include/icons"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/colors"
 
 PCT="%"
 
@@ -63,12 +64,3 @@ if [ -z "$BYOBU_PYTHON" ]; then
 		export BYOBU_PYTHON="python"
 	fi
 fi
-
-# Default colors
-export BYOBU_DARK="black"
-export BYOBU_LIGHT="white"
-export BYOBU_ACCENT="#75507B"          # AUBERGINE
-export BYOBU_HIGHLIGHT="#DD4814"       # UBUNTU ORANGE
-export BYOBU_WINDOW_NAME="-"
-export BYOBU_DATE="%Y-%m-%d "
-export BYOBU_TIME="%H:%M:%S"

usr/lib/byobu/include/shutil

@@ -69,7 +69,7 @@ color_map() {
 		"M") _RET="brightmagenta" ;;
 		"C") _RET="brightcyan" ;;
 		"W") _RET="brightwhite" ;;
-		*) _RET= ;;
+		*) _RET="$1" ;;
 	esac
 }
 

usr/share/byobu/profiles/tmux

@@ -39,9 +39,9 @@ set-window-option -g xterm-keys on
 
 #set-option -g set-titles on
 #set-option -g set-titles-string '#(whoami)@#H - byobu (#S)'
-set-option -g pane-active-border-bg $BYOBU_ACCENT
+set-option -g pane-active-border-bg $BYOBU_HIGHLIGHT
-set-option -g pane-active-border-fg $BYOBU_ACCENT
+set-option -g pane-active-border-fg $BYOBU_HIGHLIGHT
-set-option -g pane-border-fg $BYOBU_LIGHT
+set-option -g pane-border-fg $BYOBU_HIGHLIGHT
 set-option -g history-limit 10000
 set-option -g display-panes-time 150
 set-option -g display-panes-colour $BYOBU_ACCENT