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

[Hendrik Frenzel]

tags 479289 pending
thanks

Author: hfrenzel-guest
Date: 2008-05-04 22:56:53 +0000 (Sun, 04 May 2008)
New Revision: 1440

Modified:
   ndoutils/trunk/debian/changelog
   ndoutils/trunk/debian/ndoutils-NG-DB.dirs.in
   ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.init.in
   ndoutils/trunk/debian/rules
Log:
* added bugnumber to changelog
* fixed init script
* fixed debian/rules to fir dbconfig-commons db dir


Modified: ndoutils/trunk/debian/changelog
===================================================================
--- ndoutils/trunk/debian/changelog	2008-05-04 12:20:10 UTC (rev 1439)
+++ ndoutils/trunk/debian/changelog	2008-05-04 22:56:53 UTC (rev 1440)
@@ -2,7 +2,7 @@
 
   * NOT RELEASED YET
   * reverting changes for parallel usage of nagios2 & nagios3 to just support
-    nagios3
+    nagios3 (Closes: 479289)
 
  -- Hendrik Frenzel <hfrenzel at scunc.net>  Wed, 23 Apr 2008 11:53:55 +0200
 

Modified: ndoutils/trunk/debian/ndoutils-NG-DB.dirs.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.dirs.in	2008-05-04 12:20:10 UTC (rev 1439)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.dirs.in	2008-05-04 22:56:53 UTC (rev 1440)
@@ -1,6 +1,6 @@
 /usr/sbin
 /usr/lib/ndoutils
 /usr/share/@@PACKAGE@@/tmpl
-/usr/share/dbconfig-common/data/@@PACKAGE@@/install
-/usr/share/dbconfig-common/data/@@PACKAGE@@/upgrade/@@DB@@
+/usr/share/dbconfig-common/data/@@PKG_SHORT@@/install
+/usr/share/dbconfig-common/data/@@PKG_SHORT@@/upgrade/@@DB@@
 

Modified: ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.init.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.init.in	2008-05-04 12:20:10 UTC (rev 1439)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.init.in	2008-05-04 22:56:53 UTC (rev 1440)
@@ -62,8 +62,9 @@
 	;;
   restart)
     echo -n "Restarting $DESC: "
-	start-stop-daemon --stop --quiet --user nagios --group nagios --exec $DAEMON 
+	start-stop-daemon --stop --oknodo --quiet --exec $DAEMON 
 	sleep 1
+	echo "$NAME."
 	test ! "$ENABLE_NDOUTILS" = 1 && { echo "Not enabled in /etc/defaults/ndoutils"; exit 0; }
 	start-stop-daemon --start --quiet --exec $DAEMON --background -- $DAEMON_OPTS
 	echo "$NAME."

Modified: ndoutils/trunk/debian/rules
===================================================================
--- ndoutils/trunk/debian/rules	2008-05-04 12:20:10 UTC (rev 1439)
+++ ndoutils/trunk/debian/rules	2008-05-04 22:56:53 UTC (rev 1440)
@@ -194,19 +194,19 @@
 	
 	# install the SQL schemes
 	install -m 644 db/mysql.sql \
-		debian/$@/usr/share/dbconfig-common/data/$@/install/mysql
+		debian/$@/usr/share/dbconfig-common/data/ndoutils-mysql/install/mysql
 	install -m 644 db/mysql-upgrade-1.3.sql \
-		debian/$@/usr/share/dbconfig-common/data/$@/upgrade/mysql/1.3
+		debian/$@/usr/share/dbconfig-common/data/ndoutils-mysql/upgrade/mysql/1.3
 	install -m 644 db/mysql-upgrade-1.4b1.sql \
-		debian/$@/usr/share/dbconfig-common/data/$@/upgrade/mysql/1.4b1
+		debian/$@/usr/share/dbconfig-common/data/ndoutils-mysql/upgrade/mysql/1.4b1
 	install -m 644 db/mysql-upgrade-1.4b2.sql \
-		debian/$@/usr/share/dbconfig-common/data/$@/upgrade/mysql/1.4b2
+		debian/$@/usr/share/dbconfig-common/data/ndoutils-mysql/upgrade/mysql/1.4b2
 	install -m 644 db/mysql-upgrade-1.4b3.sql \
-		debian/$@/usr/share/dbconfig-common/data/$@/upgrade/mysql/1.4b3
+		debian/$@/usr/share/dbconfig-common/data/ndoutils-mysql/upgrade/mysql/1.4b3
 	install -m 644 db/mysql-upgrade-1.4b4.sql \
-		debian/$@/usr/share/dbconfig-common/data/$@/upgrade/mysql/1.4b4
+		debian/$@/usr/share/dbconfig-common/data/ndoutils-mysql/upgrade/mysql/1.4b4
 	install -m 644 db/mysql-mods-1.4b5.sql \
-		debian/$@/usr/share/dbconfig-common/data/$@/upgrade/mysql/1.4b5
+		debian/$@/usr/share/dbconfig-common/data/ndoutils-mysql/upgrade/mysql/1.4b5
 	
 	# use debhelper
 	dh_installchangelogs -p$@ -P$(b)/$@