[Pkg-nagios-changes] [pkg-nagios] r1434 - ndoutils/trunk/debian
Hendrik Frenzel
hfrenzel-guest at alioth.debian.org
Fri May 2 16:50:53 UTC 2008
Author: hfrenzel-guest
Date: 2008-05-02 16:50:53 +0000 (Fri, 02 May 2008)
New Revision: 1434
Added:
ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.default.in
ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.init.in
Removed:
ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils-NGV.default.in
ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils-NGV.init.in
Modified:
ndoutils/trunk/debian/changelog
ndoutils/trunk/debian/control
ndoutils/trunk/debian/ndoutils-NG-DB.config.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
ndoutils/trunk/debian/rules
Log:
reverted changes for parallel usage ob nagios2 and nagios3
Modified: ndoutils/trunk/debian/changelog
===================================================================
--- ndoutils/trunk/debian/changelog 2008-05-02 05:37:40 UTC (rev 1433)
+++ ndoutils/trunk/debian/changelog 2008-05-02 16:50:53 UTC (rev 1434)
@@ -1,3 +1,11 @@
+ndoutils (1.4b7-10) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+ * reverting changes for parallel usage of nagios2 & nagios3 to just support
+ nagios3
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net> Wed, 23 Apr 2008 11:53:55 +0200
+
ndoutils (1.4b7-9) unstable; urgency=low
* moved common and shared files into ndoutils-common package
Modified: ndoutils/trunk/debian/control
===================================================================
--- ndoutils/trunk/debian/control 2008-05-02 05:37:40 UTC (rev 1433)
+++ ndoutils/trunk/debian/control 2008-05-02 16:50:53 UTC (rev 1434)
@@ -12,11 +12,8 @@
Package: ndoutils-nagios2-mysql
Architecture: any
-Provides: ndoutils, ndoutils-nagios2, ndoutils-mysql
Conflicts: ndoutils-pgsql
-Depends: ndoutils-common (>= ${source:Version}), nagios2, mysql-client, ucf, debconf, dbconfig-common, ${shlibs:Depends}, ${misc:Depends}
-Recommends: mysql-server
-Suggests: ndoutils-doc
+Depends: ndoutils-common, ucf, debconf, dbconfig-common, ${shlibs:Depends}, ${misc:Depends}
Description: This provides the NDOUtils for Nagios with MySQL support
The NDOUtils (Nagios Data Output Utils) addon allows you to move status
and event information from Nagios to a database for later retrieval and
@@ -26,8 +23,8 @@
Package: ndoutils-nagios3-mysql
Architecture: any
-Provides: ndoutils, ndoutils-nagios3, ndoutils-mysql
-Conflicts: ndoutils-pgsql
+Provides: ndoutils, ndoutils-mysql
+Conflicts: ndoutils-nagios2-mysql (< ${source:Version}), ndoutils-pgsql
Depends: ndoutils-common (>= ${source:Version}), nagios3, mysql-client, ucf, debconf, dbconfig-common, ${shlibs:Depends}, ${misc:Depends}
Recommends: mysql-server
Suggests: ndoutils-doc
@@ -41,15 +38,14 @@
Package: ndoutils-common
Architecture: any
Conflicts: ndoutils-nagios2-mysql (< ${source:Version})
-Depends: ndoutils | ndoutils-nagios2 | ndoutils-nagios3, ucf, dbconfig-common, ${shlibs:Depends}, ${misc:Depends}
+Depends: ndoutils | ndoutils-nagios3, ucf, dbconfig-common, ${shlibs:Depends}, ${misc:Depends}
Suggests: ndoutils-doc
Description: This provides the NDOUtils for Nagios with MySQL support
The NDOUtils (Nagios Data Output Utils) addon allows you to move status
and event information from Nagios to a database for later retrieval and
processing.
.
- This package contains shared files between both NDOUtils packages for
- Nagios 2.x and Nagios 3.x.
+ This package contains common shared files for NDOUtils.
Package: ndoutils-doc
Section: doc
Modified: ndoutils/trunk/debian/ndoutils-NG-DB.config.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.config.in 2008-05-02 05:37:40 UTC (rev 1433)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.config.in 2008-05-02 16:50:53 UTC (rev 1434)
@@ -5,20 +5,12 @@
. /usr/share/debconf/confmodule
-if [ ! -f /etc/dbconfig-common/@@PACKAGE@@.conf ]; then
- dbc_dbuser=@@NG@@
- dbc_dbname=@@NG@@
-fi
+dbc_dbuser=ndoutils
+dbc_dbname=ndoutils
-if dpkg --compare-versions "$2" lt "1.4b7-9" 2>&1; then
- if [ -f /etc/dbconfig-common/ndoutils-@@DB@@.conf ]; then
- . /etc/dbconfig-common/ndoutils-@@DB@@.conf
- fi
-fi
-
if [ -f /usr/share/dbconfig-common/dpkg/config.@@DB@@ ]; then
. /usr/share/dbconfig-common/dpkg/config.@@DB@@
- dbc_go @@PACKAGE@@ $@
+ dbc_go @@PKG_SHORT@@ $@
fi
db_stop
Deleted: ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils-NGV.default.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils-NGV.default.in 2008-05-02 05:37:40 UTC (rev 1433)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils-NGV.default.in 2008-05-02 16:50:53 UTC (rev 1434)
@@ -1,14 +0,0 @@
-# Defaults for @@PACKAGE@@ initscript
-# sourced by /etc/init.d/ndoutils-@@NGV@@
-# 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_@@NGV@@=0
-
-# Additional options that are passed to the Daemon.
-DAEMON_OPTS="-c /etc/@@NG@@/ndo2db.cfg"
Deleted: ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils-NGV.init.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils-NGV.init.in 2008-05-02 05:37:40 UTC (rev 1433)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils-NGV.init.in 2008-05-02 16:50:53 UTC (rev 1434)
@@ -1,79 +0,0 @@
-#! /bin/sh
-
-### BEGIN INIT INFO
-# Provides: ndoutils-@@NGV@@
-# 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 for @@NG@@ at boot time
-# Description: This will start the ndo2db daemon for @@NG@@ at boot time
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/ndo2db-@@NGV@@
-NAME=ndoutils-@@NGV@@
-DESC=ndoutils-@@NGV@@
-
-test -x $DAEMON || exit 0
-
-# Include ndoutils defaults if available
-if [ -f /etc/default/ndoutils-@@NGV@@ ] ; then
- . /etc/default/ndoutils-@@NGV@@
-fi
-
-set -e
-
-case "$1" in
- start)
- echo -n "Starting $DESC: "
- test ! "$ENABLE_NDOUTILS_@@NGV@@" = 1 && { echo "Not enabled in /etc/default/ndoutils-@@NGV@@."; 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_@@NGV@@" = 1 && { echo "Not enabled in /etc/defaults/ndoutils-@@NGV@@."; 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.ndoutils.default.in (from rev 1433, ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils-NGV.default.in)
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.default.in (rev 0)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.default.in 2008-05-02 16:50:53 UTC (rev 1434)
@@ -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/@@NG@@/ndo2db.cfg"
Copied: ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.init.in (from rev 1433, ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils-NGV.init.in)
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.init.in (rev 0)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.ndoutils.init.in 2008-05-02 16:50:53 UTC (rev 1434)
@@ -0,0 +1,79 @@
+#! /bin/sh
+
+### BEGIN INIT INFO
+# Provides: ndoutils-@@NGV@@
+# 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 for @@NG@@ at boot time
+# Description: This will start the ndo2db daemon for @@NG@@ 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/default/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
Modified: ndoutils/trunk/debian/ndoutils-NG-DB.postinst.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.postinst.in 2008-05-02 05:37:40 UTC (rev 1433)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.postinst.in 2008-05-02 16:50:53 UTC (rev 1434)
@@ -11,7 +11,7 @@
dbc_generate_include='template:/etc/@@NG@@/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@@ $@
+ dbc_go @@PKG_SHORT@@ $@
fi
# summary of how this script can be called:
@@ -28,23 +28,7 @@
case "$1" in
configure)
- if dpkg --compare-versions "$2" lt "1.4b7-9" 2>&1; then
- update-rc.d -f ndoutils remove
- if [ -f /etc/default/ndoutils ]; then
- . /etc/default/ndoutils
- sed \
- -e "s,^\(ENABLE_NDOUTILS_@@NGV@@\)=.*$,\1=$ENABLE_NDOUTILS," \
- -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@@
- fi
- fi
-
ucf /usr/share/@@PACKAGE@@/tmpl/ndomod.cfg /etc/@@NG@@/ndomod.cfg
-
- 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-05-02 05:37:40 UTC (rev 1433)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.postrm.in 2008-05-02 16:50:53 UTC (rev 1434)
@@ -11,7 +11,7 @@
if [ -f /usr/share/dbconfig-common/dpkg/postrm.@@DB@@ ]; then
. /usr/share/dbconfig-common/dpkg/postrm.@@DB@@
- dbc_go @@PACKAGE@@ $@
+ dbc_go @@PKG_SHORT@@ $@
fi
if [ "$1" = "purge" ]; then
Modified: ndoutils/trunk/debian/ndoutils-NG-DB.preinst.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.preinst.in 2008-05-02 05:37:40 UTC (rev 1433)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.preinst.in 2008-05-02 16:50:53 UTC (rev 1434)
@@ -16,15 +16,6 @@
case "$1" in
install|upgrade)
- if [ -n "$2" ]; then
- if dpkg --compare-versions "$2" lt "1.4b7-9" 2>&1; then
- if which invoke-rc.d >/dev/null 2>&1; then
- invoke-rc.d ndoutils stop
- else
- /etc/init.d/ndoutils stop
- fi
- fi
- fi
;;
abort-upgrade)
Modified: ndoutils/trunk/debian/ndoutils-NG-DB.prerm.in
===================================================================
--- ndoutils/trunk/debian/ndoutils-NG-DB.prerm.in 2008-05-02 05:37:40 UTC (rev 1433)
+++ ndoutils/trunk/debian/ndoutils-NG-DB.prerm.in 2008-05-02 16:50:53 UTC (rev 1434)
@@ -7,7 +7,7 @@
. /usr/share/debconf/confmodule
. /usr/share/dbconfig-common/dpkg/prerm.@@DB@@
-dbc_go @@PACKAGE@@ $@
+dbc_go @@PKG_SHORT@@ $@
# summary of how this script can be called:
# * <prerm> `remove'
@@ -23,9 +23,6 @@
case "$1" in
remove|upgrade|deconfigure)
- if [ "$1" != "upgrade" ]; then
- update-alternatives --remove ndo2db /usr/lib/ndoutils/ndo2db-mysql-@@NGV@@
- fi
;;
failed-upgrade)
Modified: ndoutils/trunk/debian/rules
===================================================================
--- ndoutils/trunk/debian/rules 2008-05-02 05:37:40 UTC (rev 1433)
+++ ndoutils/trunk/debian/rules 2008-05-02 16:50:53 UTC (rev 1434)
@@ -59,39 +59,11 @@
src/*-mysql src/*-mysql-2x* src/*-mysql-3x* \
src/*-pgsql src/*-pgsql-2x* src/*-pgsql-3x*
rm -f \
- debian/ndoutils-nagios2-mysql.dirs \
- debian/ndoutils-nagios2-mysql.docs \
- debian/ndoutils-nagios2-mysql.manpages \
- debian/ndoutils-NG-DB.ndoutils-2x.default.in \
- debian/ndoutils-NG-DB.ndoutils-2x.init.in \
- debian/ndoutils-nagios2-mysql.ndoutils-2x.default \
- debian/ndoutils-nagios2-mysql.ndoutils-2x.init \
- debian/ndoutils-nagios2-mysql.config \
- debian/ndoutils-nagios2-mysql.preinst \
- debian/ndoutils-nagios2-mysql.prerm \
- debian/ndoutils-nagios2-mysql.postinst \
- debian/ndoutils-nagios2-mysql.postrm \
- debian/ndoutils-nagios2-mysql.README.Debian \
- debian/ndoutils-nagios2-pgsql.dirs \
- debian/ndoutils-nagios2-pgsql.manpages \
- debian/ndoutils-NG-DB.ndoutils-2x.default.in \
- debian/ndoutils-NG-DB.ndoutils-2x.init.in \
- debian/ndoutils-nagios2-pgsql.ndoutils-2x.default \
- debian/ndoutils-nagios2-pgsql.ndoutils-2x.init \
- debian/ndoutils-nagios2-pgsql.config \
- debian/ndoutils-nagios2-pgsql.preinst \
- debian/ndoutils-nagios2-pgsql.prerm \
- debian/ndoutils-nagios2-pgsql.postinst \
- debian/ndoutils-nagios2-pgsql.postrm \
- debian/ndoutils-nagios2-pgsql.README.Debian
- rm -f \
debian/ndoutils-nagios3-mysql.dirs \
debian/ndoutils-nagios3-mysql.docs \
debian/ndoutils-nagios3-mysql.manpages \
- debian/ndoutils-NG-DB.ndoutils-3x.default.in \
- debian/ndoutils-NG-DB.ndoutils-3x.init.in \
- debian/ndoutils-nagios3-mysql.ndoutils-3x.default \
- debian/ndoutils-nagios3-mysql.ndoutils-3x.init \
+ debian/ndoutils-nagios3-mysql.ndoutils.default \
+ debian/ndoutils-nagios3-mysql.ndoutils.init \
debian/ndoutils-nagios3-mysql.config \
debian/ndoutils-nagios3-mysql.preinst \
debian/ndoutils-nagios3-mysql.prerm \
@@ -100,10 +72,8 @@
debian/ndoutils-nagios3-mysql.README.Debian \
debian/ndoutils-nagios3-pgsql.dirs \
debian/ndoutils-nagios3-pgsql.manpages \
- debian/ndoutils-NG-DB.ndoutils-3x.default.in \
- debian/ndoutils-NG-DB.ndoutils-3x.init.in \
- debian/ndoutils-nagios3-pgsql.ndoutils-3x.default \
- debian/ndoutils-nagios3-pgsql.ndoutils-3x.init \
+ debian/ndoutils-nagios3-pgsql.ndoutils.default \
+ debian/ndoutils-nagios3-pgsql.ndoutils.init \
debian/ndoutils-nagios3-pgsql.config \
debian/ndoutils-nagios3-pgsql.preinst \
debian/ndoutils-nagios3-pgsql.prerm \
@@ -167,71 +137,20 @@
# touch $@
# TODO: ndoutils-pgsql
-binary-arch: ndoutils-common ndoutils-nagios2-mysql ndoutils-nagios3-mysql
+binary-arch: ndoutils-common ndoutils-mysql
dh_testdir -a
dh_testroot -a
binary-indep: ndoutils-doc
-ndoutils-nagios2-mysql: build-ndoutils-mysql
- @echo " ### Doing $@"
- cp debian/ndoutils-NG-DB.ndoutils-NGV.default.in debian/ndoutils-NG-DB.ndoutils-2x.default.in
- cp debian/ndoutils-NG-DB.ndoutils-NGV.init.in debian/ndoutils-NG-DB.ndoutils-2x.init.in
- for script in dirs docs config preinst postinst prerm postrm manpages ndoutils-2x.default ndoutils-2x.init README.Debian; do \
- test -e debian/ndoutils-NG-DB.$${script}.in && \
- sed " s/@@NG@@/nagios2/g; \
- s/@@DB@@/mysql/g; \
- s/@@PACKAGE@@/$@/g; \
- s/@@PKG_SHORT@@/ndoutils-mysql/g; \
- s/@@DBPORT@@/3306/g; \
- s/@@NGV@@/2x/g" \
- < debian/ndoutils-NG-DB.$${script}.in > debian/$@.$${script}; \
- done
- dh_installdirs -p$@ -P$(b)/$@
-
- # install the binaries
- for bin in ndomod-mysql-2x.o ndo2db-mysql-2x; do \
- install -m 755 src/$$bin debian/$@/usr/lib/ndoutils/$$bin; \
- done
-
- # install the config templates
- for cfg in ndo2db.cfg ndomod.cfg; do \
- sed -e 's/^ *[^#]* *\(\<db_servertype\) *=.*$$/\1=_DBC_DBTYPE_/' \
- -e 's/^ *[^#]* *\(\<db_host\) *=.*$$/\1=_DBC_DBSERVER_/' \
- -e 's/^ *[^#]* *\(\<db_port\) *=.*$$/\1=_DBC_DBPORT_/' \
- -e 's/^ *[^#]* *\(\<db_name\) *=.*$$/\1=_DBC_DBNAME_/' \
- -e 's/^ *[^#]* *\(\<db_user\) *=.*$$/\1=_DBC_DBUSER_/' \
- -e 's/^ *[^#]* *\(\<db_pass\) *=.*$$/\1=_DBC_DBPASS_/' \
- -e 's/_NAGIOS_/nagios2/g' \
- < config/$$cfg \
- > debian/$@/usr/share/$@/tmpl/$$cfg; \
- done
-
- # install the SQL schemes
- install -m 644 db/mysql.sql \
- debian/$@/usr/share/dbconfig-common/data/$@/install/mysql
- install -m 644 db/mysql-upgrade-1.3.sql \
- debian/$@/usr/share/dbconfig-common/data/$@/upgrade/mysql/1.3
- install -m 644 db/mysql-upgrade-1.4b1.sql \
- debian/$@/usr/share/dbconfig-common/data/$@/upgrade/mysql/1.4b1
- install -m 644 db/mysql-upgrade-1.4b2.sql \
- debian/$@/usr/share/dbconfig-common/data/$@/upgrade/mysql/1.4b2
- install -m 644 db/mysql-upgrade-1.4b3.sql \
- debian/$@/usr/share/dbconfig-common/data/$@/upgrade/mysql/1.4b3
- install -m 644 db/mysql-upgrade-1.4b4.sql \
- debian/$@/usr/share/dbconfig-common/data/$@/upgrade/mysql/1.4b4
- install -m 644 db/mysql-mods-1.4b5.sql \
- debian/$@/usr/share/dbconfig-common/data/$@/upgrade/mysql/1.4b5
-
+ndoutils-mysql: ndoutils-nagios2-mysql ndoutils-nagios3-mysql
+
+ndoutils-nagios2-mysql:
# use debhelper
dh_installchangelogs -p$@ -P$(b)/$@
dh_installdebconf -p$@ -P$(b)/$@
dh_installdocs -p$@ -P$(b)/$@ --all
dh_installman -p$@ -P$(b)/$@ --all
- dh_installinit -p$@ -P$(b)/$@ --name=ndoutils-2x
- dh_link -p$@ -P$(b)/$@ \
- usr/lib/ndoutils/ndo2db-mysql-2x usr/sbin/ndo2db-2x
- dh_strip -p$@ -P$(b)/$@
dh_compress -p$@ -P$(b)/$@
dh_fixperms -p$@ -P$(b)/$@
dh_makeshlibs -p$@ -P$(b)/$@ -V
@@ -243,9 +162,7 @@
ndoutils-nagios3-mysql: build-ndoutils-mysql
@echo " ### Doing $@"
- cp debian/ndoutils-NG-DB.ndoutils-NGV.default.in debian/ndoutils-NG-DB.ndoutils-3x.default.in
- cp debian/ndoutils-NG-DB.ndoutils-NGV.init.in debian/ndoutils-NG-DB.ndoutils-3x.init.in
- for script in dirs docs config preinst postinst prerm postrm manpages ndoutils-3x.default ndoutils-3x.init README.Debian; do \
+ for script in dirs docs config preinst postinst prerm postrm manpages ndoutils.default ndoutils.init README.Debian; do \
test -e debian/ndoutils-NG-DB.$${script}.in && \
sed " s/@@NG@@/nagios3/g; \
s/@@DB@@/mysql/g; \
@@ -296,9 +213,9 @@
dh_installdebconf -p$@ -P$(b)/$@
dh_installdocs -p$@ -P$(b)/$@ --all
dh_installman -p$@ -P$(b)/$@ --all
- dh_installinit -p$@ -P$(b)/$@ --name=ndoutils-3x
+ dh_installinit -p$@ -P$(b)/$@ --name=ndoutils
dh_link -p$@ -P$(b)/$@ \
- usr/lib/ndoutils/ndo2db-mysql-3x usr/sbin/ndo2db-3x
+ usr/lib/ndoutils/ndo2db-mysql-3x usr/sbin/ndo2db
dh_strip -p$@ -P$(b)/$@
dh_compress -p$@ -P$(b)/$@
dh_fixperms -p$@ -P$(b)/$@
More information about the Pkg-nagios-changes
mailing list