[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.6.1-3-9-g2ebdf35

[Alexander Wirt]

The following commit has been merged in the master branch:
commit e20c16d1762935d12a7a29755222f31ae0f8a5fe
Author: Alexander Wirt <formorer at debian.org>
Date:   Fri May 11 23:05:13 2012 +0200

    80_fix_tac_json is now upstream

diff --git a/debian/patches/00list b/debian/patches/00list
index 0c5a3c1..85a981e 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,6 +2,5 @@
 51_commands.cfg-debianize.dpatch
 52_icinga.cfg-debianize.dpatch
 70_fix_eventhandler_paths.dpatch
-80_fix_tac_json
 90_disable_standard_conforming_strings.dpatch
 95_fix_db_upgrade.dpatch
diff --git a/debian/patches/80_fix_tac_json.dpatch b/debian/patches/80_fix_tac_json.dpatch
deleted file mode 100755
index 57f5d0d..0000000
--- a/debian/patches/80_fix_tac_json.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 80_fix_tac_json.dpatch by Alexander Wirt <formorer at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix for https://dev.icinga.org/issues/2160
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-icinga~/cgi/tac.c pkg-icinga/cgi/tac.c
---- pkg-icinga~/cgi/tac.c	2011-11-26 09:13:04.000000000 +0100
-+++ pkg-icinga/cgi/tac.c	2012-03-31 10:44:49.921561000 +0200
-@@ -1710,8 +1710,8 @@
- 		printf("\"total_active_host_checks_with_passive_disabled\": %d,\n", total_active_host_checks_with_passive_disabled);
- 
- 		printf("\"total_active_service_checks\": %d,\n", total_active_service_checks);
--		printf("\"total_passive_service_checks\": %d\n", total_passive_service_checks);
--		printf("\"total_disabled_service_checks\": %d\n", total_disabled_service_checks);
-+		printf("\"total_passive_service_checks\": %d,\n", total_passive_service_checks);
-+		printf("\"total_disabled_service_checks\": %d,\n", total_disabled_service_checks);
- 		printf("\"total_active_service_checks_with_passive_disabled\": %d\n", total_active_service_checks_with_passive_disabled);
- 
- 		printf(" }\n");

-- 
debian packaging of icinga(-core)