diff -Nru byobu-5.76/autom4te.cache/requests byobu-5.77/autom4te.cache/requests --- byobu-5.76/autom4te.cache/requests 2014-03-18 14:23:12.000000000 +0000 +++ byobu-5.77/autom4te.cache/requests 2014-03-31 01:40:53.000000000 +0000 @@ -34,47 +34,47 @@ 'configure.ac' ], { - 'AM_SET_DEPDIR' => 1, - 'm4_pattern_allow' => 1, - '_AM_PROG_CC_C_O' => 1, - '_AM_MANGLE_OPTION' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'AM_AUX_DIR_EXPAND' => 1, + '_AM_AUTOCONF_VERSION' => 1, + '_AM_DEPENDENCIES' => 1, + 'AC_DEFUN' => 1, 'AM_INIT_AUTOMAKE' => 1, - 'AC_CONFIG_MACRO_DIR_TRACE' => 1, 'AC_CONFIG_MACRO_DIR' => 1, - 'AC_DEFUN_ONCE' => 1, - 'm4_include' => 1, - 'AM_CONDITIONAL' => 1, '_AM_SET_OPTIONS' => 1, - 'AM_SUBST_NOTMAKE' => 1, - '_AM_IF_OPTION' => 1, - 'include' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, + 'AM_MISSING_PROG' => 1, + 'AM_DEP_TRACK' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - '_AM_AUTOCONF_VERSION' => 1, - 'AU_DEFUN' => 1, - 'AM_MAKE_INCLUDE' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + '_AM_PROG_TAR' => 1, + 'AM_CONDITIONAL' => 1, + 'AM_PROG_CC_C_O' => 1, + 'm4_include' => 1, + '_AM_PROG_CC_C_O' => 1, + 'm4_pattern_allow' => 1, + 'AM_SILENT_RULES' => 1, 'AM_MISSING_HAS_RUN' => 1, - 'AC_DEFUN' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, - '_AM_DEPENDENCIES' => 1, + 'AC_DEFUN_ONCE' => 1, 'AM_RUN_LOG' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, - 'm4_pattern_forbid' => 1, + 'AM_MAKE_INCLUDE' => 1, + 'AU_DEFUN' => 1, + 'include' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, '_AM_SET_OPTION' => 1, - 'AM_SET_LEADING_DOT' => 1, - '_m4_warn' => 1, - 'AM_DEP_TRACK' => 1, 'AM_PROG_INSTALL_STRIP' => 1, - 'AM_SILENT_RULES' => 1, - 'AM_MISSING_PROG' => 1, - 'AM_AUTOMAKE_VERSION' => 1, + '_m4_warn' => 1, + '_AM_MANGLE_OPTION' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, + 'AM_SET_LEADING_DOT' => 1, + '_AM_SUBST_NOTMAKE' => 1, '_AM_CONFIG_MACRO_DIRS' => 1, - 'AM_SANITY_CHECK' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, 'AM_PROG_INSTALL_SH' => 1, - 'AM_PROG_CC_C_O' => 1, - '_AM_PROG_TAR' => 1 + 'AM_SUBST_NOTMAKE' => 1, + 'AM_AUX_DIR_EXPAND' => 1, + '_AM_IF_OPTION' => 1, + 'm4_pattern_forbid' => 1, + 'AM_SANITY_CHECK' => 1, + 'AM_SET_DEPDIR' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -89,65 +89,65 @@ 'configure.ac' ], { - 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, - 'AM_PROG_CC_C_O' => 1, - '_AM_COND_ENDIF' => 1, - 'AM_MAINTAINER_MODE' => 1, - 'AC_FC_FREEFORM' => 1, - 'AC_CANONICAL_TARGET' => 1, - 'AC_LIBSOURCE' => 1, - 'AC_SUBST' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AM_PROG_MKDIR_P' => 1, - 'AM_POT_TOOLS' => 1, - 'AM_SILENT_RULES' => 1, - 'AM_PROG_MOC' => 1, - 'AC_CANONICAL_HOST' => 1, - 'AC_CONFIG_FILES' => 1, - 'AM_XGETTEXT_OPTION' => 1, + 'AC_CONFIG_LINKS' => 1, '_m4_warn' => 1, - 'AM_GNU_GETTEXT' => 1, - 'LT_INIT' => 1, - 'AM_PATH_GUILE' => 1, - '_AM_MAKEFILE_INCLUDE' => 1, - 'AM_PROG_FC_C_O' => 1, - 'AH_OUTPUT' => 1, - 'm4_pattern_forbid' => 1, - 'AC_CANONICAL_BUILD' => 1, - 'AC_SUBST_TRACE' => 1, + '_LT_AC_TAGCONFIG' => 1, + 'm4_sinclude' => 1, 'AC_CONFIG_SUBDIRS' => 1, + 'LT_SUPPORTED_TAG' => 1, + 'AC_CANONICAL_HOST' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'include' => 1, 'AC_INIT' => 1, - 'm4_sinclude' => 1, - 'AM_PROG_CXX_C_O' => 1, - 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'AC_REQUIRE_AUX_FILE' => 1, 'AM_EXTRA_RECURSIVE_TARGETS' => 1, - 'include' => 1, - 'AC_FC_SRCEXT' => 1, - 'AC_CONFIG_LINKS' => 1, - 'AC_FC_PP_SRCEXT' => 1, + 'AC_CONFIG_HEADERS' => 1, + '_AM_COND_ELSE' => 1, + 'AC_FC_PP_DEFINE' => 1, 'AM_NLS' => 1, - 'AC_PROG_LIBTOOL' => 1, - '_LT_AC_TAGCONFIG' => 1, + 'AM_PROG_CXX_C_O' => 1, + 'AC_CONFIG_AUX_DIR' => 1, + 'AM_XGETTEXT_OPTION' => 1, + 'AM_MAINTAINER_MODE' => 1, + 'AM_PROG_MOC' => 1, 'AM_ENABLE_MULTILIB' => 1, - 'AM_CONDITIONAL' => 1, - 'AM_PROG_F77_C_O' => 1, - 'm4_include' => 1, - 'sinclude' => 1, - 'AC_DEFINE_TRACE_LITERAL' => 1, + 'AC_FC_FREEFORM' => 1, + 'm4_pattern_forbid' => 1, + 'AC_SUBST_TRACE' => 1, + '_AM_COND_IF' => 1, 'AM_PROG_AR' => 1, + 'AH_OUTPUT' => 1, + 'AM_GNU_GETTEXT' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + 'AM_PROG_MKDIR_P' => 1, '_AM_SUBST_NOTMAKE' => 1, - '_AM_COND_IF' => 1, + 'AC_REQUIRE_AUX_FILE' => 1, + '_AM_COND_ENDIF' => 1, + 'AC_DEFINE_TRACE_LITERAL' => 1, + 'LT_INIT' => 1, + 'AM_PROG_FC_C_O' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'AM_PROG_F77_C_O' => 1, 'AM_INIT_AUTOMAKE' => 1, - 'AM_MAKEFILE_INCLUDE' => 1, - 'AC_CONFIG_AUX_DIR' => 1, - 'LT_SUPPORTED_TAG' => 1, - '_AM_COND_ELSE' => 1, - 'AC_FC_PP_DEFINE' => 1, + 'sinclude' => 1, + 'AC_CONFIG_FILES' => 1, + 'AC_CANONICAL_TARGET' => 1, + 'AC_FC_PP_SRCEXT' => 1, + 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, + 'AC_CANONICAL_BUILD' => 1, 'm4_pattern_allow' => 1, - 'AC_CONFIG_HEADERS' => 1, - 'AC_CANONICAL_SYSTEM' => 1 + 'AC_SUBST' => 1, + 'AM_SILENT_RULES' => 1, + 'AM_CONDITIONAL' => 1, + 'AM_PROG_CC_C_O' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'm4_include' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'AC_FC_SRCEXT' => 1, + 'AM_POT_TOOLS' => 1, + '_AM_MAKEFILE_INCLUDE' => 1, + 'AM_PATH_GUILE' => 1, + 'AC_LIBSOURCE' => 1 } ], 'Autom4te::Request' ) ); diff -Nru byobu-5.76/ChangeLog byobu-5.77/ChangeLog --- byobu-5.76/ChangeLog 2014-03-18 14:23:11.000000000 +0000 +++ byobu-5.77/ChangeLog 2014-03-31 01:40:51.000000000 +0000 @@ -1,4 +1,21 @@ -byobu (5.76) released; urgency=medium +byobu (5.77) released; urgency=medium + + * usr/share/byobu/profiles/dircolors, + usr/share/byobu/profiles/Makefile.am, + usr/share/byobu/profiles/tmuxrc: + - add a dircolors file + * usr/share/byobu/profiles/bashrc, usr/share/byobu/profiles/dircolors: + - LP: #1299964 + - swap orange and aubergine on the command prompt + - aubergine is now the directory, orange is the hostname + - still working on dircolors, use an aubergine (like our prompt) + for directories + * usr/lib/byobu/logo: LP: #1299964 + - use an orange background for the UTF-8, 256-colour Ubuntu logo + + -- Dustin Kirkland Tue, 18 Mar 2014 23:25:08 +0900 + +byobu (5.76-0ubuntu1) trusty; urgency=medium * usr/share/byobu/profiles/tmux: - use nice, subtle, thin pane border, a separate color from the active @@ -7,7 +24,7 @@ usr/share/doc/byobu/help.tmux.txt: LP: #1294139 - change Shift-F11 to zoom in/out of splits - -- Dustin Kirkland Mon, 17 Mar 2014 13:00:04 +0900 + -- Dustin Kirkland Tue, 18 Mar 2014 23:25:05 +0900 byobu (5.75-0ubuntu1) trusty; urgency=medium diff -Nru byobu-5.76/debian/changelog byobu-5.77/debian/changelog --- byobu-5.76/debian/changelog 2014-03-18 14:23:24.000000000 +0000 +++ byobu-5.77/debian/changelog 2014-03-31 01:41:10.000000000 +0000 @@ -1,3 +1,20 @@ +byobu (5.77-0ubuntu1) trusty; urgency=medium + + * usr/share/byobu/profiles/dircolors, + usr/share/byobu/profiles/Makefile.am, + usr/share/byobu/profiles/tmuxrc: + - add a dircolors file + * usr/share/byobu/profiles/bashrc, usr/share/byobu/profiles/dircolors: + - LP: #1299964 + - swap orange and aubergine on the command prompt + - aubergine is now the directory, orange is the hostname + - still working on dircolors, use an aubergine (like our prompt) + for directories + * usr/lib/byobu/logo: LP: #1299964 + - use an orange background for the UTF-8, 256-colour Ubuntu logo + + -- Dustin Kirkland Tue, 18 Mar 2014 23:25:08 +0900 + byobu (5.76-0ubuntu1) trusty; urgency=medium * usr/share/byobu/profiles/tmux: @@ -7,7 +24,7 @@ usr/share/doc/byobu/help.tmux.txt: LP: #1294139 - change Shift-F11 to zoom in/out of splits - -- Dustin Kirkland Mon, 17 Mar 2014 13:00:04 +0900 + -- Dustin Kirkland Tue, 18 Mar 2014 23:25:05 +0900 byobu (5.75-0ubuntu1) trusty; urgency=medium diff -Nru byobu-5.76/usr/lib/byobu/logo byobu-5.77/usr/lib/byobu/logo --- byobu-5.76/usr/lib/byobu/logo 2014-03-17 00:32:29.000000000 +0000 +++ byobu-5.77/usr/lib/byobu/logo 2014-03-29 01:38:57.000000000 +0000 @@ -37,15 +37,15 @@ if $MARKUP; then if [ "$BYOBU_BACKEND" = "tmux" ] && [ "$BYOBU_CHARMAP" = "UTF-8" ]; then if [ ! "$VTE_CJK_WIDTH" = "1" ] && [ ! "$VTE_CJK_WIDTH" = "wide" ] ; then - color m W; printf " u "; color - + color "colour202" "colour255" ; printf " u "; color - else - color m W; printf " U "; color - + color m W; printf " u "; color - fi else - color m W; printf " U "; color - + color m W; printf " u "; color - fi else - printf " U " + printf " u " fi ;; *altlinux*) diff -Nru byobu-5.76/usr/share/byobu/profiles/bashrc byobu-5.77/usr/share/byobu/profiles/bashrc --- byobu-5.76/usr/share/byobu/profiles/bashrc 2014-03-17 03:45:49.000000000 +0000 +++ byobu-5.77/usr/share/byobu/profiles/bashrc 2014-03-29 01:03:27.000000000 +0000 @@ -48,7 +48,7 @@ case "$BYOBU_DISTRO" in "Ubuntu") # Use Ubuntu colors (grey / aubergine / orange) - PS1="${debian_chroot:+($debian_chroot)}\[\e[38;5;202m\]\$(byobu_prompt_status)\[\e[38;5;245m\]\u\[\e[00m\]@\[\e[38;5;5m\]\h\[\e[00m\]:\[\e[38;5;172m\]\w\[\e[00m\]\$(byobu_prompt_symbol) " + PS1="${debian_chroot:+($debian_chroot)}\[\e[38;5;202m\]\$(byobu_prompt_status)\[\e[38;5;245m\]\u\[\e[00m\]@\[\e[38;5;172m\]\h\[\e[00m\]:\[\e[38;5;5m\]\w\[\e[00m\]\$(byobu_prompt_symbol) " export GREP_COLORS="ms=01;38;5;202:mc=01;31:sl=:cx=:fn=01;38;5;132:ln=32:bn=32:se=00;38;5;242" export LESS_TERMCAP_mb=$(printf '\e[01;31m') # enter blinking mode – red export LESS_TERMCAP_md=$(printf '\e[01;38;5;180m') # enter double-bright mode – bold light orange @@ -59,8 +59,8 @@ export LESS_TERMCAP_us=$(printf '\e[04;38;5;139m') # enter underline mode – underline aubergine ;; *) - # Use Byobu colors (green / blue / red) - PS1="${debian_chroot:+($debian_chroot)}\[\e[31m\]\$(byobu_prompt_status)\[\e[00;32m\]\u\[\e[00m\]@\[\e[00;36m\]\h\[\e[00m\]:\[\e[00;31m\]\w\[\e[00m\]\$(byobu_prompt_symbol) " + # Use nice colors (green / red / blue) + PS1="${debian_chroot:+($debian_chroot)}\[\e[31m\]\$(byobu_prompt_status)\[\e[00;32m\]\u\[\e[00m\]@\[\e[00;31m\]\h\[\e[00m\]:\[\e[00;36m\]\w\[\e[00m\]\$(byobu_prompt_symbol) " ;; esac fi diff -Nru byobu-5.76/usr/share/byobu/profiles/dircolors byobu-5.77/usr/share/byobu/profiles/dircolors --- byobu-5.76/usr/share/byobu/profiles/dircolors 1970-01-01 00:00:00.000000000 +0000 +++ byobu-5.77/usr/share/byobu/profiles/dircolors 2014-03-29 01:06:24.000000000 +0000 @@ -0,0 +1,204 @@ +# Configuration file for dircolors, a utility to help you set the +# LS_COLORS environment variable used by GNU ls with the --color option. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copying and distribution of this file, with or without modification, +# are permitted provided the copyright notice and this notice are preserved. +# The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the +# slackware version of dircolors) are recognized but ignored. +# Below, there should be one TERM entry for each termtype that is colorizable +TERM Eterm +TERM ansi +TERM color-xterm +TERM con132x25 +TERM con132x30 +TERM con132x43 +TERM con132x60 +TERM con80x25 +TERM con80x28 +TERM con80x30 +TERM con80x43 +TERM con80x50 +TERM con80x60 +TERM cons25 +TERM console +TERM cygwin +TERM dtterm +TERM eterm-color +TERM gnome +TERM gnome-256color +TERM jfbterm +TERM konsole +TERM kterm +TERM linux +TERM linux-c +TERM mach-color +TERM mlterm +TERM putty +TERM rxvt +TERM rxvt-256color +TERM rxvt-cygwin +TERM rxvt-cygwin-native +TERM rxvt-unicode +TERM rxvt-unicode-256color +TERM rxvt-unicode256 +TERM screen +TERM screen-256color +TERM screen-256color-bce +TERM screen-bce +TERM screen-w +TERM screen.Eterm +TERM screen.rxvt +TERM screen.linux +TERM st +TERM st-256color +TERM terminator +TERM vt100 +TERM xterm +TERM xterm-16color +TERM xterm-256color +TERM xterm-88color +TERM xterm-color +TERM xterm-debian +# Below are the color init strings for the basic file types. A color init +# string consists of one or more of the following numeric codes: +# Attribute codes: +# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed +# Text color codes: +# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white +# Background color codes: +# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white +#NORMAL 00 # no color code at all +#FILE 00 # regular file: use no color at all +RESET 0 # reset to "normal" color +DIR 38;5;5# directory +LINK 4;5;36 # symbolic link. (If you set this to 'target' instead of a + # numerical value, the color is as for the file pointed to.) +MULTIHARDLINK 00 # regular file with more than one link +FIFO 40;33 # pipe +SOCK 01;35 # socket +DOOR 01;35 # door +BLK 40;33;01 # block device driver +CHR 40;33;01 # character device driver +ORPHAN 40;31;01 # symlink to nonexistent file, or non-stat'able file +SETUID 37;41 # file that is setuid (u+s) +SETGID 30;43 # file that is setgid (g+s) +CAPABILITY 30;41 # file with capability +STICKY_OTHER_WRITABLE 3;28 # dir that is sticky and other-writable (+t,o+w) +OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky +STICKY 37;44 # dir with the sticky bit set (+t) and not other-writable +# This is for files with execute permission: +EXEC 38;5;172 +# List any file extensions like '.gz' or '.tar' that you would like ls +# to colorize below. Put the extension, a space, and the color init string. +# (and any comments you want to add after a '#') +# If you use DOS-style suffixes, you may want to uncomment the following: +#.cmd 01;32 # executables (bright green) +#.exe 01;32 +#.com 01;32 +#.btm 01;32 +#.bat 01;32 +# Or if you want to colorize scripts even if they do not have the +# executable bit actually set. +#.sh 01;32 +#.csh 01;32 + # archives or compressed (bright red) +.tar 01;31 +.tgz 01;31 +.arj 01;31 +.taz 01;31 +.lzh 01;31 +.lzma 01;31 +.tlz 01;31 +.txz 01;31 +.zip 01;31 +.z 01;31 +.Z 01;31 +.dz 01;31 +.gz 01;31 +.lz 01;31 +.xz 01;31 +.bz2 01;31 +.bz 01;31 +.tbz 01;31 +.tbz2 01;31 +.tz 01;31 +.deb 01;31 +.rpm 01;31 +.jar 01;31 +.war 01;31 +.ear 01;31 +.sar 01;31 +.rar 01;31 +.ace 01;31 +.zoo 01;31 +.cpio 01;31 +.7z 01;31 +.rz 01;31 +# image formats +.jpg 01;35 +.jpeg 01;35 +.gif 01;35 +.bmp 01;35 +.pbm 01;35 +.pgm 01;35 +.ppm 01;35 +.tga 01;35 +.xbm 01;35 +.xpm 01;35 +.tif 01;35 +.tiff 01;35 +.png 01;35 +.svg 01;35 +.svgz 01;35 +.mng 01;35 +.pcx 01;35 +.mov 01;35 +.mpg 01;35 +.mpeg 01;35 +.m2v 01;35 +.mkv 01;35 +.webm 01;35 +.ogm 01;35 +.mp4 01;35 +.m4v 01;35 +.mp4v 01;35 +.vob 01;35 +.qt 01;35 +.nuv 01;35 +.wmv 01;35 +.asf 01;35 +.rm 01;35 +.rmvb 01;35 +.flc 01;35 +.avi 01;35 +.fli 01;35 +.flv 01;35 +.gl 01;35 +.dl 01;35 +.xcf 01;35 +.xwd 01;35 +.yuv 01;35 +.cgm 01;35 +.emf 01;35 +# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +.axv 01;35 +.anx 01;35 +.ogv 01;35 +.ogx 01;35 +# audio formats +.aac 00;36 +.au 00;36 +.flac 00;36 +.mid 00;36 +.midi 00;36 +.mka 00;36 +.mp3 00;36 +.mpc 00;36 +.ogg 00;36 +.ra 00;36 +.wav 00;36 +# http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions +.axa 00;36 +.oga 00;36 +.spx 00;36 +.xspf 00;36 diff -Nru byobu-5.76/usr/share/byobu/profiles/Makefile.am byobu-5.77/usr/share/byobu/profiles/Makefile.am --- byobu-5.76/usr/share/byobu/profiles/Makefile.am 2013-08-28 03:50:01.000000000 +0000 +++ byobu-5.77/usr/share/byobu/profiles/Makefile.am 2014-03-24 12:03:15.000000000 +0000 @@ -1,2 +1,2 @@ profilesdir = $(datadir)/@PACKAGE@/profiles -profiles_DATA = bashrc byoburc screenrc common tmux tmuxrc NONE +profiles_DATA = bashrc byoburc dircolors screenrc common tmux tmuxrc NONE diff -Nru byobu-5.76/usr/share/byobu/profiles/Makefile.in byobu-5.77/usr/share/byobu/profiles/Makefile.in --- byobu-5.76/usr/share/byobu/profiles/Makefile.in 2014-03-18 14:23:12.000000000 +0000 +++ byobu-5.77/usr/share/byobu/profiles/Makefile.in 2014-03-31 01:40:52.000000000 +0000 @@ -210,7 +210,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ profilesdir = $(datadir)/@PACKAGE@/profiles -profiles_DATA = bashrc byoburc screenrc common tmux tmuxrc NONE +profiles_DATA = bashrc byoburc dircolors screenrc common tmux tmuxrc NONE all: all-am .SUFFIXES: diff -Nru byobu-5.76/usr/share/byobu/profiles/tmuxrc byobu-5.77/usr/share/byobu/profiles/tmuxrc --- byobu-5.76/usr/share/byobu/profiles/tmuxrc 2014-03-17 02:40:56.000000000 +0000 +++ byobu-5.77/usr/share/byobu/profiles/tmuxrc 2014-03-24 11:29:46.000000000 +0000 @@ -26,4 +26,5 @@ source-file $HOME/.byobu/datetime.tmux source-file $BYOBU_CONFIG_DIR/profile.tmux source-file $BYOBU_CONFIG_DIR/keybindings.tmux +source-file $BYOBU_CONFIG_DIR/windows.tmux source-file $BYOBU_CONFIG_DIR/.tmux.conf