diff -Nru byobu-5.91/autom4te.cache/requests byobu-5.92/autom4te.cache/requests --- byobu-5.91/autom4te.cache/requests 2015-03-07 23:58:20.000000000 +0000 +++ byobu-5.92/autom4te.cache/requests 2015-03-23 17:49:40.000000000 +0000 @@ -34,47 +34,47 @@ 'configure.ac' ], { + 'm4_include' => 1, + '_AM_IF_OPTION' => 1, 'AM_MISSING_PROG' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + 'm4_pattern_allow' => 1, '_AM_SUBST_NOTMAKE' => 1, - 'm4_pattern_forbid' => 1, - 'm4_include' => 1, - 'AM_PROG_INSTALL_STRIP' => 1, - 'AC_DEFUN' => 1, - 'AM_SET_DEPDIR' => 1, - 'AM_DEP_TRACK' => 1, - '_AM_PROG_TAR' => 1, - 'AC_DEFUN_ONCE' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'AM_MISSING_HAS_RUN' => 1, - 'AM_MAKE_INCLUDE' => 1, + '_m4_warn' => 1, 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'm4_pattern_allow' => 1, + 'AC_CONFIG_MACRO_DIR' => 1, + 'AM_PROG_CC_C_O' => 1, + 'AM_SILENT_RULES' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'm4_pattern_forbid' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, + 'AM_SET_LEADING_DOT' => 1, '_AM_DEPENDENCIES' => 1, - 'AM_PROG_INSTALL_SH' => 1, - '_AM_CONFIG_MACRO_DIRS' => 1, 'AM_RUN_LOG' => 1, + 'AM_MISSING_HAS_RUN' => 1, + '_AM_SET_OPTIONS' => 1, + 'AM_CONDITIONAL' => 1, + '_AM_CONFIG_MACRO_DIRS' => 1, + '_AM_SET_OPTION' => 1, '_AM_MANGLE_OPTION' => 1, - '_m4_warn' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'AC_DEFUN' => 1, + 'AM_PROG_INSTALL_STRIP' => 1, '_AM_PROG_CC_C_O' => 1, - 'AM_CONDITIONAL' => 1, - 'AM_SUBST_NOTMAKE' => 1, - 'include' => 1, - 'AM_SILENT_RULES' => 1, - 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - '_AM_AUTOCONF_VERSION' => 1, - 'AM_PROG_CC_C_O' => 1, - 'AU_DEFUN' => 1, - 'AC_CONFIG_MACRO_DIR' => 1, + 'AC_DEFUN_ONCE' => 1, + 'AM_DEP_TRACK' => 1, + '_AM_PROG_TAR' => 1, 'AM_AUX_DIR_EXPAND' => 1, - '_AM_IF_OPTION' => 1, - 'AM_AUTOMAKE_VERSION' => 1, + 'AM_SET_DEPDIR' => 1, 'AM_SANITY_CHECK' => 1, - '_AM_SET_OPTIONS' => 1, - '_AM_SET_OPTION' => 1, - 'AM_SET_LEADING_DOT' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1 + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + '_AM_AUTOCONF_VERSION' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, + 'AM_PROG_INSTALL_SH' => 1, + 'AU_DEFUN' => 1, + 'AM_MAKE_INCLUDE' => 1, + 'AM_SUBST_NOTMAKE' => 1, + 'include' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -89,66 +89,66 @@ 'configure.ac' ], { + 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, + '_AM_COND_ENDIF' => 1, + '_LT_AC_TAGCONFIG' => 1, + 'm4_include' => 1, + 'AC_CANONICAL_BUILD' => 1, + 'AC_SUBST_TRACE' => 1, + 'AC_FC_PP_SRCEXT' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, + 'AC_FC_FREEFORM' => 1, '_AM_SUBST_NOTMAKE' => 1, + 'AM_ENABLE_MULTILIB' => 1, + 'AM_PROG_CXX_C_O' => 1, + '_m4_warn' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'm4_pattern_allow' => 1, + 'AC_SUBST' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'AC_CONFIG_AUX_DIR' => 1, + 'AC_CANONICAL_HOST' => 1, + 'LT_INIT' => 1, + 'AC_CONFIG_SUBDIRS' => 1, 'AM_PROG_MKDIR_P' => 1, + 'AM_PROG_CC_C_O' => 1, + 'AM_SILENT_RULES' => 1, + '_AM_COND_ELSE' => 1, + 'm4_pattern_forbid' => 1, + 'AM_GNU_GETTEXT' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'AC_CONFIG_LINKS' => 1, + 'AM_EXTRA_RECURSIVE_TARGETS' => 1, + 'AC_CANONICAL_TARGET' => 1, 'AM_PROG_LIBTOOL' => 1, + 'AM_PATH_GUILE' => 1, 'AM_MAINTAINER_MODE' => 1, - 'sinclude' => 1, - 'AM_NLS' => 1, - 'm4_pattern_forbid' => 1, - '_AM_COND_ENDIF' => 1, - 'm4_include' => 1, + 'AM_CONDITIONAL' => 1, '_AM_MAKEFILE_INCLUDE' => 1, - 'AC_CONFIG_AUX_DIR' => 1, - '_AM_COND_IF' => 1, + 'AC_CONFIG_FILES' => 1, 'AH_OUTPUT' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'LT_CONFIG_LTDL_DIR' => 1, - 'm4_pattern_allow' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'AM_MAKEFILE_INCLUDE' => 1, - 'AC_FC_PP_SRCEXT' => 1, - 'AM_PATH_GUILE' => 1, - 'AM_GNU_GETTEXT' => 1, - 'AM_PROG_AR' => 1, - 'AM_PROG_MOC' => 1, - 'AC_PROG_LIBTOOL' => 1, + '_AM_COND_IF' => 1, + 'AC_LIBSOURCE' => 1, 'AC_REQUIRE_AUX_FILE' => 1, - 'AM_CONDITIONAL' => 1, + 'AM_PROG_MOC' => 1, + 'AM_INIT_AUTOMAKE' => 1, 'AM_XGETTEXT_OPTION' => 1, - '_AM_COND_ELSE' => 1, - '_m4_warn' => 1, - 'AC_CANONICAL_TARGET' => 1, - 'AC_INIT' => 1, - 'AM_PROG_FC_C_O' => 1, - 'AM_SILENT_RULES' => 1, - 'include' => 1, - 'AM_PROG_CXX_C_O' => 1, - 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, - 'AM_ENABLE_MULTILIB' => 1, - 'AC_SUBST' => 1, - 'AC_CONFIG_FILES' => 1, - 'AC_CANONICAL_BUILD' => 1, - 'AM_PROG_CC_C_O' => 1, 'AM_PROG_F77_C_O' => 1, - 'AC_CANONICAL_SYSTEM' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + 'AM_NLS' => 1, + 'AM_POT_TOOLS' => 1, + 'sinclude' => 1, + 'AC_FC_SRCEXT' => 1, + 'AM_PROG_AR' => 1, 'AC_CONFIG_HEADERS' => 1, - '_LT_AC_TAGCONFIG' => 1, - 'm4_sinclude' => 1, - 'LT_INIT' => 1, - 'AC_LIBSOURCE' => 1, + 'AC_DEFINE_TRACE_LITERAL' => 1, 'LT_SUPPORTED_TAG' => 1, 'AC_FC_PP_DEFINE' => 1, - 'AC_CONFIG_SUBDIRS' => 1, - 'AM_POT_TOOLS' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AM_EXTRA_RECURSIVE_TARGETS' => 1, - 'AC_FC_FREEFORM' => 1, - 'AC_DEFINE_TRACE_LITERAL' => 1, - 'AC_FC_SRCEXT' => 1, - 'AC_CONFIG_LINKS' => 1, - 'AC_CANONICAL_HOST' => 1, - 'AC_SUBST_TRACE' => 1 + 'AM_PROG_FC_C_O' => 1, + 'include' => 1, + 'm4_sinclude' => 1, + 'AC_INIT' => 1 } ], 'Autom4te::Request' ) ); diff -Nru byobu-5.91/ChangeLog byobu-5.92/ChangeLog --- byobu-5.91/ChangeLog 2015-03-07 23:58:19.000000000 +0000 +++ byobu-5.92/ChangeLog 2015-03-23 17:49:39.000000000 +0000 @@ -1,4 +1,17 @@ -byobu (5.91) released; urgency=medium +byobu (5.92) released; urgency=medium + + * usr/bin/byobu-launcher-install.in: LP: #1396959 + - silence warnings if byobu-launch doesn't exist (e.g., uninstalled it) + * usr/bin/byobu-config.in: LP: #1383669 + - revert commit to LP: #1316050, which hardcoded LANG=C + - this should fix rendering of Japanese characters in the menu + * usr/share/byobu/keybindings/f-keys.tmux: LP: #1350813 + - handle tmux 1.9's default path changes, per: + https://sourceforge.net/p/tmux/tmux-code/ci/1.9/tree/CHANGES + + -- Dustin Kirkland Sat, 07 Mar 2015 18:59:37 -0500 + +byobu (5.91-0ubuntu1) vivid; urgency=medium [ Thibaut Broggi ] * po/fr.po: @@ -13,7 +26,7 @@ - improve readme build instructions, with thanks to: + https://github.com/dustinkirkland/byobu/pull/8 - -- Dustin Kirkland Thu, 15 Jan 2015 08:09:27 -0600 + -- Dustin Kirkland Sat, 07 Mar 2015 18:59:35 -0500 byobu (5.90-0ubuntu1) vivid; urgency=medium diff -Nru byobu-5.91/debian/changelog byobu-5.92/debian/changelog --- byobu-5.91/debian/changelog 2015-03-07 23:58:33.000000000 +0000 +++ byobu-5.92/debian/changelog 2015-03-23 17:49:50.000000000 +0000 @@ -1,4 +1,17 @@ -byobu (5.91-0ubuntu1~utopic) utopic; urgency=medium +byobu (5.92-0ubuntu1~utopic) utopic; urgency=medium + + * usr/bin/byobu-launcher-install.in: LP: #1396959 + - silence warnings if byobu-launch doesn't exist (e.g., uninstalled it) + * usr/bin/byobu-config.in: LP: #1383669 + - revert commit to LP: #1316050, which hardcoded LANG=C + - this should fix rendering of Japanese characters in the menu + * usr/share/byobu/keybindings/f-keys.tmux: LP: #1350813 + - handle tmux 1.9's default path changes, per: + https://sourceforge.net/p/tmux/tmux-code/ci/1.9/tree/CHANGES + + -- Dustin Kirkland Sat, 07 Mar 2015 18:59:37 -0500 + +byobu (5.91-0ubuntu1) vivid; urgency=medium [ Thibaut Broggi ] * po/fr.po: @@ -13,7 +26,7 @@ - improve readme build instructions, with thanks to: + https://github.com/dustinkirkland/byobu/pull/8 - -- Dustin Kirkland Thu, 15 Jan 2015 08:09:27 -0600 + -- Dustin Kirkland Sat, 07 Mar 2015 18:59:35 -0500 byobu (5.90-0ubuntu1) vivid; urgency=medium diff -Nru byobu-5.91/usr/bin/byobu-config.in byobu-5.92/usr/bin/byobu-config.in --- byobu-5.91/usr/bin/byobu-config.in 2014-07-26 20:08:26.000000000 +0000 +++ byobu-5.92/usr/bin/byobu-config.in 2015-03-23 17:25:20.000000000 +0000 @@ -20,6 +20,5 @@ PKG="byobu" [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="@prefix@" || export BYOBU_PREFIX . "${BYOBU_PREFIX}/lib/${PKG}/include/common" -export LANG=C ${BYOBU_PYTHON} "${BYOBU_PREFIX}/lib/${PKG}/include/config.py" diff -Nru byobu-5.91/usr/bin/byobu.in byobu-5.92/usr/bin/byobu.in --- byobu-5.91/usr/bin/byobu.in 2015-01-15 14:09:27.000000000 +0000 +++ byobu-5.92/usr/bin/byobu.in 2015-03-07 23:59:37.000000000 +0000 @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -VERSION=5.91 +VERSION=5.92 PKG="byobu" # All sorts of things go wrong if you don't own your $HOME dir. diff -Nru byobu-5.91/usr/bin/byobu-launcher-install.in byobu-5.92/usr/bin/byobu-launcher-install.in --- byobu-5.91/usr/bin/byobu-launcher-install.in 2014-02-28 23:22:27.000000000 +0000 +++ byobu-5.92/usr/bin/byobu-launcher-install.in 2015-03-23 17:22:11.000000000 +0000 @@ -44,7 +44,7 @@ install_launcher() { $PKG-launcher-uninstall "$1" || true - printf "_byobu_sourced=1 . ${BYOBU_PREFIX}/bin/byobu-launch\n" >> "$1" + printf "_byobu_sourced=1 . ${BYOBU_PREFIX}/bin/byobu-launch 2>/dev/null || true\n" >> "$1" } install_launcher_fish() { diff -Nru byobu-5.91/usr/share/byobu/keybindings/f-keys.tmux byobu-5.92/usr/share/byobu/keybindings/f-keys.tmux --- byobu-5.91/usr/share/byobu/keybindings/f-keys.tmux 2014-12-09 23:53:44.000000000 +0000 +++ byobu-5.92/usr/share/byobu/keybindings/f-keys.tmux 2015-03-23 17:38:41.000000000 +0000 @@ -28,9 +28,9 @@ # Documented in: $BYOBU_PREFIX/share/doc/byobu/help.tmux.txt bind-key -n F1 new-window -k -n config byobu-config bind-key -n S-F1 new-window -k -n help "sh -c '$BYOBU_PAGER $BYOBU_PREFIX/share/doc/byobu/help.tmux.txt'" -bind-key -n F2 new-window \; rename-window "-" -bind-key -n C-F2 display-panes \; split-window -h -bind-key -n S-F2 display-panes \; split-window -v +bind-key -n F2 new-window -c "#{pane_current_path}" \; rename-window "-" +bind-key -n C-F2 display-panes \; split-window -h -c "#{pane_current_path}" +bind-key -n S-F2 display-panes \; split-window -v -c "#{pane_current_path}" bind-key -n C-S-F2 new-session bind-key -n F3 previous-window bind-key -n F4 next-window