From 0edfa2b0676429ae124d6d4b5ff8471930c4d3a8 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Wed, 7 Dec 2016 08:16:08 -0600 Subject: [PATCH] * usr/share/man/man1/byobu.1: - fix minor nitpick about disk/memory measurement documentation * usr/share/byobu/desktop/byobu.desktop.old, usr/share/byobu/desktop/Makefile.am, usr/share/man/man1/byobu.1: LP: #1639836 - resurrect byobu-desktop.old, which is needed on Debian and other systems, where gnome-terminal may not exist --- debian/changelog | 6 ++++++ usr/share/byobu/desktop/Makefile.am | 2 +- usr/share/byobu/desktop/byobu.desktop.old | 9 +++++++++ usr/share/man/man1/byobu.1 | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 usr/share/byobu/desktop/byobu.desktop.old diff --git a/debian/changelog b/debian/changelog index f5a745ec..b2802d9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,12 @@ byobu (5.113) unreleased; urgency=medium still an argument * usr/bin/purge-old-kernels: - ensure that we keep the current running kernel + * usr/share/man/man1/byobu.1: + - fix minor nitpick about disk/memory measurement documentation + * usr/share/byobu/desktop/byobu.desktop.old, + usr/share/byobu/desktop/Makefile.am, usr/share/man/man1/byobu.1: LP: #1639836 + - resurrect byobu-desktop.old, which is needed on Debian and other + systems, where gnome-terminal may not exist -- Dustin Kirkland Fri, 16 Sep 2016 10:13:08 -0500 diff --git a/usr/share/byobu/desktop/Makefile.am b/usr/share/byobu/desktop/Makefile.am index 48f18333..cd652b4b 100644 --- a/usr/share/byobu/desktop/Makefile.am +++ b/usr/share/byobu/desktop/Makefile.am @@ -1,2 +1,2 @@ desktopdir = $(datadir)/@PACKAGE@/desktop -desktop_SCRIPTS = byobu.desktop +desktop_SCRIPTS = byobu.desktop byobu.desktop.old diff --git a/usr/share/byobu/desktop/byobu.desktop.old b/usr/share/byobu/desktop/byobu.desktop.old new file mode 100644 index 00000000..6df34e48 --- /dev/null +++ b/usr/share/byobu/desktop/byobu.desktop.old @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Byobu Terminal +Comment=Advanced Command Line and Text Window Manager +Icon=byobu +Exec=env TERM=xterm-256color byobu +Terminal=true +Type=Application +Categories=GNOME;GTK;Utility; +X-GNOME-Gettext-Domain=byobu diff --git a/usr/share/man/man1/byobu.1 b/usr/share/man/man1/byobu.1 index 182635ee..345d9c18 100644 --- a/usr/share/man/man1/byobu.1 +++ b/usr/share/man/man1/byobu.1 @@ -151,7 +151,7 @@ Then: $ BYOBU_WINDOWS=split4 byobu .SH UNITS OF MEASURE -byobu uses binary for capacity measurements of KB, MB, GB, and TB. This means multiples of 1024 rather than multiples of 1000, in accordance with JEDEC Standard 100B.01 for disk and memory capacity measurements. See: +byobu uses binary for capacity measurements of KB, MB, GB, and TB. This means multiples of 1024 rather than multiples of 1000, in accordance with JEDEC Standard 100B.01 for memory capacity measurements. See: * http://en.wikipedia.org/wiki/JEDEC_memory_standards byobu uses decimal for measurements of network data transfer, meaning multiple of 1000, rather than 1024. See: