* === added directory usr/lib/byobu/include, experimental/byobu-

classroom, usr/bin/byobu, usr/bin/byobu-ctrl-a, usr/bin/byobu-
  disable, usr/bin/byobu-enable, usr/bin/byobu-export, usr/bin/byobu-
  janitor, usr/bin/byobu-launch, usr/bin/byobu-launcher,
  usr/bin/byobu-launcher-install, usr/bin/byobu-launcher-uninstall,
  usr/bin/byobu-quiet, usr/bin/byobu-reconnect-sockets, usr/bin/byobu-
  select-backend, usr/bin/byobu-select-profile, usr/bin/byobu-shell,
  usr/bin/byobu-silent, usr/bin/byobu-status, usr/bin/byobu-status-
  detail, usr/bin/byobu-ugraph, usr/bin/byobu-ulevel,
  usr/lib/byobu/.common => usr/lib/byobu/include/common (properties
  changed: -x to +x), usr/lib/byobu/.constants =>
  usr/lib/byobu/include/constants, usr/lib/byobu/.dirs =>
  usr/lib/byobu/include/dirs, usr/lib/byobu/Makefile.am,
  usr/lib/byobu/notify_osd, usr/lib/byobu/.notify_osd =>
  usr/lib/byobu/include/notify_osd, usr/lib/byobu/.shutil =>
  usr/lib/byobu/include/shutil: LP: #833768
  - move dotfiles out of usr/lib/byobu and into usr/lib/byobu/include
  - this was triggering some chrootkit warnings

debian/changelog

@@ -33,6 +33,24 @@ byobu (4.47) unreleased; urgency=low
     usr/share/byobu/keybindings/f-keys.tmux:
     - set a BYOBU_PAGER environment variable
     - use BYOBU_PAGER in places we need a pager
+  * === added directory usr/lib/byobu/include, experimental/byobu-
+    classroom, usr/bin/byobu, usr/bin/byobu-ctrl-a, usr/bin/byobu-
+    disable, usr/bin/byobu-enable, usr/bin/byobu-export, usr/bin/byobu-
+    janitor, usr/bin/byobu-launch, usr/bin/byobu-launcher,
+    usr/bin/byobu-launcher-install, usr/bin/byobu-launcher-uninstall,
+    usr/bin/byobu-quiet, usr/bin/byobu-reconnect-sockets, usr/bin/byobu-
+    select-backend, usr/bin/byobu-select-profile, usr/bin/byobu-shell,
+    usr/bin/byobu-silent, usr/bin/byobu-status, usr/bin/byobu-status-
+    detail, usr/bin/byobu-ugraph, usr/bin/byobu-ulevel,
+    usr/lib/byobu/.common => usr/lib/byobu/include/common (properties
+    changed: -x to +x), usr/lib/byobu/.constants =>
+    usr/lib/byobu/include/constants, usr/lib/byobu/.dirs =>
+    usr/lib/byobu/include/dirs, usr/lib/byobu/Makefile.am,
+    usr/lib/byobu/notify_osd, usr/lib/byobu/.notify_osd =>
+    usr/lib/byobu/include/notify_osd, usr/lib/byobu/.shutil =>
+    usr/lib/byobu/include/shutil: LP: #833768
+    - move dotfiles out of usr/lib/byobu and into usr/lib/byobu/include
+    - this was triggering some chrootkit warnings
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 08 Nov 2011 19:16:15 -0600
 

experimental/byobu-classroom

@@ -22,7 +22,7 @@
 
 PKG="byobu"
 
-. "/usr/lib/$PKG/.shutil"
+. "/usr/lib/$PKG/include/shutil"
 
 usage() {
 	echo
@@ -98,8 +98,6 @@ while [ $(stat -c%a "$screen") != "6755" ]; do
 	case "$c" in
 		y|Y)
 			dpkg-statoverride --add root root 6755 "$screen"
-			chmod 6755 "$screen"
-			chmod 755 /var/run/screen
 			info "Updated $screen"
 			echo
 			info "To revert this later, run:"

usr/bin/byobu

@@ -38,7 +38,7 @@ case "$0" in
 esac
 
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 # At this point, we're sure BYOBU_BACKEND is properly defined
 export BYOBU_BACKEND

usr/bin/byobu-ctrl-a

@@ -27,7 +27,7 @@ EOF
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 bind_to=""
 keybindings="$BYOBU_CONFIG_DIR/keybindings"

usr/bin/byobu-disable

@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 byobu-launcher-uninstall
 

usr/bin/byobu-enable

@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 byobu-launcher-install
 

usr/bin/byobu-export

@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 gettext "
 The byobu-export utility is now deprecated.

usr/bin/byobu-janitor

@@ -21,7 +21,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 # Ensure that all updates get run immediately
 rm -rf "$BYOBU_RUN_DIR/.last.$BYOBU_BACKEND"

usr/bin/byobu-launch

@@ -43,7 +43,7 @@ elif [ "$BYOBU_SOURCED_PROFILE" != "1" ] && [ "$LC_BYOBU" != "0" ] && [ "$BYOBU_
 	BYOBU_SOURCED_PROFILE=1
 	PKG="byobu"
 	[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-	. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+	. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 	# Ensure that autolaunch is not explicitly disabled
 	if [ ! -r "$BYOBU_CONFIG_DIR/disable-autolaunch" ]; then
 		case "$-" in

usr/bin/byobu-launcher

@@ -22,7 +22,7 @@ PKG="byobu"
 # ie, rather than "sudo byobu", you must run "sudo -H byobu"
 if [ -O "$HOME" ]; then
 	[ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-	. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+	. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 	if [ -e "$BYOBU_CONFIG_DIR/disable-autolaunch" ]; then
 		false
 	else

usr/bin/byobu-launcher-install

@@ -20,7 +20,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 FLAG="$BYOBU_CONFIG_DIR/no-logout-on-detach"
 

usr/bin/byobu-launcher-uninstall

@@ -20,7 +20,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 remove_launcher() {
 	dest=$1

usr/bin/byobu-quiet

@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 FLAG="$BYOBU_CONFIG_DIR/status.disable"
 

usr/bin/byobu-reconnect-sockets

@@ -23,7 +23,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 case "$-" in
 	*i*)

usr/bin/byobu-select-backend

@@ -20,7 +20,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 usage () {
 	cat <<EOT

usr/bin/byobu-select-profile

@@ -24,7 +24,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 TEXTDOMAIN="$PKG"
 

usr/bin/byobu-shell

@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 FLAG="$BYOBU_CONFIG_DIR/.welcome-displayed"
 

usr/bin/byobu-silent

@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 FLAG="$BYOBU_CONFIG_DIR/status.disable"
 

usr/bin/byobu-status

@@ -20,7 +20,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 # Make sure status is not disabled
 [ -f "$BYOBU_CONFIG_DIR/status.disable" ] && exit 0

usr/bin/byobu-status-detail

@@ -19,7 +19,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 if which vim >/dev/null && `vim --version | grep -q +folding`; then
 	byobu-status --detail | vim -c "set foldmethod=indent" -c "set foldminlines=0" -c "set foldnestmax=1"  -c "set foldcolumn=2" -R -

usr/bin/byobu-ugraph

@@ -26,7 +26,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 script_name=${0##*/}
 min_default=0

usr/bin/byobu-ulevel

@@ -37,7 +37,7 @@
 
 PKG="byobu"
 [ -z "${BYOBU_PREFIX}" ] && export BYOBU_PREFIX="/usr" || export BYOBU_PREFIX
-. "${BYOBU_PREFIX}/lib/${PKG}/.common"
+. "${BYOBU_PREFIX}/lib/${PKG}/include/common"
 
 circles_2=(○ ●)
 diamonds_2=(◇ ◆)

usr/lib/byobu/Makefile.am

@@ -1,3 +1,3 @@
 libdirdir = $(prefix)/lib/@PACKAGE@
-libdir_SCRIPTS = apport  arch  battery  cpu_count  cpu_freq  cpu_temp  color  custom  date  disk  disk_io  distro ec2_cost  fan_speed  hostname  ip_address  load_average  logo  mail  memory  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 .common .constants .dirs .shutil
+libdir_SCRIPTS = apport  arch  battery  cpu_count  cpu_freq  cpu_temp  color  custom  date  disk  disk_io  distro ec2_cost  fan_speed  hostname  ip_address  load_average  logo  mail  memory  menu  network  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/include/common

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#    .common: common stuff sourced by all scripts
+#    common: common stuff sourced by all scripts
 #
 #    Copyright (C) 2011 Dustin Kirkland
 #
@@ -20,7 +20,7 @@
 
 if [ -z "${BYOBU_INCLUDED_LIBS}" ]; then
 	# Needed to set up $BYOBU_CONFIG_DIR
-	. "${BYOBU_PREFIX}/lib/${PKG}/.dirs"
+	. "${BYOBU_PREFIX}/lib/${PKG}/include/dirs"
 
 	# If the backend is already set (eg. running `byobu-tmux`), do nothing.
 	if [ -z "${BYOBU_BACKEND}" ]; then
@@ -33,7 +33,7 @@ if [ -z "${BYOBU_INCLUDED_LIBS}" ]; then
 	# Creating backend cache
 	[ -d "$BYOBU_RUN_DIR/cache.$BYOBU_BACKEND" ] || mkdir -p "$BYOBU_RUN_DIR/cache.$BYOBU_BACKEND"
 
-	. "${BYOBU_PREFIX}/lib/${PKG}/.shutil"
+	. "${BYOBU_PREFIX}/lib/${PKG}/include/shutil"
-	. "${BYOBU_PREFIX}/lib/${PKG}/.constants"
+	. "${BYOBU_PREFIX}/lib/${PKG}/include/constants"
 	BYOBU_INCLUDED_LIBS=1
 fi

usr/lib/byobu/include/constants

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#    .constants: some constant values needed by all library status scripts
+#    constants: some constant values needed by all library status scripts
 #
 #    Copyright (C) 2011 Dustin Kirkland
 #

usr/lib/byobu/include/dirs

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#    .dirs: some dirs needed by all library status scripts
+#    dirs: some dirs needed by all library status scripts
 #
 #    Copyright (C) 2011 Dustin Kirkland
 #

usr/lib/byobu/include/notify_osd

@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-#    .notify_osd: perform some string manipulation on notify-osd messages
+#    notify_osd: perform some string manipulation on notify-osd messages
 #                 and then send to the screen message window
 #    Copyright (C) 2010 Canonical Ltd.
 #

usr/lib/byobu/include/shutil

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#    .shutil: some shared utilities used by all status scripts
+#    shutil: some shared utilities used by all status scripts
 #
 #    Copyright (C) 2011 Dustin Kirkland
 #

usr/lib/byobu/notify_osd

@@ -31,7 +31,7 @@ __notify_osd() {
 	# processing new messages and sending them to the session
 	CMD="tail --pid $PPID -n 0 -F $NOTIFY_OSD_LOG"
 	pkill -f "$CMD" || true
-	$CMD | $BYOBU_PREFIX/lib/byobu/.notify_osd "$PPID" &
+	$CMD | $BYOBU_PREFIX/lib/byobu/include/notify_osd "$PPID" &
 }
 
 # vi: syntax=sh ts=4 noexpandtab