* rename:

- wastebasket -> trash
  - uclock -> time_binary
  - ugraph -> /usr/bin/byobu-ugraph
  - ulevel -> /usr/bin/byobu-ulevel
* usr/lib/byobu/time_binary: New UTF-8 notification showing time in binary
* usr/lib/byobu/byobu-ugraph: New UTF-8 notification utility showing
  historical byobu-ugraph data (required bash).
* usr/bin/byobu-ulevel: New UTF-8 notification utility which displays
* usr/lib/byobu/trash: New ASCII+UTF-8 notification indicating
  contents of trash.

debian/changelog

@@ -4,17 +4,22 @@ byobu (3.28) unreleased; urgency=low
   * usr/lib/byobu/wifi_quality: don't show wifi-quality if connectivity == 0
   * usr/lib/byobu/disk_io: don't show disk_io if rate = 0
   * usr/lib/byobu/services: finally fix that nagging, mysterious whitespace
+  * rename:
+    - wastebasket -> trash
+    - uclock -> time_binary
+    - ugraph -> /usr/bin/byobu-ugraph
+    - ulevel -> /usr/bin/byobu-ulevel
 
   [ James Hunt <james.hunt@ubuntu.com> ]
-  * usr/lib/byobu/uclock: New UTF-8 notification showing time in binary
+  * usr/lib/byobu/time_binary: New UTF-8 notification showing time in binary
     (requires bash) (LP: #705037).
-  * usr/lib/byobu/ugraph: New UTF-8 notification utility showing historical
+  * usr/lib/byobu/byobu-ugraph: New UTF-8 notification utility showing
-    ulevel data (required bash).
+    historical byobu-ugraph data (required bash).
-  * usr/lib/byobu/ulevel: New UTF-8 notification utility which displays
+  * usr/bin/byobu-ulevel: New UTF-8 notification utility which displays
     some 'level' using various unicode characters (requires bash)
     (LP: #705032).
-  * usr/lib/byobu/wastebasket: New ASCII+UTF-8 notification indicating
+  * usr/lib/byobu/trash: New ASCII+UTF-8 notification indicating
-    contents of wastebasket.
+    contents of trash.
   * usr/lib/byobu/wifi_quality: added UTF-8 icon.
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 28 Jan 2011 17:12:27 -0600

usr/bin/byobu-ugraph

@@ -1,8 +1,8 @@
 #!/bin/bash
 #---------------------------------------------------------------------
-# Script to display a byobo notification "history graph".
+# Script to display a byobu notification "history graph".
 #
-# Designed to work with the wonderful byoby(1) but can be run
+# Designed to work with the wonderful byobu(1) but can be run
 # stand-alone.
 #---------------------------------------------------------------------
 #
@@ -48,7 +48,7 @@ usage()
 {
 cat <<EOT
 Description: Display a graph of historical indicator values using
-             ulevel.
+             byobu-ulevel.
 
 Usage: $script_name [options] [command [args...]]
 
@@ -64,7 +64,7 @@ Options:
  -r          : Do not rotate file <file> (default is to rotate).
                Option implies file <file> should not be written to
                so a command cannot follow script options in this case.
- -t <theme>  : 'ulevel' theme to use (default=$theme_default).
+ -t <theme>  : 'byobu-ulevel' theme to use (default=$theme_default).
  -x <num>    : Maximum value (default=$max_default).
 
 
@@ -208,5 +208,5 @@ data=$(get_data)
 
 for datum in $data
 do
-  ulevel.sh -n -m $min -x $max -c $datum -t $theme
+  byobu-ulevel -n -m $min -x $max -c $datum -t $theme
 done

usr/bin/byobu-ulevel

@@ -3,7 +3,7 @@
 # Script to display unicode characters representing the level of
 # some indicator.
 #
-# Designed to work with the wonderful byoby(1) but can be run
+# Designed to work with the wonderful byobu(1) but can be run
 # stand-alone.
 #---------------------------------------------------------------------
 #

usr/lib/byobu/Makefile.am

@@ -1,3 +1,3 @@
 libdirdir = $(prefix)/lib/@PACKAGE@
-libdir_SCRIPTS = apport  arch  battery  cpu_count  cpu_freq  cpu_temp  custom  date  disk  disk_io  ec2_cost  fan_speed  hostname  ip_address  load_average  logo  mail  mem_available  mem_used  menu  network  .notify_osd  notify_osd  processes  raid  rcs_cost  reboot_required  release  services  swap  time  time_utc  uclock ugraph ulevel updates_available  uptime  users  wastebasket whoami  wifi_quality
+libdir_SCRIPTS = apport  arch  battery  cpu_count  cpu_freq  cpu_temp  custom  date  disk  disk_io  ec2_cost  fan_speed  hostname  ip_address  load_average  logo  mail  mem_available  mem_used  menu  network  .notify_osd  notify_osd  processes  raid  rcs_cost  reboot_required  release  services  swap  time  time_binary time_utc trash updates_available  uptime  users  whoami  wifi_quality
 

usr/lib/byobu/trash

@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-#  wastebasket: show icon (and optionally count) if entries in wastebasket.
+#  trash: show icon (and optionally count) if entries in trash.
 #  Copyright (C) 2011 Canonical Ltd.
 #
 #  Authors: James Hunt <james.hunt@canonical.com>
@@ -18,22 +18,12 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-PKG="byobu"
+[ "$UTF8" = "1" ] && ICON="♸" || ICON="T"
-color 2>/dev/null || color() { true; }
-
-[ "$UTF8" = "1" ] && ICON="♸" || ICON="W"
-
-dir=$HOME/.local/share/Trash/files
 
+dir="$HOME/.local/share/Trash/files"
 [ ! -d $dir ] && exit 0
+
 count=$(ls $dir|wc -l)
 [ "$count" -eq 0 ] && exit 0
 
-if [ "$1" = "--detail" ]
+echo -n "$ICON[$count] "
-then
-  echo -n "${ICON}[$count]"
-else
-  echo -n $ICON
-fi
-
-exit 0