From de1afb59e555e697f6e7480e7ea8b94b7dbe5caa Mon Sep 17 00:00:00 2001 From: cajus Date: Fri, 1 Oct 2010 06:59:02 +0000 Subject: [PATCH] Updated patch git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@19879 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../debian/patches/03_fix_class_mapping.patch | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/gosa-core/debian/patches/03_fix_class_mapping.patch b/gosa-core/debian/patches/03_fix_class_mapping.patch index e740606c0..81a720417 100644 --- a/gosa-core/debian/patches/03_fix_class_mapping.patch +++ b/gosa-core/debian/patches/03_fix_class_mapping.patch @@ -1,7 +1,9 @@ Author: Description: Fix location of auto-generated class mapping file ---- a/include/class_config.inc -+++ b/gosa-core/include/class_config.inc +Index: gosa/gosa-core/include/class_config.inc +=================================================================== +--- gosa.orig/gosa-core/include/class_config.inc 2010-02-05 13:51:35.000000000 +0000 ++++ gosa/gosa-core/include/class_config.inc 2010-10-01 06:51:28.478555098 +0000 @@ -100,12 +100,12 @@ if we have installed or removed plugins. */ @@ -17,10 +19,12 @@ Description: Fix location of auto-generated class mapping file session::global_set("class_location.inc:timestamp",$tmp['mtime']); if($this->filename != "" && filemtime($this->filename) != $this->last_modified){ ---- a/include/functions.inc -+++ b/gosa-core/include/functions.inc +Index: gosa/gosa-core/include/functions.inc +=================================================================== +--- gosa.orig/gosa-core/include/functions.inc 2010-10-01 06:51:28.000000000 +0000 ++++ gosa/gosa-core/include/functions.inc 2010-10-01 06:51:55.250554318 +0000 @@ -73,7 +73,7 @@ - $svn_revision = '$Revision: 19051 $'; + $svn_revision = '$Revision: 19652 $'; /* Include required files */ -require_once("class_location.inc"); @@ -28,8 +32,10 @@ Description: Fix location of auto-generated class mapping file require_once ("functions_debug.inc"); require_once ("accept-to-gettext.inc"); ---- a/update-gosa -+++ b/gosa-core/update-gosa +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 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -- 2.30.2