From 5314d6c22900e81843c995d2b2b5c56b86b8fcca Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@ubuntu.com>
Date: Sun, 27 Feb 2011 10:02:27 -0600
Subject: [PATCH] usr/lib/byobu/time_binary, usr/share/byobu/profiles/common,
 usr/share/man/man1/byobu.1: fixup a couple of minor issues with the binary
 clock commit

---
 debian/changelog                | 3 +++
 usr/lib/byobu/time_binary       | 2 +-
 usr/share/byobu/profiles/common | 4 ++--
 usr/share/man/man1/byobu.1      | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af33f865..ce11a17d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ byobu (3.29) unreleased; urgency=low
   * usr/share/man/man1/byobu.1: document TERM=vt100 for Mac keyboard users,
     LP: #482623
   * usr/bin/byobu-janitor: use readlink, much more graceful
+  * usr/lib/byobu/time_binary, usr/share/byobu/profiles/common,
+    usr/share/man/man1/byobu.1: fixup a couple of minor issues with the binary
+    clock commit
 
   [ James Hunt ]
   * etc/byobu/statusrc, usr/bin/byobu-config, usr/lib/byobu/time_binary,
diff --git a/usr/lib/byobu/time_binary b/usr/lib/byobu/time_binary
index 8b3967e1..d4423c31 100755
--- a/usr/lib/byobu/time_binary
+++ b/usr/lib/byobu/time_binary
@@ -169,5 +169,5 @@ else
   display_time="${hh}${sep}${hm}${hs}${ending}"
 fi
 
-echo -ne "$display_time"
+echo -ne "$display_time "
 exit 0
diff --git a/usr/share/byobu/profiles/common b/usr/share/byobu/profiles/common
index 9219c5f0..0182644a 100644
--- a/usr/share/byobu/profiles/common
+++ b/usr/share/byobu/profiles/common
@@ -72,11 +72,11 @@ backtick 129 	67	67		byobu-status apport
 backtick 130 	5	5		byobu-status custom
 backtick 131 	53	53		byobu-status services
 backtick 132 	11	11		byobu-status time_utc
-backtick 132 	23	23		byobu-status time_binary
 backtick 133 	3	3		byobu-status disk_io
 backtick 134 	613	613		byobu-status rcs_cost
 backtick 135 	7	7		byobu-status raid
 backtick 136 	19	19		byobu-status swap
+backtick 137 	23	23		byobu-status time_binary
 
 hardstatus alwayslastline
 
@@ -113,7 +113,7 @@ source $HOME/.byobu/keybindings
 caption always "%12`%?%-Lw%50L>%?%{=r}%n*%f %t%?(%u)%?%{-}%12`%?%+Lw%?%11` %=%12`%110`%109`%122`%111`%10`%<"
 
 # Status string, last line
-hardstatus string '%99`%{-}%{=r}%12` %100`%112`%=%117`%133`%130`%135`%102`%101`%129`%131`%127`%114`%115`%108`%134`%128`%125`%126`%113`%119`%116`%106`%104`%103`%105`%107`%136`%123`%132`%120`%121`'
+hardstatus string '%99`%{-}%{=r}%12` %100`%112`%=%117`%133`%130`%135`%102`%101`%129`%131`%127`%114`%115`%108`%134`%128`%125`%126`%113`%119`%116`%106`%104`%103`%105`%107`%136`%123`%137`%132`%120`%121`'
 
 # NOTE: Older version of screen have an arbitrary limit of only being able
 # to change colors 16 times in this 'hardstatus string'.
diff --git a/usr/share/man/man1/byobu.1 b/usr/share/man/man1/byobu.1
index e012d785..c3d9cea6 100644
--- a/usr/share/man/man1/byobu.1
+++ b/usr/share/man/man1/byobu.1
@@ -79,7 +79,7 @@ Note that DATA=\fI$HOME/.byobu\fP.
 
 \fBtime\fP \- the system time in HH:MM:SS format; displayed in the lower bar on the far right in the default text and default background colors
 
-\fBtime_binary\fP \- only for the hard core geek, the local system time in binary; requires UTF8 support in a VERY recent version of GNU Screen; you must additionally set "UTF8=1" in \fI$DATA/statusrc\fP; displayed in the lower bar on the far right in dark text on a light background
+\fBtime_binary\fP \- only for the hard core geek, the local system time in binary; requires UTF8 support in a VERY recent version of GNU Screen; you must additionally set "UTF8=1" in \fI$DATA/statusrc\fP; displayed in the lower bar on the far right in the default text and background colors
 
 \fBtime_utc\fP \- the UTC system time in HH:MMformat; displayed in the lower bar on the far right in dark text on a light background