summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3aa092b)
raw | patch | inline | side by side (parent: 3aa092b)
author | tolimar <tolimar@98d490a6-b407-0410-aaaa-fdee166ba3f5> | |
Mon, 26 Sep 2011 13:41:48 +0000 (13:41 +0000) | ||
committer | tolimar <tolimar@98d490a6-b407-0410-aaaa-fdee166ba3f5> | |
Mon, 26 Sep 2011 13:41:48 +0000 (13:41 +0000) |
git-svn-id: svn://svn.debian.org/svn/pkg-nagios/nagvis/trunk@1970 98d490a6-b407-0410-aaaa-fdee166ba3f5
debian/changelog | patch | blob | history | |
debian/patches/00list | patch | blob | history | |
debian/patches/fix-get_class-object.dpatch | [deleted file] | patch | blob | history |
diff --git a/debian/changelog b/debian/changelog
index 2c298e4ea4d5af4ee469792c49c2ba53348c3eca..c3bfd71bd93867b24404069476fc128d927da76c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
* Change Package dependencies: Drop all ndo and mysql related stuff, we want to use mk livestatus
* Update debian/copyright
* Rework post{inst,rm} to not configure database
* Change Package dependencies: Drop all ndo and mysql related stuff, we want to use mk livestatus
* Update debian/copyright
* Rework post{inst,rm} to not configure database
- * patches/php5.3-deprecated-ereg.dpatch: removed; applied upstream
+ * removed patches/php5.3-deprecated-ereg.dpatch; applied upstream
+ * removed patches/fix-get_class-object.dpatch; no longer needed.
- -- Alexander Reichle-Schmehl <tolimar@debian.org> Mon, 26 Sep 2011 15:38:30 +0200
+ -- Alexander Reichle-Schmehl <tolimar@debian.org> Mon, 26 Sep 2011 15:41:04 +0200
nagvis (1:1.4.6-2) unstable; urgency=medium
nagvis (1:1.4.6-2) unstable; urgency=medium
diff --git a/debian/patches/00list b/debian/patches/00list
index 509e18f52fbfddab367f2e9d58fc35ecd632f69e..53c3ced6ac83a41ff1c012894311ab0920dfee3c 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
config
config
-visibility_magic-set-method
fix-get_class-object
fix-get_class-object
diff --git a/debian/patches/fix-get_class-object.dpatch b/debian/patches/fix-get_class-object.dpatch
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-get_class-object.dpatch by Hendrik Frenzel <hfrenzel@scunc.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: add is_object() to check for object before use get_class()
-
-@DPATCH@
-diff -urNad nagvis-1.4.6~/nagvis/includes/classes/GlobalHeaderMenu.php nagvis-1.4.6/nagvis/includes/classes/GlobalHeaderMenu.php
---- nagvis-1.4.6~/nagvis/includes/classes/GlobalHeaderMenu.php 2010-02-04 21:51:13.000000000 +0100
-+++ nagvis-1.4.6/nagvis/includes/classes/GlobalHeaderMenu.php 2010-03-05 11:52:13.000000000 +0100
-@@ -84,7 +84,7 @@
- */
- public function replaceDynamicMacros() {
- // Replace some special macros
-- if($this->OBJPAGE !== null && get_class($this->OBJPAGE) == 'NagVisMapCfg') {
-+ if($this->OBJPAGE !== null && (is_object($this->OBJPAGE) && get_class($this->OBJPAGE) == 'NagVisMapCfg')) {
- $arrKeys[] = '[current_map]';
- $arrKeys[] = '[current_map_alias]';
- $arrVals[] = $this->OBJPAGE->getName();
-@@ -122,7 +122,7 @@
- }
-
- // auto select current map
-- if(get_class($this->OBJPAGE) == 'NagVisMapCfg' && ($mapName == $this->OBJPAGE->getName() || $mapName == '__automap' && isset($_GET['automap']))) {
-+ if((is_object($this->OBJPAGE) && get_class($this->OBJPAGE) == 'NagVisMapCfg') && ($mapName == $this->OBJPAGE->getName() || $mapName == '__automap' && isset($_GET['automap']))) {
- $sReplaceObj = str_replace('[selected]','selected="selected"',$sReplaceObj);
- } else {
- $sReplaceObj = str_replace('[selected]','',$sReplaceObj);
-@@ -138,7 +138,7 @@
- }
-
- // Select overview in header menu when no map shown
-- if(get_class($this->OBJPAGE) != 'NagVisMapCfg') {
-+ if((is_object($this->OBJPAGE) && get_class($this->OBJPAGE) != 'NagVisMapCfg')) {
- $this->code = str_replace('[selected]','selected="selected"', $this->code);
- }
-
-diff -urNad nagvis-1.4.6~/nagvis/includes/classes/NagVisFrontend.php nagvis-1.4.6/nagvis/includes/classes/NagVisFrontend.php
---- nagvis-1.4.6~/nagvis/includes/classes/NagVisFrontend.php 2010-02-04 21:51:13.000000000 +0100
-+++ nagvis-1.4.6/nagvis/includes/classes/NagVisFrontend.php 2010-03-05 11:44:49.000000000 +0100
-@@ -86,7 +86,7 @@
- $prop['languageRoot'] = 'nagvis';
-
- // Only do this, when a map needs to be displayed
-- if($this->MAPCFG !== null && get_class($this->MAPCFG) != '') {
-+ if($this->MAPCFG !== null && (is_object($this->MAPCFG) && get_class($this->MAPCFG) != '')) {
- $prop['allowedUsers'] = $this->MAPCFG->getValue('global',0, 'allowed_user');
- }
-