[ps-watcher] 31/88: fix debhelper scripts and revert other changes to -5

[Jan Wagner]

This is an automated email from the git hooks/post-receive script.

waja pushed a commit to branch master
in repository ps-watcher.

commit f54be892ca4314c75c0768f6f979588d0f154d01
Author: Jan Wagner <waja at cyconet.org>
Date:   Thu Mar 8 10:26:35 2007 +0000

    fix debhelper scripts and revert other changes to -5
---
 debian/changelog |    6 ++++++
 debian/copyright |    2 +-
 debian/postinst  |    5 ++---
 debian/prerm     |    4 +---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f5c3db2..90d03cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ps-watcher (1.06-6) unstable; urgency=medium
+
+  * fix prerm and postinst to prevent trouble when updating
+
+ -- Jan Wagner <waja at cyconet.org>  Thu,  8 Mar 2007 09:20:58 +0100
+
 ps-watcher (1.06-5) unstable; urgency=medium
 
   * fix typo in init script which prevents from start
diff --git a/debian/copyright b/debian/copyright
index ec8f776..7cbb501 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,5 +26,5 @@ License:
 On Debian systems, the complete text of the GNU General Public License
 can be found in /usr/share/common-licenses/GPL file.
 
-The Debian packaging is (C) 2006, 2007 Jan Wagner <waja at cyconet.org> and
+The Debian packaging is (C) 2006, Jan Wagner <waja at cyconet.org> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
diff --git a/debian/postinst b/debian/postinst
index 0f2c6bb..d9075c3 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -6,7 +6,8 @@ then
 fi
 
 if [ -x "/etc/init.d/ps-watcher" ]; then
-	if [ "$startup" = "1" ] && [ -f $CONFIG ]; then
+	update-rc.d ps-watcher defaults 40 >/dev/null
+	if [ "$startup" = "1" ] && [ -f "/etc/default/pswatcher" ]; then
         	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
                 	invoke-rc.d ps-watcher start || exit $?
         	else
@@ -14,5 +15,3 @@ if [ -x "/etc/init.d/ps-watcher" ]; then
         	fi
 	fi
 fi
-
-#DEBHELPER#
diff --git a/debian/prerm b/debian/prerm
index e33c801..8d6f2dc 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -5,12 +5,10 @@ then
         . /etc/default/ps-watcher
 fi
 
-if [ -x "/etc/init.d/ps-watcher" ] && [ "$startup" = "1" ] && [ -f $CONFIG ]; then
+if [ -x "/etc/init.d/ps-watcher" ] && [ "$startup" = "1" ] && [ -f "/etc/default/pswatcher" ]; then
         if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
                 invoke-rc.d ps-watcher stop || exit $?
         else
                 /etc/init.d/ps-watcher stop || exit $?
         fi
 fi
-
-#DEBHELPER#

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/ps-watcher.git