[Pkg-nagios-changes] [SCM] Debian packaging for nagircbot branch, master, updated. f0aea80aa670697af6e60ce7600689f189279898

[John Morrissey]

The following commit has been merged in the master branch:
commit 91426531a7b4a8f50682f0cdbe30176c26818787
Author: John Morrissey <jwm at horde.net>
Date:   Wed May 25 13:39:56 2011 -0400

    add 20fix-non-debug-build
    
      * Disable upstream's debug build option (20fix-non-debug-build), avoiding
        excessive CPU consumption in its memory allocation tracking code.

diff --git a/debian/changelog b/debian/changelog
index 8f8eb6f..0c091da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 nagircbot (0.0.33-1) unstable; urgency=low
 
   * New upstream version.
+  * Disable upstream's debug build option (20fix-non-debug-build), avoiding
+    excessive CPU consumption in its memory allocation tracking code.
 
  -- John Morrissey <jwm at horde.net>  Wed, 25 May 2011 13:29:31 -0400
 
diff --git a/debian/patches/20fix-non-debug-build b/debian/patches/20fix-non-debug-build
new file mode 100644
index 0000000..b3c1dee
--- /dev/null
+++ b/debian/patches/20fix-non-debug-build
@@ -0,0 +1,19 @@
+Description: Fix non-debug builds (i.e., when _DEBUG isn't defined)
+Author: John Morrissey <jwm at horde.net>
+Forwarded: <20110316160729.GA28881 at boost.horde.net>
+Last-Update: 2011-03-16
+
+diff --git a/anna.cpp b/anna.cpp
+index a05e1e4..be60c01 100644
+--- a/anna.cpp
++++ b/anna.cpp
+@@ -320,8 +320,8 @@ int check_nagios_status(server_t server_conn)
+ 	int n_cur = 0;
+ 	int loop;
+ 	int any_shown = 0;
+-#ifdef _DEBUG
+ 	time_t now = time(NULL);
++#ifdef _DEBUG
+ 	printf("Checking @ %s", ctime(&now));
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 65fa9ff..1730e0c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 10add-destdir-support
+20fix-non-debug-build

-- 
Debian packaging for nagircbot