* usr/lib/byobu/network: fix network script regresssion, LP: #506315

* usr/lib/byobu/wifi_quality: silence error
  - debian/install, usr/bin/*: move the binary scripts

debian/changelog

@@ -1,11 +1,13 @@
 byobu (2.47) unreleased; urgency=low
 
-  * bin/network: fix network script regresssion, LP: #506315
+  * usr/lib/byobu/network: fix network script regresssion, LP: #506315
+  * usr/lib/byobu/wifi_quality: silence error
   * Make byobu more portable, LP: #503554
     - debian/rules, debian/manpages, usr/share/man/man1/*: move the manpages
       to make byobu more portable
     - debian/install, bin/*, usr/lib/byobu/*: move the status scripts
     - debian/install, usr/share/byobu/*: move the share files
+    - debian/install, usr/bin/*: move the binary scripts
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 11 Jan 2010 22:54:36 -0600
 

debian/install

@@ -1,20 +1,9 @@
+usr/bin/*
 usr/lib/byobu/*
 #desktop/byobu.svg usr/share/byobu/pixmaps/
 #desktop/byobu.desktop usr/share/applications/
 po/locale/* usr/share/locale
 usr/share/byobu/*
 statusrc etc/byobu
-byobu-select-profile usr/bin
-byobu usr/bin
-byobu-config usr/bin
-byobu-reconnect-sockets usr/bin
-byobu-status usr/bin
-byobu-status-detail usr/bin
-byobu-janitor usr/bin
-byobu-launcher-install usr/bin
-byobu-launcher-uninstall usr/bin
-motd+shell usr/bin
-byobu-launcher usr/bin
-byobu-export usr/bin
 debian/source_byobu.py usr/share/apport/package-hooks
 debian/lintian/byobu usr/share/lintian/overrides

po/POTFILES.Python

@@ -1,3 +1,3 @@
 # List of source files containing translatable Python strings.
 # Please keep this file sorted alphabetically.
-byobu-config
+usr/bin/byobu-config

po/POTFILES.Shell

@@ -1,5 +1,5 @@
 # List of source files containing translatable sh strings.
 # Please keep this file sorted alphabetically.
 usr/lib/byobu/menu
-byobu-export
-byobu-select-profile
+usr/bin/byobu-export
+usr/bin/byobu-select-profile

testing/time_notifications

@@ -1,10 +1,11 @@
 #!/bin/bash
 
+PKG=byobu
 RUNS=100
 
 loop() {
 	for j in $(seq 1 $RUNS); do
-		./bin/$1 >/dev/null
+		/usr/lib/$PKG/$1 >/dev/null
 	done
 }
 
@@ -12,10 +13,10 @@ TIMEFORMAT="%R"
 if [ -n "$1" ]; then
 	list="$1"
 else
-	list=$(ls bin)
+	list=$(ls /usr/lib/$PKG/)
 fi
 for i in $list; do
-	freq=`grep "byobu-status $i" ./profiles/common | awk '{print $3}'`
+	freq=`grep "byobu-status $i" /usr/share/$PKG/profiles/common | awk '{print $3}'`
 	echo -n "$i $freq "
 	time loop $i
 done

usr/lib/byobu/wifi_quality

@@ -27,6 +27,6 @@ fi
 
 iwconfig=`/sbin/iwconfig 2>/dev/null`
 bitrate=`echo "$iwconfig" | grep "Bit Rate." | sed -e "s/^.*Bit Rate.//" -e "s/ .*$//g"`
-[ -z "$bitrate" ] && bitrate="0"
+[ -z "$bitrate" ] && exit 0
 quality=`echo "$iwconfig" | grep "Link Quality." | sed -e "s/^.*Link Quality.//" -e "s/ .*$//g" | awk -F/ '{printf "%.0f", 100*$1/$2}'`
 printf "$(color b C k)%s$(color -)$(color C k)%s,$(color -)$(color b C k)%s$(color -)$(color C k)%%$(color -) " "$bitrate" "Mbps" "$quality"