[Pkg-nagios-devel] nagios/patches 01_fix_postgresql_path.dpatch,1.1,1.2
seanius@haydn.debian.org
seanius@haydn.debian.org
- Previous message: [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
- Next message: [Pkg-nagios-devel] nagios changelog,1.64,1.65
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/pkg-nagios/nagios/patches
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv27404/patches
Modified Files:
01_fix_postgresql_path.dpatch
Log Message:
missing 'fi' in if block in postinst script
Index: 01_fix_postgresql_path.dpatch
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/patches/01_fix_postgresql_path.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 01_fix_postgresql_path.dpatch 31 Oct 2004 14:52:45 -0000 1.1
+++ 01_fix_postgresql_path.dpatch 4 Jul 2005 04:26:13 -0000 1.2
@@ -1,67 +1,67 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_fix_postgresql_path.dpatch by Joerg Jaspert <joerg@debian.org>
+## updated 2005/07/02 by sean finney to work with multiple versions of pgsql
##
-## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix include path's for postgresql.
@DPATCH@
-diff -urNad nagios-1.2/xdata/xcddb.c nagios-1.2/xdata/xcddb.c
---- nagios-1.2/xdata/xcddb.c 2003-05-31 22:44:27.000000000 +0200
-+++ nagios-1.2/xdata/xcddb.c 2004-10-31 14:07:16.054902453 +0100
+diff -urNad --exclude=CVS --exclude=.svn ./xdata/xcddb.c /home/seanius/tmp/dpep-work.fXYMyC/sid/xdata/xcddb.c
+--- ./xdata/xcddb.c 2005-07-02 14:16:36.164417313 -0400
++++ /home/seanius/tmp/dpep-work.fXYMyC/sid/xdata/xcddb.c 2005-07-02 14:18:47.425490362 -0400
@@ -51,7 +51,7 @@
#endif
#ifdef USE_XCDPGSQL
-#include <pgsql/libpq-fe.h>
-+#include <postgresql/libpq-fe.h>
++#include <libpq-fe.h>
#endif
-diff -urNad nagios-1.2/xdata/xdddb.c nagios-1.2/xdata/xdddb.c
---- nagios-1.2/xdata/xdddb.c 2003-05-31 22:44:27.000000000 +0200
-+++ nagios-1.2/xdata/xdddb.c 2004-10-31 14:07:16.097896105 +0100
+diff -urNad --exclude=CVS --exclude=.svn ./xdata/xdddb.c /home/seanius/tmp/dpep-work.fXYMyC/sid/xdata/xdddb.c
+--- ./xdata/xdddb.c 2005-07-02 14:16:36.164417313 -0400
++++ /home/seanius/tmp/dpep-work.fXYMyC/sid/xdata/xdddb.c 2005-07-02 14:18:47.431489177 -0400
@@ -51,7 +51,7 @@
#endif
#ifdef USE_XDDPGSQL
-#include <pgsql/libpq-fe.h>
-+#include <postgresql/libpq-fe.h>
++#include <libpq-fe.h>
#endif
-diff -urNad nagios-1.2/xdata/xeddb.c nagios-1.2/xdata/xeddb.c
---- nagios-1.2/xdata/xeddb.c 2002-02-26 05:04:09.000000000 +0100
-+++ nagios-1.2/xdata/xeddb.c 2004-10-31 14:07:16.097896105 +0100
+diff -urNad --exclude=CVS --exclude=.svn ./xdata/xeddb.c /home/seanius/tmp/dpep-work.fXYMyC/sid/xdata/xeddb.c
+--- ./xdata/xeddb.c 2005-07-02 14:16:36.164417313 -0400
++++ /home/seanius/tmp/dpep-work.fXYMyC/sid/xdata/xeddb.c 2005-07-02 14:18:47.433488782 -0400
@@ -44,7 +44,7 @@
#endif
#ifdef USE_XEDPGSQL
-#include <pgsql/libpq-fe.h>
-+#include <postgresql/libpq-fe.h>
++#include <libpq-fe.h>
#endif
-diff -urNad nagios-1.2/xdata/xrddb.c nagios-1.2/xdata/xrddb.c
---- nagios-1.2/xdata/xrddb.c 2002-05-16 04:46:11.000000000 +0200
-+++ nagios-1.2/xdata/xrddb.c 2004-10-31 14:07:16.098895957 +0100
+diff -urNad --exclude=CVS --exclude=.svn ./xdata/xrddb.c /home/seanius/tmp/dpep-work.fXYMyC/sid/xdata/xrddb.c
+--- ./xdata/xrddb.c 2005-07-02 14:16:36.165417115 -0400
++++ /home/seanius/tmp/dpep-work.fXYMyC/sid/xdata/xrddb.c 2005-07-02 14:18:47.439487597 -0400
@@ -43,7 +43,7 @@
#endif
#ifdef USE_XRDPGSQL
-#include <pgsql/libpq-fe.h>
-+#include <postgresql/libpq-fe.h>
++#include <libpq-fe.h>
#endif
-diff -urNad nagios-1.2/xdata/xsddb.c nagios-1.2/xdata/xsddb.c
---- nagios-1.2/xdata/xsddb.c 2003-05-31 22:44:27.000000000 +0200
-+++ nagios-1.2/xdata/xsddb.c 2004-10-31 14:07:16.098895957 +0100
+diff -urNad --exclude=CVS --exclude=.svn ./xdata/xsddb.c /home/seanius/tmp/dpep-work.fXYMyC/sid/xdata/xsddb.c
+--- ./xdata/xsddb.c 2005-07-02 14:16:36.166416918 -0400
++++ /home/seanius/tmp/dpep-work.fXYMyC/sid/xdata/xsddb.c 2005-07-02 14:18:47.447486017 -0400
@@ -48,7 +48,7 @@
#endif
#ifdef USE_XSDPGSQL
-#include <pgsql/libpq-fe.h>
-+#include <postgresql/libpq-fe.h>
++#include <libpq-fe.h>
#endif
- Previous message: [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
- Next message: [Pkg-nagios-devel] nagios changelog,1.64,1.65
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]