From e3b6174ecb2cc1b02feccd0d12de5d99d695432c Mon Sep 17 00:00:00 2001 From: tolimar Date: Mon, 26 Sep 2011 13:52:13 +0000 Subject: [PATCH] Remove another unneeded patch git-svn-id: svn://svn.debian.org/svn/pkg-nagios/nagvis/trunk@1971 98d490a6-b407-0410-aaaa-fdee166ba3f5 --- debian/changelog | 5 ++- debian/patches/00list | 1 - .../visibility_magic-set-method.dpatch | 39 ------------------- 3 files changed, 3 insertions(+), 42 deletions(-) delete mode 100755 debian/patches/visibility_magic-set-method.dpatch diff --git a/debian/changelog b/debian/changelog index c3bfd71..c4910f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,9 +6,10 @@ nagvis (1:1.5.10-1) UNRELEASED; urgency=low * Update debian/copyright * Rework post{inst,rm} to not configure database * removed patches/php5.3-deprecated-ereg.dpatch; applied upstream - * removed patches/fix-get_class-object.dpatch; no longer needed. + * removed patches/fix-get_class-object.dpatch; no longer needed + * removed patches/visibility_magic-set-method.dpatch; no longer needed - -- Alexander Reichle-Schmehl Mon, 26 Sep 2011 15:41:04 +0200 + -- Alexander Reichle-Schmehl Mon, 26 Sep 2011 15:51:49 +0200 nagvis (1:1.4.6-2) unstable; urgency=medium diff --git a/debian/patches/00list b/debian/patches/00list index 53c3ced..04204c7 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,2 +1 @@ config -fix-get_class-object diff --git a/debian/patches/visibility_magic-set-method.dpatch b/debian/patches/visibility_magic-set-method.dpatch deleted file mode 100755 index f2e9187..0000000 --- a/debian/patches/visibility_magic-set-method.dpatch +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## visibility_magic-set-method.dpatch by Hendrik Frenzel -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: make magicmethod __set public o avoid error - -@DPATCH@ -diff -urNad nagvis-1.4.6~/nagvis/includes/classes/validator/GlobalValidatorInteger.php nagvis-1.4.6/nagvis/includes/classes/validator/GlobalValidatorInteger.php ---- nagvis-1.4.6~/nagvis/includes/classes/validator/GlobalValidatorInteger.php 2010-02-04 21:51:13.000000000 +0100 -+++ nagvis-1.4.6/nagvis/includes/classes/validator/GlobalValidatorInteger.php 2010-03-04 15:03:24.000000000 +0100 -@@ -53,10 +53,10 @@ - * - * @param string $name Name from variable - * @param $value Value for variable -- * @access private -+ * @access public - * @author Michael Luebben - */ -- private function __set($name, $value) { -+ public function __set($name, $value) { - $this->name = $value; - } - -diff -urNad nagvis-1.4.6~/nagvis/includes/classes/validator/GlobalValidatorString.php nagvis-1.4.6/nagvis/includes/classes/validator/GlobalValidatorString.php ---- nagvis-1.4.6~/nagvis/includes/classes/validator/GlobalValidatorString.php 2010-02-04 21:51:13.000000000 +0100 -+++ nagvis-1.4.6/nagvis/includes/classes/validator/GlobalValidatorString.php 2010-03-04 15:04:56.000000000 +0100 -@@ -53,10 +53,10 @@ - * - * @param string $name Name from variable - * @param $value Value for variable -- * @access private -+ * @access public - * @author Michael Luebben - */ -- private function __set($name, $value) { -+ public function __set($name, $value) { - $this->name = $value; - } - -- 2.30.2