From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 25 Oct 2011 12:27:36 +0000 (+0000)
Subject: Updated patches
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ec5c98474101fa6f4689af62db41db381537c21c;p=gosa.git

Updated patches


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@21022 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/debian/patches/01_fix_smarty_location.patch b/gosa-core/debian/patches/01_fix_smarty_location.patch
index d5d9f8a78..8e276dde4 100644
--- a/gosa-core/debian/patches/01_fix_smarty_location.patch
+++ b/gosa-core/debian/patches/01_fix_smarty_location.patch
@@ -1,8 +1,8 @@
 Author: <cajus@debian.org>
 Description: Adapt location for debian packaged smarty
 --- a/include/php_setup.inc
-+++ b/gosa-core/include/php_setup.inc
-@@ -285,7 +285,11 @@
++++ b/include/php_setup.inc
+@@ -295,7 +295,11 @@
  ini_set("include_path",".:$BASE_DIR/include:$BASE_DIR/include/utils/excel:/usr/share/php");
  
  /* Do smarty setup */
diff --git a/gosa-core/debian/patches/02_fix_template_location.patch b/gosa-core/debian/patches/02_fix_template_location.patch
index 78ba89e61..a9536512c 100644
--- a/gosa-core/debian/patches/02_fix_template_location.patch
+++ b/gosa-core/debian/patches/02_fix_template_location.patch
@@ -1,8 +1,8 @@
 Author: <cajus@debian.org>
 Description: Fix location of configuration template.
 --- a/include/functions.inc
-+++ b/gosa-core/include/functions.inc
-@@ -40,7 +40,7 @@
++++ b/include/functions.inc
+@@ -44,7 +44,7 @@
  }
  
  /* Define common locatitions */
diff --git a/gosa-core/debian/patches/03_fix_class_mapping.patch b/gosa-core/debian/patches/03_fix_class_mapping.patch
index 0fdc1378d..f0a795529 100644
--- a/gosa-core/debian/patches/03_fix_class_mapping.patch
+++ b/gosa-core/debian/patches/03_fix_class_mapping.patch
@@ -1,9 +1,7 @@
 Author: <cajus@debian.org>
 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-11-10 16:44:26.000000000 +0100
-+++ gosa/gosa-core/include/class_config.inc	2010-10-23 17:29:16.000000000 +0200
+--- a/include/class_config.inc
++++ b/include/class_config.inc
 @@ -116,12 +116,12 @@
             if we have installed or removed plugins. 
           */
@@ -19,23 +17,19 @@ Index: gosa/gosa-core/include/class_config.inc
          session::global_set("class_location.inc:timestamp",$tmp['mtime']);
  
          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-23 17:29:16.000000000 +0200
-+++ gosa/gosa-core/include/functions.inc	2010-10-23 17:29:16.000000000 +0200
+--- a/include/functions.inc
++++ b/include/functions.inc
 @@ -73,7 +73,7 @@
  define('DES3_CBC_SHA1',16);
  
  /* Include required files */
--require_once("class_location.inc");
+-include_once("class_location.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	2010-11-19 12:21:50.000000000 +0100
-+++ gosa/gosa-core/update-gosa	2010-10-23 17:34:41.000000000 +0200
+--- a/update-gosa
++++ b/update-gosa
 @@ -21,7 +21,7 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
@@ -45,7 +39,7 @@ Index: gosa/gosa-core/update-gosa
  define ("LOCALE_DIR", GOSA_HOME."/locale");
  define ("PLUGSTATE_DIR", GOSA_HOME."/state");
  
-@@ -136,8 +136,8 @@
+@@ -138,8 +138,8 @@
  function rescan_classes()
  {
  	echo "Updating class cache...\n";
diff --git a/gosa-core/debian/patches/04_fix_locale_location.patch b/gosa-core/debian/patches/04_fix_locale_location.patch
index 2a27f1845..74f9e3662 100644
--- a/gosa-core/debian/patches/04_fix_locale_location.patch
+++ b/gosa-core/debian/patches/04_fix_locale_location.patch
@@ -1,7 +1,7 @@
 Author: <cajus@debian.org>
 Description: Fixed location of auto-generated locales
 --- a/include/php_setup.inc
-+++ b/gosa-core/include/php_setup.inc
++++ b/include/php_setup.inc
 @@ -20,7 +20,7 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
@@ -12,8 +12,8 @@ Description: Fixed location of auto-generated locales
  function gosaRaiseError($errno, $errstr, $errfile, $errline)
  {
 --- a/update-gosa
-+++ b/gosa-core/update-gosa
-@@ -169,20 +169,20 @@
++++ b/update-gosa
+@@ -185,20 +185,20 @@
  
  	/* For each language, merge the target .mo to the compiled directory. */
  	foreach ($languages as $language => $po_files){