From 689ed7886ee8684b8ed12176c80328b770e6a012 Mon Sep 17 00:00:00 2001 From: cajus Date: Fri, 19 Nov 2010 12:00:00 +0000 Subject: [PATCH] Updated mapping patch - quilt sucks git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20292 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../debian/patches/03_fix_class_mapping.patch | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/gosa-core/debian/patches/03_fix_class_mapping.patch b/gosa-core/debian/patches/03_fix_class_mapping.patch index 8facbf03c..0fdc1378d 100644 --- a/gosa-core/debian/patches/03_fix_class_mapping.patch +++ b/gosa-core/debian/patches/03_fix_class_mapping.patch @@ -2,9 +2,9 @@ Author: Description: Fix location of auto-generated class mapping file Index: gosa/gosa-core/include/class_config.inc =================================================================== ---- gosa.orig/gosa-core/include/class_config.inc 2010-08-27 17:52:28.000000000 +0200 -+++ gosa/gosa-core/include/class_config.inc 2010-10-04 12:21:31.000000000 +0200 -@@ -117,12 +117,12 @@ +--- gosa.orig/gosa-core/include/class_config.inc 2010-11-10 16:44:26.000000000 +0100 ++++ gosa/gosa-core/include/class_config.inc 2010-10-23 17:29:16.000000000 +0200 +@@ -116,12 +116,12 @@ if we have installed or removed plugins. */ if(session::global_is_set("class_location.inc:timestamp")){ @@ -21,8 +21,8 @@ Index: gosa/gosa-core/include/class_config.inc if($this->filename != "" && filemtime($this->filename) != $this->last_modified){ Index: gosa/gosa-core/include/functions.inc =================================================================== ---- gosa.orig/gosa-core/include/functions.inc 2010-10-04 12:18:46.000000000 +0200 -+++ gosa/gosa-core/include/functions.inc 2010-10-04 12:20:38.000000000 +0200 +--- gosa.orig/gosa-core/include/functions.inc 2010-10-23 17:29:16.000000000 +0200 ++++ gosa/gosa-core/include/functions.inc 2010-10-23 17:29:16.000000000 +0200 @@ -73,7 +73,7 @@ define('DES3_CBC_SHA1',16); @@ -31,28 +31,28 @@ Index: gosa/gosa-core/include/functions.inc +require_once("/var/cache/gosa/class.cache"); require_once ("functions_debug.inc"); require_once ("accept-to-gettext.inc"); - + Index: gosa/gosa-core/update-gosa =================================================================== ---- gosa.orig/gosa-core/update-gosa 2008-06-10 07:56:22.000000000 +0000 -+++ gosa/gosa-core/update-gosa 2010-10-01 06:51:28.481554589 +0000 +--- gosa.orig/gosa-core/update-gosa 2010-11-19 12:21:50.000000000 +0100 ++++ gosa/gosa-core/update-gosa 2010-10-23 17:34:41.000000000 +0200 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - + -define ("GOSA_HOME", dirname(__FILE__)); +define ("GOSA_HOME", "/usr/share/gosa"); define ("LOCALE_DIR", GOSA_HOME."/locale"); define ("PLUGSTATE_DIR", GOSA_HOME."/state"); - -@@ -122,8 +122,8 @@ + +@@ -136,8 +136,8 @@ function rescan_classes() { - echo "Updating class cache...\n"; -- $class_mapping= get_classes(); -- $filename= GOSA_HOME."/include/class_location.inc"; -+ $class_mapping= get_classes("/usr/share/gosa"); -+ $filename= "/var/cache/gosa/class.cache"; - - /* Sanity checks */ - if (!file_exists($filename) || is_writable($filename)) { + echo "Updating class cache...\n"; +- $class_mapping= get_classes(); +- $filename= GOSA_HOME."/include/class_location.inc"; ++ $class_mapping= get_classes("/usr/share/gosa"); ++ $filename= "/var/cache/gosa/class.cache"; + + /* Sanity checks */ + if (!file_exists($filename) || is_writable($filename)) { -- 2.30.2