[Pkg-nagios-changes] [pkg-nagios] r1215 - in ndoutils/trunk/debian: . patches
Hendrik Frenzel
hfrenzel-guest at alioth.debian.org
Wed Aug 29 21:29:12 UTC 2007
Author: hfrenzel-guest
Date: 2007-08-29 21:29:12 +0000 (Wed, 29 Aug 2007)
New Revision: 1215
Modified:
ndoutils/trunk/debian/changelog
ndoutils/trunk/debian/patches/01-pathnames.dpatch
ndoutils/trunk/debian/patches/02-makefiles.dpatch
ndoutils/trunk/debian/watch
Log:
New upstream release
Modified: ndoutils/trunk/debian/changelog
===================================================================
--- ndoutils/trunk/debian/changelog 2007-08-28 20:45:38 UTC (rev 1214)
+++ ndoutils/trunk/debian/changelog 2007-08-29 21:29:12 UTC (rev 1215)
@@ -1,3 +1,15 @@
+ndoutils (1.4b5-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net> Wed, 29 Aug 2007 23:03:51 +0200
+
+ndoutils (1.4b4-3) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net> Mon, 09 Jul 2007 23:15:01 +0200
+
ndoutils (1.4b4-2) unstable; urgency=low
* Fixed comments in debian/rules
Modified: ndoutils/trunk/debian/patches/01-pathnames.dpatch
===================================================================
--- ndoutils/trunk/debian/patches/01-pathnames.dpatch 2007-08-28 20:45:38 UTC (rev 1214)
+++ ndoutils/trunk/debian/patches/01-pathnames.dpatch 2007-08-29 21:29:12 UTC (rev 1215)
@@ -70,24 +70,24 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
************************************************************************/
--#define DEFAULT_TEMP_FILE "/usr/local/nagios-2x/var/tempfile"
--#define DEFAULT_STATUS_FILE "/usr/local/nagios-2x/var/status.dat"
--#define DEFAULT_LOG_FILE "/usr/local/nagios-2x/var/nagios.log"
--#define DEFAULT_LOG_ARCHIVE_PATH "/usr/local/nagios-2x/var/archives/"
--#define DEFAULT_COMMENT_FILE "/usr/local/nagios-2x/var/comments.dat"
--#define DEFAULT_DOWNTIME_FILE "/usr/local/nagios-2x/var/downtime.dat"
--#define DEFAULT_RETENTION_FILE "/usr/local/nagios-2x/var/retention.dat"
--#define DEFAULT_COMMAND_FILE "/usr/local/nagios-2x/var/rw/nagios.cmd"
--#define DEFAULT_CONFIG_FILE "/usr/local/nagios-2x/etc/nagios.cfg"
--#define DEFAULT_PHYSICAL_HTML_PATH "/usr/local/nagios-2x/share"
--#define DEFAULT_URL_HTML_PATH "/nagios-2x"
--#define DEFAULT_PHYSICAL_CGIBIN_PATH "/usr/local/nagios-2x/sbin"
--#define DEFAULT_URL_CGIBIN_PATH "/nagios-2x/cgi-bin"
--#define DEFAULT_CGI_CONFIG_FILE "/usr/local/nagios-2x/etc/cgi.cfg"
--#define DEFAULT_LOCK_FILE "/usr/local/nagios-2x/var/nagios.lock"
--#define DEFAULT_OBJECT_CACHE_FILE "/usr/local/nagios-2x/var/objects.cache"
--#define DEFAULT_EVENT_BROKER_FILE "/usr/local/nagios-2x/var/broker.socket"
--#define DEFAULT_P1_FILE "/usr/local/nagios-2x/bin/p1.pl" /**** EMBEDDED PERL ****/
+-#define DEFAULT_TEMP_FILE "/usr/local/nagios/var/tempfile"
+-#define DEFAULT_STATUS_FILE "/usr/local/nagios/var/status.dat"
+-#define DEFAULT_LOG_FILE "/usr/local/nagios/var/nagios.log"
+-#define DEFAULT_LOG_ARCHIVE_PATH "/usr/local/nagios/var/archives/"
+-#define DEFAULT_COMMENT_FILE "/usr/local/nagios/var/comments.dat"
+-#define DEFAULT_DOWNTIME_FILE "/usr/local/nagios/var/downtime.dat"
+-#define DEFAULT_RETENTION_FILE "/usr/local/nagios/var/retention.dat"
+-#define DEFAULT_COMMAND_FILE "/usr/local/nagios/var/rw/nagios.cmd"
+-#define DEFAULT_CONFIG_FILE "/usr/local/nagios/etc/nagios.cfg"
+-#define DEFAULT_PHYSICAL_HTML_PATH "/usr/local/nagios/share"
+-#define DEFAULT_URL_HTML_PATH "/nagios"
+-#define DEFAULT_PHYSICAL_CGIBIN_PATH "/usr/local/nagios/sbin"
+-#define DEFAULT_URL_CGIBIN_PATH "/nagios/cgi-bin"
+-#define DEFAULT_CGI_CONFIG_FILE "/usr/local/nagios/etc/cgi.cfg"
+-#define DEFAULT_LOCK_FILE "/usr/local/nagios/var/nagios.lock"
+-#define DEFAULT_OBJECT_CACHE_FILE "/usr/local/nagios/var/objects.cache"
+-#define DEFAULT_EVENT_BROKER_FILE "/usr/local/nagios/var/broker.socket"
+-#define DEFAULT_P1_FILE "/usr/local/nagios/bin/p1.pl" /**** EMBEDDED PERL ****/
+#define DEFAULT_TEMP_FILE "/var/cache/nagios2/tempfile"
+#define DEFAULT_STATUS_FILE "/var/cache/nagios2/status.dat"
+#define DEFAULT_LOG_FILE "/var/log/nagios2/nagios.log"
Modified: ndoutils/trunk/debian/patches/02-makefiles.dpatch
===================================================================
--- ndoutils/trunk/debian/patches/02-makefiles.dpatch 2007-08-28 20:45:38 UTC (rev 1214)
+++ ndoutils/trunk/debian/patches/02-makefiles.dpatch 2007-08-29 21:29:12 UTC (rev 1215)
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad ndoutils-1.4beta2~/src/Makefile.in ndoutils-1.4beta2/src/Makefile.in
---- ndoutils-1.4beta2~/src/Makefile.in 2007-03-12 14:58:45.000000000 +0100
-+++ ndoutils-1.4beta2/src/Makefile.in 2007-03-12 15:00:27.000000000 +0100
+diff -urNad ndoutils-1.4b5~/src/Makefile.in ndoutils-1.4b5/src/Makefile.in
+--- ndoutils-1.4b5~/src/Makefile.in 2007-08-29 17:20:48.000000000 +0200
++++ ndoutils-1.4b5/src/Makefile.in 2007-08-29 23:19:54.000000000 +0200
@@ -11,6 +11,7 @@
CC=@CC@
@@ -32,12 +32,12 @@
$(MAKE) ndo2db-3x
ndo2db-2x: ndo2db.c $(NDO_INC) $(NDO_OBJS) $(COMMON_INC) $(COMMON_OBJS) dbhandlers-2x.o
-- $(CC) $(CFLAGS) $(DBCFLAGS) -D BUILD_NAGIOS_2X -o ndo2db-2x ndo2db.c dbhandlers-2x.o $(COMMON_OBJS) $(NDO_OBJS) $(LDFLAGS) $(DBLDFLAGS) $(LIBS) $(SOCKETLIBS) $(DBLIBS) $(OTHERLIBS)
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(DBCFLAGS) -D BUILD_NAGIOS_2X -o ndo2db-2x ndo2db.c dbhandlers-2x.o $(COMMON_OBJS) $(NDO_OBJS) $(LDFLAGS) $(DBLDFLAGS) $(LIBS) $(MATHLIBS) $(SOCKETLIBS) $(DBLIBS) $(OTHERLIBS)
+- $(CC) $(CFLAGS) $(DBCFLAGS) -D BUILD_NAGIOS_2X -o ndo2db-2x ndo2db.c dbhandlers-2x.o $(COMMON_OBJS) $(NDO_OBJS) $(LDFLAGS) $(DBLDFLAGS) $(LIBS) $(SOCKETLIBS) $(DBLIBS) $(MATHLIBS) $(OTHERLIBS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(DBCFLAGS) -D BUILD_NAGIOS_2X -o ndo2db-2x ndo2db.c dbhandlers-2x.o $(COMMON_OBJS) $(NDO_OBJS) $(LDFLAGS) $(DBLDFLAGS) $(LIBS) $(SOCKETLIBS) $(DBLIBS) $(MATHLIBS) $(OTHERLIBS)
ndo2db-3x: ndo2db.c $(NDO_INC) $(NDO_OBJS) $(COMMON_INC) $(COMMON_OBJS) dbhandlers-3x.o
-- $(CC) $(CFLAGS) $(DBCFLAGS) -D BUILD_NAGIOS_3X -o ndo2db-3x ndo2db.c dbhandlers-3x.o $(COMMON_OBJS) $(NDO_OBJS) $(LDFLAGS) $(DBLDFLAGS) $(LIBS) $(SOCKETLIBS) $(DBLIBS) $(OTHERLIBS)
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(DBCFLAGS) -D BUILD_NAGIOS_3X -o ndo2db-3x ndo2db.c dbhandlers-3x.o $(COMMON_OBJS) $(NDO_OBJS) $(LDFLAGS) $(DBLDFLAGS) $(LIBS) $(MATHLIBS) $(SOCKETLIBS) $(DBLIBS) $(OTHERLIBS)
+- $(CC) $(CFLAGS) $(DBCFLAGS) -D BUILD_NAGIOS_3X -o ndo2db-3x ndo2db.c dbhandlers-3x.o $(COMMON_OBJS) $(NDO_OBJS) $(LDFLAGS) $(DBLDFLAGS) $(LIBS) $(SOCKETLIBS) $(DBLIBS) $(MATHLIBS) $(OTHERLIBS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(DBCFLAGS) -D BUILD_NAGIOS_3X -o ndo2db-3x ndo2db.c dbhandlers-3x.o $(COMMON_OBJS) $(NDO_OBJS) $(LDFLAGS) $(DBLDFLAGS) $(LIBS) $(SOCKETLIBS) $(DBLIBS) $(MATHLIBS) $(OTHERLIBS)
ndomod:
$(MAKE) ndomod-2x.o
@@ -45,11 +45,11 @@
ndomod-2x.o: ndomod.c $(COMMON_INC) $(COMMON_OBJS)
- $(CC) $(MOD_CFLAGS) $(CFLAGS) -D BUILD_NAGIOS_2X -o ndomod-2x.o ndomod.c $(COMMON_OBJS) $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) $(SOCKETLIBS) $(OTHERLIBS)
-+ $(CC) $(MOD_CFLAGS) $(CFLAGS) $(CPPFLAGS) -D BUILD_NAGIOS_2X -o ndomod-2x.o ndomod.c $(COMMON_OBJS) $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) $(MATHLIBS) $(SOCKETLIBS) $(OTHERLIBS)
++ $(CC) $(MOD_CFLAGS) $(CFLAGS) $(CPPFLAGS) -D BUILD_NAGIOS_2X -o ndomod-2x.o ndomod.c $(COMMON_OBJS) $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) $(SOCKETLIBS) $(OTHERLIBS)
ndomod-3x.o: ndomod.c $(COMMON_INC) $(COMMON_OBJS)
- $(CC) $(MOD_CFLAGS) $(CFLAGS) -D BUILD_NAGIOS_3X -o ndomod-3x.o ndomod.c $(COMMON_OBJS) $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) $(SOCKETLIBS) $(OTHERLIBS)
-+ $(CC) $(MOD_CFLAGS) $(CFLAGS) $(CPPFLAGS) -D BUILD_NAGIOS_3X -o ndomod-3x.o ndomod.c $(COMMON_OBJS) $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) $(MATHLIBS) $(SOCKETLIBS) $(OTHERLIBS)
++ $(CC) $(MOD_CFLAGS) $(CFLAGS) $(CPPFLAGS) -D BUILD_NAGIOS_3X -o ndomod-3x.o ndomod.c $(COMMON_OBJS) $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) $(SOCKETLIBS) $(OTHERLIBS)
sockdebug: sockdebug.c $(COMMON_INC) $(COMMON_OBJS)
- $(CC) $(CFLAGS) -o $@ sockdebug.c $(COMMON_OBJS) $(LDFLAGS) $(LIBS) $(MATHLIBS) $(SOCKETLIBS) $(OTHERLIBS)
Modified: ndoutils/trunk/debian/watch
===================================================================
--- ndoutils/trunk/debian/watch 2007-08-28 20:45:38 UTC (rev 1214)
+++ ndoutils/trunk/debian/watch 2007-08-29 21:29:12 UTC (rev 1215)
@@ -17,6 +17,6 @@
#ftp://ftp.example.com/pub/ndoutils-(.*)\.tar\.gz debian uupdate
# Uncomment to find new files on sourceforge, for debscripts >= 2.9
-http://sf.net/nagios/ndoutils-(.*)\.tar\.gz
+http://sf.net/nagios/ndoutils-(\d+\..*)\.tar\.gz
More information about the Pkg-nagios-changes
mailing list