[Pkg-nagios-devel] nagios nagios-mysql.preinst,NONE,1.1 nagios-pgsql.preinst,NONE,1.1 nagios-text.preinst,NONE,1.1 changelog,1.15,1.16 update-nagios,1.3,1.4

[joerg@haydn.debian.org]

Update of /cvsroot/pkg-nagios/nagios
In directory haydn:/tmp/cvs-serv29433

Modified Files:
	changelog update-nagios 
Added Files:
	nagios-mysql.preinst nagios-pgsql.preinst nagios-text.preinst 
Log Message:
The 3 preinst are required until this new nagios made its way into sarge,
then they are to be deleted.
Fixed two other failures with update-nagios and default configs.

I think next upload goes to unstable!


--- NEW FILE: nagios-mysql.preinst ---
#! /bin/sh
# preinst script for nagios
# This is to be removed after the new nagios packages hit sarge!
# Until then it has to remove a directory as we want to replace it with a symlink
#
# 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>

case "$1" in
    install|upgrade)
       if dpkg --compare-versions "$2" le "2:1.3-0+pre" ; then
		   rm -rf /usr/share/doc/nagios-mysql
	   fi
	;;
    abort-upgrade)
	;;
    *)
        echo "preinst called with unknown argument \`$1'" >&2
        exit 0
	;;
esac

#DEBHELPER#

exit 0

--- NEW FILE: nagios-pgsql.preinst ---
#! /bin/sh
# preinst script for nagios
# This is to be removed after the new nagios packages hit sarge!
# Until then it has to remove a directory as we want to replace it with a symlink
#
# 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>

case "$1" in
    install|upgrade)
       if dpkg --compare-versions "$2" le "2:1.3-0+pre" ; then
		   rm -rf /usr/share/doc/nagios-pgsql
	   fi
	;;
    abort-upgrade)
	;;
    *)
        echo "preinst called with unknown argument \`$1'" >&2
        exit 0
	;;
esac

#DEBHELPER#

exit 0

--- NEW FILE: nagios-text.preinst ---
#! /bin/sh
# preinst script for nagios
# This is to be removed after the new nagios packages hit sarge!
# Until then it has to remove a directory as we want to replace it with a symlink
#
# 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>

case "$1" in
    install|upgrade)
       if dpkg --compare-versions "$2" le "2:1.3-0+pre" ; then
		   rm -rf /usr/share/doc/nagios-text
	   fi
	;;
    abort-upgrade)
	;;
    *)
        echo "preinst called with unknown argument \`$1'" >&2
        exit 0
	;;
esac

#DEBHELPER#

exit 0

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- changelog	15 Nov 2004 22:58:21 -0000	1.15
+++ changelog	17 Nov 2004 23:30:07 -0000	1.16
@@ -1,3 +1,15 @@
+nagios (2:1.3-0+pre3) experimental; urgency=low
+
+  * Joerg Jaspert:
+    - Fix update-nagios to chown nagios:nagios plugins-auto.cfg or nagios
+      doesnt work.
+    - Old nagios-{text,mysql,pgsql} usr/share/doc/package directories are now
+      deleted before we place the symlink to nagios-common there.
+    - Bug fix: "move of status.log to var/cache breaks cgi", thanks to Peter
+      Palfrader (Closes: #274884).
+
+ -- Joerg Jaspert <joerg@debian.org>  Wed, 17 Nov 2004 23:51:50 +0100
+
 nagios (2:1.3-0+pre2) experimental; urgency=low
 
   * Joerg Jaspert:

Index: update-nagios
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/update-nagios,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- update-nagios	15 Nov 2004 22:58:21 -0000	1.3
+++ update-nagios	17 Nov 2004 23:30:08 -0000	1.4
@@ -33,6 +33,7 @@
 done
 
 mv -f $OUT $DEST
+chown nagios:nagios $DEST
 
 if $FOUND_PLUGINS; then
 	if [ -x /etc/init.d/nagios -a "$1" != "--no-reload" ] ; then