[Pkg-nagios-devel] nagios changelog,1.63,1.64 control,1.10,1.11 nagios-common.postinst,1.12,1.13 rules,1.18,1.19

seanius@haydn.debian.org seanius@haydn.debian.org


Update of /cvsroot/pkg-nagios/nagios
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv27404

Modified Files:
	changelog control nagios-common.postinst rules 
Log Message:
missing 'fi' in if block in postinst script

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- changelog	2 Jul 2005 16:46:38 -0000	1.63
+++ changelog	4 Jul 2005 04:26:12 -0000	1.64
@@ -16,6 +16,8 @@
     - don't include /etc/apache/conf.d in nagios-common.dirs, there's
       no reason to do so (closes: #314333).  thanks to olaf for helping
       debug this.
+    - udpate Standards-Version to 3.6.2.
+    - use pg_config in debian rules for determining postgres build config.
 
  -- sean finney <seanius@debian.org>  Sat, 02 Jul 2005 12:35:03 -0400
 

Index: control
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/control,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- control	10 Jan 2005 23:34:48 -0000	1.10
+++ control	4 Jul 2005 04:26:12 -0000	1.11
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian.org>
 Uploaders: Joerg Jaspert <joerg@debian.org>, Jeremy T. Bouse <jbouse@debian.org>, Tony Mancill <tony@mancill.com>, Sean Finney <seanius@debian.org>, Guido Trotter <ultrotter@quaqua.net>
-Standards-Version: 3.6.1
+Standards-Version: 3.6.2
 Build-Depends: debhelper (>= 4.2.21), dpatch (>= 2.0.10), libpng12-dev, libgd2-noxpm-dev (>= 2.0.1) | libgd2-xpm-dev (>= 2.0.1), iputils-ping, postgresql-dev (>= 7.2), libmysqlclient12-dev
 
 Package: nagios-common

Index: nagios-common.postinst
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.postinst,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- nagios-common.postinst	19 Jun 2005 12:13:57 -0000	1.12
+++ nagios-common.postinst	4 Jul 2005 04:26:12 -0000	1.13
@@ -154,8 +154,9 @@
 	if [ -f /etc/nagios/htpasswd.users ]; then
 	    # Make sure some files aren't world readable, may contain sensitive information
 	    for f in htpasswd.users cgi.cfg resource.cfg; do
-	    if [ -f /etc/nagios/$f ]; then 
-			chmod 640 /etc/nagios/$f
+	        if [ -f /etc/nagios/$f ]; then 
+		    	chmod 640 /etc/nagios/$f
+		    fi
 		done
 	    chgrp www-data /etc/nagios/htpasswd.users
 	fi

Index: rules
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/rules,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- rules	29 Jun 2005 00:44:56 -0000	1.18
+++ rules	4 Jul 2005 04:26:12 -0000	1.19
@@ -47,7 +47,8 @@
 DEPENDS		= XSDC=xsddb.c XSDH=xsddb.h XCDC=xcddb.c XCDH=xcddb.h XEDC=xeddb.c \
 		  XEDH=xeddb.h XDDC=xdddb.c XDDH=xdddb.h XRDC=xrddb.c XRDH=xrddb.h
 
-CONFIGUREPG = $(CONFIGURE) --with-pgsql-xdata
+CONFIGUREPG = $(CONFIGURE) --with-pgsql-inc=`pg_config --includedir` \
+	      --with-pgsql-lib=`pg_config --libdir` --with-pgsql-xdata
 
 CONFIGUREMY = $(CONFIGURE) --with-mysql-xdata