[Pkg-nagios-changes] [pkg-nagios] r1417 - ndoutils/trunk/debian

[Hendrik Frenzel]

Author: hfrenzel-guest
Date: 2008-04-16 12:43:39 +0000 (Wed, 16 Apr 2008)
New Revision: 1417

Modified:
   ndoutils/trunk/debian/changelog
   ndoutils/trunk/debian/ndoutils-NG-DB.postinst.in
   ndoutils/trunk/debian/ndoutils-NG-DB.postrm.in
Log:
don't touch initscript and default config from old ndoutils installation


Modified: ndoutils/trunk/debian/changelog
===================================================================
--- ndoutils/trunk/debian/changelog	2008-04-16 04:33:25 UTC (rev 1416)
+++ ndoutils/trunk/debian/changelog	2008-04-16 12:43:39 UTC (rev 1417)
@@ -4,6 +4,7 @@
   * moved common and shared files into ndoutils-common package
   * enabled parallel installation of package for nagios version 2 and 3
   * fixed some lintian warnings
+  * added db_purge to debian/postrm scripts
 
  -- Hendrik Frenzel <hfrenzel at scunc.net>  Tue, 18 Mar 2008 18:55:03 +0100
 

Modified: ndoutils/trunk/debian/ndoutils-NG-DB.postinst.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.postinst.in	2008-04-16 04:33:25 UTC (rev 1416)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.postinst.in	2008-04-16 12:43:39 UTC (rev 1417)
@@ -37,21 +37,14 @@
 				-e "s,^\(DAEMON_OPTS\)=.*$,\1=\"$DAEMON_OPTS\"," \
 				< /etc/default/ndoutils-@@NGV@@ > /etc/default/ndoutils-@@NGV@@.dpkg-new
 			mv /etc/default/ndoutils-@@NGV@@.dpkg-new /etc/default/ndoutils-@@NGV@@
-			mv /etc/default/ndoutils /etc/default/ndoutils.dpkg-old
-			ln -s /etc/default/ndoutils-@@NGV@ /etc/default/ndoutils
 		fi
-		if [ -f /etc/init.d/ndoutils ]; then
-			chmod -x /etc/init.d/ndoutils
-			mv /etc/init.d/ndoutils /etc/init.d/ndoutils.dpkg-old
-			ln -s /etc/init.d/ndoutils-@@NGV@@ /etc/init.d/ndoutils
-		fi
 	fi
 
     	ucf /usr/share/@@PACKAGE@@/tmpl/ndomod.cfg /etc/@@NG@@/ndomod.cfg
 
-	update-alternatives --install /usr/sbin/ndo2db ndo2db /usr/sbin/ndo2db-@@NGV@@ 50 \
-				--slave /usr/lib/ndoutils/ndomod.o ndomod.o /usr/lib/ndoutils/ndomod-@@DB@@-@@NGV@@.o \
-				--slave /usr/share/man/man8/ndo2db.8.gz ndo2db.8.gz /usr/share/man/man8/ndo2db-@@NGV@@.8.gz
+	update-alternatives --install /usr/lib/ndoutils/ndo2db ndo2db /usr/lib/ndoutils/ndo2db-@@NGV@@ 50 \
+	                    --slave /usr/lib/ndoutils/ndomod.o ndomod.o /usr/lib/ndoutils/ndomod-@@DB@@-@@NGV@@.o \
+			    --slave /usr/share/man/man8/ndo2db.8.gz ndo2db.8.gz /usr/share/man/man8/ndo2db-@@NGV@@.8.gz
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: ndoutils/trunk/debian/ndoutils-NG-DB.postrm.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.postrm.in	2008-04-16 04:33:25 UTC (rev 1416)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.postrm.in	2008-04-16 12:43:39 UTC (rev 1417)
@@ -15,6 +15,7 @@
 fi
 
 if [ "$1" = "purge" ]; then
+	db_purge
 	for f in ndomod.cfg ndo2db.cfg; do
 		rm -f /etc/@@NG@@/$f
 		ucf --purge /etc/@@NG@@/$f