From ff67fda2284f3c6b68b88d2cf7b155bd9369fa20 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Wed, 29 Apr 2009 19:01:00 -0500 Subject: [PATCH] * debian/install, screen-profiles-export, screen-profiles-status, screen-profiles-status.1: move status gathering scripts from /var/lib to /usr/lib, LP: #369368 Signed-off-by: Dustin Kirkland --- debian/changelog | 5 ++++- debian/install | 2 +- screen-profiles-export | 4 ++-- screen-profiles-status | 4 ++-- screen-profiles-status.1 | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 463de2be..74e4692a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,11 @@ screen-profiles (1.53) unreleased; urgency=low * bin/users, screen-profiles.1: when counting users, count remote ssh sessions * bin/ec2-cost: update location of ec2_version file + * debian/install, screen-profiles-export, screen-profiles-status, + screen-profiles-status.1: move status gathering scripts from /var/lib + to /usr/lib, LP: #369368 - -- Dustin Kirkland Wed, 29 Apr 2009 18:51:17 -0500 + -- Dustin Kirkland Wed, 29 Apr 2009 18:57:27 -0500 screen-profiles (1.52-0ubuntu1) karmic; urgency=low diff --git a/debian/install b/debian/install index e9e0ef00..38f594eb 100644 --- a/debian/install +++ b/debian/install @@ -1,4 +1,4 @@ -bin/* var/lib/screen-profiles +bin/* usr/lib/screen-profiles po/locale/* usr/share/locale profiles/common usr/share/screen-profiles/profiles profiles/NONE usr/share/screen-profiles/profiles diff --git a/screen-profiles-export b/screen-profiles-export index 7efef4c1..838f43ef 100755 --- a/screen-profiles-export +++ b/screen-profiles-export @@ -87,7 +87,7 @@ status_config() { # Generate the status configuration # Disable the menu, since screen-profiles configurator is not available # Enable user@host in its place - for i in $(ls /var/lib/screen-profiles/); do + for i in $(ls /usr/lib/screen-profiles/); do case "$i" in cpu-count|cpu-freq|date|hostname|load-average|logo|mem-available|mem-used|reboot-required|release|time|updates-available|whoami) echo "$i=1" @@ -221,7 +221,7 @@ STATUS="$DIR/.$PROG/status" mkdir -p "$DIR/.$PROG/bin" # Copy status scripts -cp -a /var/lib/$PROG/* "$DIR/.$PROG/bin" +cp -a /usr/lib/$PROG/* "$DIR/.$PROG/bin" cp -a /usr/bin/$PROG-status "$DIR/.$PROG" # Generate the monolithic profile diff --git a/screen-profiles-status b/screen-profiles-status index 0a4407c8..4273a3d9 100755 --- a/screen-profiles-status +++ b/screen-profiles-status @@ -28,8 +28,8 @@ if [ -d "$HOME/.screen-profiles/bin" ]; then DIR="$HOME/.screen-profiles/bin" -elif [ -d "/var/lib/screen-profiles" ]; then - DIR="/var/lib/screen-profiles" +elif [ -d "/usr/lib/screen-profiles" ]; then + DIR="/usr/lib/screen-profiles" else exit 1 fi diff --git a/screen-profiles-status.1 b/screen-profiles-status.1 index 916c6f81..5f07682f 100644 --- a/screen-profiles-status.1 +++ b/screen-profiles-status.1 @@ -3,7 +3,7 @@ screen\-profiles\-status \- Common starting point for running screen\-profiles status commands .SH DESCRIPTION -\fBscreen\-profiles\-status\fP is a simple script that takes a single argument: a script defined in /var/lib/screen\-profiles. This wrapper is useful for doing some common functionality, like setting the cpu and/or io proirity, determining sane defaults, pre/post processing. +\fBscreen\-profiles\-status\fP is a simple script that takes a single argument: a script defined in /usr/lib/screen\-profiles. This wrapper is useful for doing some common functionality, like setting the cpu and/or io proirity, determining sane defaults, pre/post processing. .TP \fIhttp://launchpad.net/screen-profiles\fP