releasing 4.6

This commit is contained in:
Dustin Kirkland 2011-05-28 12:58:04 -05:00
commit 98c468888b
9 changed files with 22 additions and 11 deletions

11
debian/changelog vendored
View file

@ -1,4 +1,4 @@
byobu (4.6) unreleased; urgency=low
byobu (4.6-0ubuntu1) oneiric; urgency=low
* usr/bin/byobu-select-session:
- fix select session, when there is only 1 session to attach to
@ -9,8 +9,15 @@ byobu (4.6) unreleased; urgency=low
- merge history
* usr/bin/byobu-launch:
- move the location of the BYOBU_DISABLE test
* debian/rules, usr/bin/byobu, usr/bin/byobu-janitor,
usr/bin/Makefile.am, usr/bin/shell => usr/bin/byobu-shell,
usr/share/byobu/windows/common, usr/share/man/man1/Makefile.am,
usr/share/man/man1/shell.1 => usr/share/man/man1/byobu-shell.1:
- byobu installing "/usr/bin/shell" might be a little egregious from
a namespace perspective; so call it "byobu-shell" and just update
the window title when calling it
-- Dustin Kirkland <kirkland@ubuntu.com> Thu, 26 May 2011 15:14:52 -0500
-- Dustin Kirkland <kirkland@ubuntu.com> Sat, 28 May 2011 12:57:58 -0500
byobu (4.5-0ubuntu1) oneiric; urgency=low

1
debian/rules vendored
View file

@ -49,7 +49,6 @@ install: build install-po
dh_testroot
$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
dh_link usr/share/byobu/keybindings/f-keys usr/share/byobu/keybindings/common
dh_link usr/bin/shell usr/bin/motd+shell
dh_link usr/share/byobu/pixmaps/byobu.svg usr/share/icons/hicolor/scalable/apps/byobu.svg
# Build architecture-independent files here.

View file

@ -1,2 +1,2 @@
bin_SCRIPTS = byobu byobu-config byobu-ctrl-a byobu-disable byobu-enable byobu-export byobu-janitor byobu-launch byobu-launcher byobu-launcher-install byobu-launcher-uninstall byobu-quiet byobu-reconnect-sockets byobu-select-profile byobu-select-session byobu-silent byobu-status byobu-status-detail shell
bin_SCRIPTS = byobu byobu-config byobu-ctrl-a byobu-disable byobu-enable byobu-export byobu-janitor byobu-launch byobu-launcher byobu-launcher-install byobu-launcher-uninstall byobu-quiet byobu-reconnect-sockets byobu-select-profile byobu-select-session byobu-silent byobu-status byobu-status-detail byobu-shell

View file

@ -69,7 +69,7 @@ fi
export BYOBU_WINDOWS
# Launch shell, unless the user has default windows set to launch
uncommented_lines < "$BYOBU_WINDOWS" && DEFAULT_WINDOW= || DEFAULT_WINDOW="shell"
uncommented_lines < "$BYOBU_WINDOWS" && DEFAULT_WINDOW= || DEFAULT_WINDOW="-t ${SHELL##*/} byobu-shell"
# Check if our terminfo supports 256 colors
if command -v tput >/dev/null; then

View file

@ -174,5 +174,10 @@ fi
# Affects: Upgrades from <= byobu 4.3, remove ec2_rates
rm -f "$DATA/ec2_rates"
# Affects: Upgrades from <= byobu 4.4, update "shell" -> "byobu-shell"
if grep -qs " shell$" "$DATA/windows"; then
$SED -i -e "s/ shell$/ $PKG-shell/g" "$DATA/windows" || true
fi
# Clean up flag
rm -f "$FLAG"

View file

@ -1,6 +1,6 @@
#!/bin/sh
#
# shell: display the MOTD and launch the default shell
# byobu-shell: display the MOTD and launch the default shell
# Copyright (C) 2008 Canonical Ltd.
#
# Authors: Dustin Kirkland <kirkland@canonical.com>

View file

@ -2,4 +2,4 @@
#screen -t notify-osd -M tail -f $HOME/.cache/notify-osd.log
#screen -t top top
#screen -t web w3m http://LinuxSearch.org
#screen -t shell shell
#screen -t shell byobu-shell

View file

@ -1 +1 @@
man_MANS = byobu.1 byobu-config.1 byobu-ctrl-a.1 byobu-disable.1 byobu-enable.1 byobu-export.1 byobu-janitor.1 byobu-launch.1 byobu-launcher.1 byobu-launcher-install.1 byobu-launcher-uninstall.1 byobu-reconnect-sockets.1 byobu-select-profile.1 byobu-select-session.1 byobu-status.1 byobu-status-detail.1 shell.1
man_MANS = byobu.1 byobu-config.1 byobu-ctrl-a.1 byobu-disable.1 byobu-enable.1 byobu-export.1 byobu-janitor.1 byobu-launch.1 byobu-launcher.1 byobu-launcher-install.1 byobu-launcher-uninstall.1 byobu-reconnect-sockets.1 byobu-select-profile.1 byobu-select-session.1 byobu-status.1 byobu-status-detail.1 byobu-shell.1

View file

@ -1,9 +1,9 @@
.TH shell 1 "11 Feb 2009" byobu "byobu"
.TH byobu\-shell 1 "11 Feb 2009" byobu "byobu"
.SH NAME
shell \- Print the message of the day and launch a shell
byobu\-shell \- Print the message of the day and launch a shell
.SH DESCRIPTION
\fBshell\fP is a simple script that prints the message of the day (/etc/motd) and launches a shell.
\fBbyobu\-shell\fP is a simple script that prints the message of the day (/etc/motd) and launches a shell.
$SHELL will be invoked if it exists. Otherwise, /bin/sh will be used.