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

Hendrik Frenzel hfrenzel-guest at alioth.debian.org
Wed Sep 19 19:52:15 UTC 2007


Author: hfrenzel-guest
Date: 2007-09-19 19:52:15 +0000 (Wed, 19 Sep 2007)
New Revision: 1227

Added:
   ndoutils/trunk/debian/ndoutils-NG-DB.config.in
   ndoutils/trunk/debian/ndoutils-NG-DB.dirs.in
   ndoutils/trunk/debian/ndoutils-NG-DB.manpages.in
   ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.default.in
   ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.init.in
   ndoutils/trunk/debian/ndoutils-NG-DB.postinst.in
   ndoutils/trunk/debian/ndoutils-NG-DB.postrm.in
   ndoutils/trunk/debian/ndoutils-NG-DB.preinst.in
   ndoutils/trunk/debian/ndoutils-NG-DB.prerm.in
Removed:
   ndoutils/trunk/debian/TODO
   ndoutils/trunk/debian/links
   ndoutils/trunk/debian/ndoutils-DB.config.in
   ndoutils/trunk/debian/ndoutils-DB.dirs.in
   ndoutils/trunk/debian/ndoutils-DB.manpages.in
   ndoutils/trunk/debian/ndoutils-DB.ndoutils.default.in
   ndoutils/trunk/debian/ndoutils-DB.ndoutils.init.in
   ndoutils/trunk/debian/ndoutils-DB.postinst.in
   ndoutils/trunk/debian/ndoutils-DB.postrm.in
   ndoutils/trunk/debian/ndoutils-DB.preinst.in
   ndoutils/trunk/debian/ndoutils-DB.prerm.in
Modified:
   ndoutils/trunk/debian/rules
Log:
changed package names


Deleted: ndoutils/trunk/debian/TODO
===================================================================
--- ndoutils/trunk/debian/TODO	2007-09-19 19:05:00 UTC (rev 1226)
+++ ndoutils/trunk/debian/TODO	2007-09-19 19:52:15 UTC (rev 1227)
@@ -1,4 +0,0 @@
-* build ndoutils-pgsql
-* build ndoutils-doc
-	+ examples
-

Deleted: ndoutils/trunk/debian/links
===================================================================
--- ndoutils/trunk/debian/links	2007-09-19 19:05:00 UTC (rev 1226)
+++ ndoutils/trunk/debian/links	2007-09-19 19:52:15 UTC (rev 1227)
@@ -1,2 +0,0 @@
-usr/share/doc/ndoutils-doc/NDOUTILS\ DB\ Model.pdf usr/share/doc/ndoutils/NDOUTILS\ DB\ Model.pdf
-usr/share/doc/ndoutils-doc/NDOUtils\ Documentation.pdf usr/share/doc/ndoutils/NDOUtils\ Documentation.pdf

Deleted: ndoutils/trunk/debian/ndoutils-DB.config.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-DB.config.in	2007-09-19 19:05:00 UTC (rev 1226)
+++ ndoutils/trunk/debian/ndoutils-DB.config.in	2007-09-19 19:52:15 UTC (rev 1227)
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-. /usr/share/debconf/confmodule
-
-dbc_dbuser=ndoutils
-dbc_dbname=ndoutils
-
-if [ -f /usr/share/dbconfig-common/dpkg/config.@@DB@@ ]; then
-	. /usr/share/dbconfig-common/dpkg/config.@@DB@@
-	dbc_go @@PACKAGE@@ $@
-fi
-db_stop
-

Deleted: ndoutils/trunk/debian/ndoutils-DB.dirs.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-DB.dirs.in	2007-09-19 19:05:00 UTC (rev 1226)
+++ ndoutils/trunk/debian/ndoutils-DB.dirs.in	2007-09-19 19:52:15 UTC (rev 1227)
@@ -1,6 +0,0 @@
-/usr/lib/ndoutils
-/usr/sbin
-/usr/share/@@PACKAGE@@/tmpl
-/usr/share/dbconfig-common/data/@@PACKAGE@@/install
-/usr/share/dbconfig-common/data/@@PACKAGE@@/upgrade/@@DB@@
-

Deleted: ndoutils/trunk/debian/ndoutils-DB.manpages.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-DB.manpages.in	2007-09-19 19:05:00 UTC (rev 1226)
+++ ndoutils/trunk/debian/ndoutils-DB.manpages.in	2007-09-19 19:52:15 UTC (rev 1227)
@@ -1,5 +0,0 @@
-debian/manpages/file2sock.8
-debian/manpages/ndo2db.8
-debian/manpages/sockdebug.8
-debian/manpages/log2ndo.8
-

Deleted: ndoutils/trunk/debian/ndoutils-DB.ndoutils.default.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-DB.ndoutils.default.in	2007-09-19 19:05:00 UTC (rev 1226)
+++ ndoutils/trunk/debian/ndoutils-DB.ndoutils.default.in	2007-09-19 19:52:15 UTC (rev 1227)
@@ -1,14 +0,0 @@
-# Defaults for @@PACKAGE@@ initscript
-# sourced by /etc/init.d/ndoutils
-# installed at /etc/default/ndoutils by the maintainer scripts
-
-#
-# This is a POSIX shell fragment
-#
-
-# You have to enable ndoutils broker module first to use ndoutils.
-# (see /usr/share/doc/@@PACKAGE@@/README.Debian)
-ENABLE_NDOUTILS=0
-
-# Additional options that are passed to the Daemon.
-DAEMON_OPTS="-c /etc/nagios2/ndo2db.cfg"

Deleted: ndoutils/trunk/debian/ndoutils-DB.ndoutils.init.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-DB.ndoutils.init.in	2007-09-19 19:05:00 UTC (rev 1226)
+++ ndoutils/trunk/debian/ndoutils-DB.ndoutils.init.in	2007-09-19 19:52:15 UTC (rev 1227)
@@ -1,89 +0,0 @@
-#! /bin/sh
-#
-# skeleton	example file to build /etc/init.d/ scripts.
-#		This file should be used to construct scripts for /etc/init.d.
-#
-#		Written by Miquel van Smoorenburg <miquels at cistron.nl>.
-#		Modified for Debian 
-#		by Ian Murdock <imurdock at gnu.ai.mit.edu>.
-#
-# Version:	@(#)skeleton  1.9  26-Feb-2001  miquels at cistron.nl
-#
-
-### BEGIN INIT INFO
-# Provides:          ndoutils
-# Required-Start:    $syslog
-# Required-Stop:     $syslog
-# Should-Start:      $local_fs
-# Should-Stop:       $local_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Starts ndo2db daemon at boot time
-# Description:       This will start the ndo2db daemon at boot time
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/ndo2db
-NAME=ndoutils
-DESC=ndoutils
-
-test -x $DAEMON || exit 0
-
-# Include ndoutils defaults if available
-if [ -f /etc/default/ndoutils ] ; then
-	. /etc/default/ndoutils
-fi
-
-set -e
-
-case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-	test ! "$ENABLE_NDOUTILS" = 1 && { echo "Not enabled in /etc/defaults/ndoutils."; exit 0; }
-	start-stop-daemon --start --quiet --user nagios --group nagios --exec $DAEMON --background -- $DAEMON_OPTS
-	echo "$NAME."
-	;;
-  stop)
-	echo -n "Stopping $DESC: "
-	start-stop-daemon --stop --oknodo --quiet --exec $DAEMON 
-	echo "$NAME."
-	;;
-  #reload)
-	#
-	#	If the daemon can reload its config files on the fly
-	#	for example by sending it SIGHUP, do it here.
-	#
-	#	If the daemon responds to changes in its config file
-	#	directly anyway, make this a do-nothing entry.
-	#
-	# echo "Reloading $DESC configuration files."
-	# start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON
-  #;;
-  force-reload)
-	#
-	#	If the "reload" option is implemented, move the "force-reload"
-	#	option to the "reload" entry above. If not, "force-reload" is
-	#	just the same as "restart" except that it does nothing if the
-	#   daemon isn't already running.
-	# check wether $DAEMON is running. If so, restart
-	start-stop-daemon --stop --test --quiet --exec $DAEMON \
-	&& $0 restart \
-	|| exit 0
-	;;
-  restart)
-    echo -n "Restarting $DESC: "
-	start-stop-daemon --stop --quiet --user nagios --group nagios --exec $DAEMON 
-	sleep 1
-	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."
-	;;
-  *)
-	N=/etc/init.d/$NAME
-	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $N {start|stop|restart|force-reload}" >&2
-	exit 1
-	;;
-esac
-
-exit 0

Deleted: ndoutils/trunk/debian/ndoutils-DB.postinst.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-DB.postinst.in	2007-09-19 19:05:00 UTC (rev 1226)
+++ ndoutils/trunk/debian/ndoutils-DB.postinst.in	2007-09-19 19:52:15 UTC (rev 1227)
@@ -1,51 +0,0 @@
-#!/bin/sh
-# postinst script for @@PACKAGE@@
-#
-# see: dh_installdeb(1)
-
-set -e
-
-. /usr/share/debconf/confmodule
-if [ -f /usr/share/dbconfig-common/dpkg/postinst.@@DB@@ ]; then
-	. /usr/share/dbconfig-common/dpkg/postinst.@@DB@@
-	dbc_generate_include='template:/etc/nagios2/ndo2db.cfg'
-	dbc_generate_include_owner='nagios:nagios'
-	dbc_generate_include_args='--ucf -o template_infile=/usr/share/@@PACKAGE@@/tmpl/ndo2db.cfg '
-	dbc_go @@PACKAGE@@ $@
-fi
-db_stop
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-case "$1" in
-    configure)
-    	ucf /usr/share/@@PACKAGE@@/tmpl/ndomod.cfg /etc/nagios2/ndomod.cfg
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-

Deleted: ndoutils/trunk/debian/ndoutils-DB.postrm.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-DB.postrm.in	2007-09-19 19:05:00 UTC (rev 1226)
+++ ndoutils/trunk/debian/ndoutils-DB.postrm.in	2007-09-19 19:52:15 UTC (rev 1227)
@@ -1,56 +0,0 @@
-#!/bin/sh
-# postrm script for @@PACKAGE@@
-#
-# see: dh_installdeb(1)
-
-set -e
-
-if [ -f /usr/share/debconf/confmodule ]; then
-	. /usr/share/debconf/confmodule
-fi
-
-if [ -f /usr/share/dbconfig-common/dpkg/postrm.@@DB@@ ]; then
-	. /usr/share/dbconfig-common/dpkg/postrm.@@DB@@
-	dbc_go @@PACKAGE@@ $@
-fi
-
-if [ "$1" = "purge" ]; then
-	for f in ndomod.cfg ndo2db.cfg; do
-		rm -f /etc/nagios2/$f
-		ucf --purge /etc/nagios2/$f
-	done
-fi
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-	
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-

Deleted: ndoutils/trunk/debian/ndoutils-DB.preinst.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-DB.preinst.in	2007-09-19 19:05:00 UTC (rev 1226)
+++ ndoutils/trunk/debian/ndoutils-DB.preinst.in	2007-09-19 19:52:15 UTC (rev 1227)
@@ -1,39 +0,0 @@
-#!/bin/sh
-# preinst script for @@PACKAGE@@
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    install|upgrade)
-    	# stop nagios2
-	invoke-rc.d nagios2 stop
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-

Deleted: ndoutils/trunk/debian/ndoutils-DB.prerm.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-DB.prerm.in	2007-09-19 19:05:00 UTC (rev 1226)
+++ ndoutils/trunk/debian/ndoutils-DB.prerm.in	2007-09-19 19:52:15 UTC (rev 1227)
@@ -1,44 +0,0 @@
-#!/bin/sh
-# prerm script for @@PACKAGE@@
-#
-# see: dh_installdeb(1)
-
-set -e
-
-. /usr/share/debconf/confmodule
-. /usr/share/dbconfig-common/dpkg/prerm.@@DB@@
-dbc_go @@PACKAGE@@ $@
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|upgrade|deconfigure)
-    ;;
-
-    failed-upgrade)
-    ;;
-
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-

Copied: ndoutils/trunk/debian/ndoutils-NG-DB.config.in (from rev 1223, ndoutils/trunk/debian/ndoutils-DB.config.in)
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.config.in	                        (rev 0)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.config.in	2007-09-19 19:52:15 UTC (rev 1227)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. /usr/share/debconf/confmodule
+
+dbc_dbuser=ndoutils
+dbc_dbname=ndoutils
+
+if [ -f /usr/share/dbconfig-common/dpkg/config.@@DB@@ ]; then
+	. /usr/share/dbconfig-common/dpkg/config.@@DB@@
+	dbc_go @@PACKAGE@@ $@
+fi
+db_stop
+

Copied: ndoutils/trunk/debian/ndoutils-NG-DB.dirs.in (from rev 1223, ndoutils/trunk/debian/ndoutils-DB.dirs.in)
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.dirs.in	                        (rev 0)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.dirs.in	2007-09-19 19:52:15 UTC (rev 1227)
@@ -0,0 +1,6 @@
+/usr/lib/ndoutils
+/usr/sbin
+/usr/share/@@PACKAGE@@/tmpl
+/usr/share/dbconfig-common/data/@@PACKAGE@@/install
+/usr/share/dbconfig-common/data/@@PACKAGE@@/upgrade/@@DB@@
+

Copied: ndoutils/trunk/debian/ndoutils-NG-DB.manpages.in (from rev 1223, ndoutils/trunk/debian/ndoutils-DB.manpages.in)
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.manpages.in	                        (rev 0)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.manpages.in	2007-09-19 19:52:15 UTC (rev 1227)
@@ -0,0 +1,5 @@
+debian/manpages/file2sock.8
+debian/manpages/ndo2db.8
+debian/manpages/sockdebug.8
+debian/manpages/log2ndo.8
+

Copied: ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.default.in (from rev 1223, ndoutils/trunk/debian/ndoutils-DB.ndoutils.default.in)
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.default.in	                        (rev 0)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.default.in	2007-09-19 19:52:15 UTC (rev 1227)
@@ -0,0 +1,14 @@
+# Defaults for @@PACKAGE@@ initscript
+# sourced by /etc/init.d/ndoutils
+# installed at /etc/default/ndoutils by the maintainer scripts
+
+#
+# This is a POSIX shell fragment
+#
+
+# You have to enable ndoutils broker module first to use ndoutils.
+# (see /usr/share/doc/@@PACKAGE@@/README.Debian)
+ENABLE_NDOUTILS=0
+
+# Additional options that are passed to the Daemon.
+DAEMON_OPTS="-c /etc/nagios2/ndo2db.cfg"

Copied: ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.init.in (from rev 1223, ndoutils/trunk/debian/ndoutils-DB.ndoutils.init.in)
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.init.in	                        (rev 0)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.init.in	2007-09-19 19:52:15 UTC (rev 1227)
@@ -0,0 +1,89 @@
+#! /bin/sh
+#
+# skeleton	example file to build /etc/init.d/ scripts.
+#		This file should be used to construct scripts for /etc/init.d.
+#
+#		Written by Miquel van Smoorenburg <miquels at cistron.nl>.
+#		Modified for Debian 
+#		by Ian Murdock <imurdock at gnu.ai.mit.edu>.
+#
+# Version:	@(#)skeleton  1.9  26-Feb-2001  miquels at cistron.nl
+#
+
+### BEGIN INIT INFO
+# Provides:          ndoutils
+# Required-Start:    $syslog
+# Required-Stop:     $syslog
+# Should-Start:      $local_fs
+# Should-Stop:       $local_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Starts ndo2db daemon at boot time
+# Description:       This will start the ndo2db daemon at boot time
+### END INIT INFO
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/ndo2db
+NAME=ndoutils
+DESC=ndoutils
+
+test -x $DAEMON || exit 0
+
+# Include ndoutils defaults if available
+if [ -f /etc/default/ndoutils ] ; then
+	. /etc/default/ndoutils
+fi
+
+set -e
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	test ! "$ENABLE_NDOUTILS" = 1 && { echo "Not enabled in /etc/defaults/ndoutils."; exit 0; }
+	start-stop-daemon --start --quiet --user nagios --group nagios --exec $DAEMON --background -- $DAEMON_OPTS
+	echo "$NAME."
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop --oknodo --quiet --exec $DAEMON 
+	echo "$NAME."
+	;;
+  #reload)
+	#
+	#	If the daemon can reload its config files on the fly
+	#	for example by sending it SIGHUP, do it here.
+	#
+	#	If the daemon responds to changes in its config file
+	#	directly anyway, make this a do-nothing entry.
+	#
+	# echo "Reloading $DESC configuration files."
+	# start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON
+  #;;
+  force-reload)
+	#
+	#	If the "reload" option is implemented, move the "force-reload"
+	#	option to the "reload" entry above. If not, "force-reload" is
+	#	just the same as "restart" except that it does nothing if the
+	#   daemon isn't already running.
+	# check wether $DAEMON is running. If so, restart
+	start-stop-daemon --stop --test --quiet --exec $DAEMON \
+	&& $0 restart \
+	|| exit 0
+	;;
+  restart)
+    echo -n "Restarting $DESC: "
+	start-stop-daemon --stop --quiet --user nagios --group nagios --exec $DAEMON 
+	sleep 1
+	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."
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $N {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0

Copied: ndoutils/trunk/debian/ndoutils-NG-DB.postinst.in (from rev 1223, ndoutils/trunk/debian/ndoutils-DB.postinst.in)
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.postinst.in	                        (rev 0)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.postinst.in	2007-09-19 19:52:15 UTC (rev 1227)
@@ -0,0 +1,51 @@
+#!/bin/sh
+# postinst script for @@PACKAGE@@
+#
+# see: dh_installdeb(1)
+
+set -e
+
+. /usr/share/debconf/confmodule
+if [ -f /usr/share/dbconfig-common/dpkg/postinst.@@DB@@ ]; then
+	. /usr/share/dbconfig-common/dpkg/postinst.@@DB@@
+	dbc_generate_include='template:/etc/nagios2/ndo2db.cfg'
+	dbc_generate_include_owner='nagios:nagios'
+	dbc_generate_include_args='--ucf -o template_infile=/usr/share/@@PACKAGE@@/tmpl/ndo2db.cfg '
+	dbc_go @@PACKAGE@@ $@
+fi
+db_stop
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    configure)
+    	ucf /usr/share/@@PACKAGE@@/tmpl/ndomod.cfg /etc/nagios2/ndomod.cfg
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Copied: ndoutils/trunk/debian/ndoutils-NG-DB.postrm.in (from rev 1223, ndoutils/trunk/debian/ndoutils-DB.postrm.in)
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.postrm.in	                        (rev 0)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.postrm.in	2007-09-19 19:52:15 UTC (rev 1227)
@@ -0,0 +1,56 @@
+#!/bin/sh
+# postrm script for @@PACKAGE@@
+#
+# see: dh_installdeb(1)
+
+set -e
+
+if [ -f /usr/share/debconf/confmodule ]; then
+	. /usr/share/debconf/confmodule
+fi
+
+if [ -f /usr/share/dbconfig-common/dpkg/postrm.@@DB@@ ]; then
+	. /usr/share/dbconfig-common/dpkg/postrm.@@DB@@
+	dbc_go @@PACKAGE@@ $@
+fi
+
+if [ "$1" = "purge" ]; then
+	for f in ndomod.cfg ndo2db.cfg; do
+		rm -f /etc/nagios2/$f
+		ucf --purge /etc/nagios2/$f
+	done
+fi
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+	
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Copied: ndoutils/trunk/debian/ndoutils-NG-DB.preinst.in (from rev 1223, ndoutils/trunk/debian/ndoutils-DB.preinst.in)
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.preinst.in	                        (rev 0)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.preinst.in	2007-09-19 19:52:15 UTC (rev 1227)
@@ -0,0 +1,39 @@
+#!/bin/sh
+# preinst script for @@PACKAGE@@
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+    	# stop nagios2
+	#invoke-rc.d nagios2 stop
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Copied: ndoutils/trunk/debian/ndoutils-NG-DB.prerm.in (from rev 1223, ndoutils/trunk/debian/ndoutils-DB.prerm.in)
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.prerm.in	                        (rev 0)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.prerm.in	2007-09-19 19:52:15 UTC (rev 1227)
@@ -0,0 +1,44 @@
+#!/bin/sh
+# prerm script for @@PACKAGE@@
+#
+# see: dh_installdeb(1)
+
+set -e
+
+. /usr/share/debconf/confmodule
+. /usr/share/dbconfig-common/dpkg/prerm.@@DB@@
+dbc_go @@PACKAGE@@ $@
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

Modified: ndoutils/trunk/debian/rules
===================================================================
--- ndoutils/trunk/debian/rules	2007-09-19 19:05:00 UTC (rev 1226)
+++ ndoutils/trunk/debian/rules	2007-09-19 19:52:15 UTC (rev 1227)
@@ -59,11 +59,11 @@
 	rm -f src/*-{mysql,pgsql}-{2,3}x*
 	rm -f src/*-{mysql,pgsql}
 	rm -f {install,configure,build}-stamp
-	rm -f debian/ndoutils-{my,pg}sql.{dirs,manpages,ndoutils.{default,init},config,{pre,post}{inst,rm}}
+	rm -f debian/ndoutils-nagios2-{my,pg}sql.{dirs,manpages,ndoutils.{default,init},config,{pre,post}{inst,rm}}
 	dh_clean
 
-config-ndoutils-mysql: config-ndoutils-mysql-stamp
-config-ndoutils-mysql-stamp: patch
+config-ndoutils-nagios2-mysql: config-ndoutils-nagios2-mysql-stamp
+config-ndoutils-nagios2-mysql-stamp: patch
 	dh_testdir -a
 	@echo " ### Doing $@"
 	$(CONFIG_MYSQL)
@@ -77,8 +77,8 @@
 #	$(CONFIG_PGSQL)
 #	touch $@
 
-build-ndoutils-mysql: build-ndoutils-mysql-stamp
-build-ndoutils-mysql-stamp: config-ndoutils-mysql-stamp
+build-ndoutils-nagios2-mysql: build-ndoutils-nagios2-mysql-stamp
+build-ndoutils-nagios2-mysql-stamp: config-ndoutils-nagios2-mysql-stamp
 	dh_testdir -a
 	@echo " ### Doing $@"
 	$(MAKE) && \
@@ -106,18 +106,18 @@
 #	touch $@
 
 # TODO: ndoutils-pgsql
-binary-arch: ndoutils-mysql
+binary-arch: ndoutils-nagios2-mysql
 	dh_testdir -a
 	dh_testroot -a
 
 binary-indep: ndoutils-doc
 
-ndoutils-mysql: build-ndoutils-mysql
+ndoutils-nagios2-mysql: build-ndoutils-nagios2-mysql
 	@echo " ### Doing $@"
 	for script in dirs ndoutils.{default,init} config {pre,post}{rm,inst} manpages; do \
-		test -e debian/ndoutils-DB.$${script}.in && \
-			sed "s/@@DB@@/mysql/g;s/@@PACKAGE@@/$@/g;s/@@DBPORT@@/3306/g" \
-				< debian/ndoutils-DB.$${script}.in > debian/$@.$${script}; \
+		test -e debian/ndoutils-NG-DB.$${script}.in && \
+			sed "s/@@NG@@/nagios2/g;s/@@DB@@/mysql/g;s/@@PACKAGE@@/$@/g;s/@@DBPORT@@/3306/g" \
+				< debian/ndoutils-NG-DB.$${script}.in > debian/$@.$${script}; \
 	done
 	dh_installdirs -p$@ -P$(b)/$@
 	# install the binaries
@@ -217,13 +217,11 @@
 ndoutils-doc:
 	@echo " ### Doing $@"
 	dh_installdirs -p$@ -P$(b)/$@
-	mkdir -p debian/$@/usr/share/doc/ndoutils
 	mkdir -p debian/$@/usr/share/doc/ndoutils-doc
 	install -m 644 docs/*.pdf debian/$@/usr/share/doc/ndoutils-doc
 	# use debhelper
 	dh_installchangelogs -p$@ -P$(b)/$@ 
 	dh_installdocs -p$@ -P$(b)/$@
-	dh_link        -p$@ -P$(b)/$@
 	dh_compress    -p$@ -P$(b)/$@ -X.pdf
 	dh_fixperms    -p$@ -P$(b)/$@
 	dh_installdeb  -p$@ -P$(b)/$@
@@ -264,4 +262,4 @@
 #	dh_builddeb
 
 binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary-mysql-arch binary install install-indep install-arch
+.PHONY: build clean binary-indep binary-arch binary-nagios2-mysql-arch binary install install-indep install-arch




More information about the Pkg-nagios-changes mailing list