[Pkg-nagios-changes] [pkg-nagios3] 18/18: Reenable php fix patch

[Alexander Wirt]

This is an automated email from the git hooks/post-receive script.

formorer pushed a commit to branch master
in repository pkg-nagios3.

commit ef11292a72872a065394bfb8a52315a6fdc36c57
Author: Alexander Wirt <formorer at debian.org>
Date:   Fri Jan 3 23:37:16 2014 +0100

    Reenable php fix patch
---
 debian/patches/99_fix_php_warning.patch | 31 -------------------------------
 debian/patches/series                   |  1 +
 2 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/debian/patches/99_fix_php_warning.patch b/debian/patches/99_fix_php_warning.patch
index c02a64f..2f4b508 100644
--- a/debian/patches/99_fix_php_warning.patch
+++ b/debian/patches/99_fix_php_warning.patch
@@ -18,34 +18,3 @@ Description: No description.
 +date_default_timezone_set('UTC');
  
  $this_version="3.5.1";
- 
---- a/html/rss-corefeed.php
-+++ b/html/rss-corefeed.php
-@@ -1,5 +1,4 @@
- <?php
--
- // RSS reader
- define('MAGPIE_DIR', './includes/rss/');
- define('MAGPIE_CACHE_ON', 0);
-@@ -47,4 +46,4 @@
- 	} 
- 
- 
--?>
-\ No newline at end of file
-+?>
---- a/html/rss-newsfeed.php
-+++ b/html/rss-newsfeed.php
-@@ -1,5 +1,4 @@
- <?php 
--
- // RSS reader
- define('MAGPIE_DIR', './includes/rss/');
- define('MAGPIE_CACHE_ON', 0);
-@@ -45,4 +44,4 @@
- 	}
- 
- 
--?>
-\ No newline at end of file
-+?>
diff --git a/debian/patches/series b/debian/patches/series
index 02866d2..c450238 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 60_fix_p1.pl_patch_mini_epn.patch
 70_fix_eventhandler_paths.patch
 80_dont_call_home.patch
+99_fix_php_warning.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios3.git