[ps-watcher] 32/88: fix package upgrade

[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 60e412165e0894c66a8a7bc2032cf35a7d7b38c4
Author: Jan Wagner <waja at cyconet.org>
Date:   Sat Mar 17 21:55:41 2007 +0000

    fix package upgrade
---
 debian/changelog |    9 +++++++++
 debian/copyright |    2 +-
 debian/init.d    |    5 +++--
 debian/postinst  |   17 -----------------
 debian/prerm     |   17 ++++++-----------
 5 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 90d03cb..a3ebeba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ps-watcher (1.06-7~unreleased.1) unstable; urgency=low
+
+  * update copyright
+  * use native debhelper postinst script
+  * fix debhelper prerm script 
+  * fix stop) in init script
+
+ -- Jan Wagner <waja at cyconet.org>  Thu,  8 Mar 2007 11:26:57 +0100
+
 ps-watcher (1.06-6) unstable; urgency=medium
 
   * fix prerm and postinst to prevent trouble when updating
diff --git a/debian/copyright b/debian/copyright
index 7cbb501..014181f 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, Jan Wagner <waja at cyconet.org> and
+The Debian packaging is (C) 2006-2007 Jan Wagner <waja at cyconet.org> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
diff --git a/debian/init.d b/debian/init.d
index c10b4e8..d3a3d2c 100644
--- a/debian/init.d
+++ b/debian/init.d
@@ -65,8 +65,9 @@ case "$1" in
 	;;
   stop)
 	echo -n "Stopping $DESC: "
-	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
-		--exec $DAEMON
+	#start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
+	#	--exec $DAEMON
+	killall -9 $NAME
 	echo "$NAME."
 	;;
   restart|force-reload)
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index d9075c3..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-set -e
-if [ -f "/etc/default/pswatcher" ]
-then
-        . /etc/default/ps-watcher
-fi
-
-if [ -x "/etc/init.d/ps-watcher" ]; 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
-                	/etc/init.d/ps-watcher start || exit $?
-        	fi
-	fi
-fi
diff --git a/debian/prerm b/debian/prerm
index 8d6f2dc..7f0a70c 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,14 +1,9 @@
 #!/bin/sh
 set -e
-if [ -f "/etc/default/pswatcher" ]
-then
-        . /etc/default/ps-watcher
-fi
-
-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
+if [ -x "/etc/init.d/ps-watcher" ]; then
+#        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+#                invoke-rc.d ps-watcher stop || true
+#        else
+                /etc/init.d/ps-watcher stop && true
+#        fi
 fi

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