From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 25 Oct 2011 12:55:13 +0000 (+0000)
Subject: Updated patches - wrong path feeded in by dpatch
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fb1a3b45cc3305be1989472e6b9dab5e945fd503;p=gosa.git

Updated patches - wrong path feeded in by dpatch


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@21027 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 8e276dde4..d7325ae1a 100644
--- a/gosa-core/debian/patches/01_fix_smarty_location.patch
+++ b/gosa-core/debian/patches/01_fix_smarty_location.patch
@@ -1,7 +1,7 @@
 Author: <cajus@debian.org>
 Description: Adapt location for debian packaged smarty
---- a/include/php_setup.inc
-+++ b/include/php_setup.inc
+--- a/gosa-core/include/php_setup.inc
++++ b/gosa-core/include/php_setup.inc
 @@ -295,7 +295,11 @@
  ini_set("include_path",".:$BASE_DIR/include:$BASE_DIR/include/utils/excel:/usr/share/php");
  
diff --git a/gosa-core/debian/patches/02_fix_template_location.patch b/gosa-core/debian/patches/02_fix_template_location.patch
index a9536512c..cd93a2466 100644
--- a/gosa-core/debian/patches/02_fix_template_location.patch
+++ b/gosa-core/debian/patches/02_fix_template_location.patch
@@ -1,7 +1,7 @@
 Author: <cajus@debian.org>
 Description: Fix location of configuration template.
---- a/include/functions.inc
-+++ b/include/functions.inc
+--- a/gosa-core/include/functions.inc
++++ b/gosa-core/include/functions.inc
 @@ -44,7 +44,7 @@
  }
  
diff --git a/gosa-core/debian/patches/03_fix_class_mapping.patch b/gosa-core/debian/patches/03_fix_class_mapping.patch
index f0a795529..51243bdd8 100644
--- a/gosa-core/debian/patches/03_fix_class_mapping.patch
+++ b/gosa-core/debian/patches/03_fix_class_mapping.patch
@@ -1,7 +1,7 @@
 Author: <cajus@debian.org>
 Description: Fix location of auto-generated class mapping file
---- a/include/class_config.inc
-+++ b/include/class_config.inc
+--- a/gosa-core/include/class_config.inc
++++ b/gosa-core/include/class_config.inc
 @@ -116,12 +116,12 @@
             if we have installed or removed plugins. 
           */
@@ -17,8 +17,8 @@ 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/include/functions.inc
+--- a/gosa-core/include/functions.inc
++++ b/gosa-core/include/functions.inc
 @@ -73,7 +73,7 @@
  define('DES3_CBC_SHA1',16);
  
@@ -28,8 +28,8 @@ Description: Fix location of auto-generated class mapping file
  require_once ("functions_debug.inc");
  require_once ("accept-to-gettext.inc");
  
---- a/update-gosa
-+++ b/update-gosa
+--- a/gosa-core/update-gosa
++++ b/gosa-core/update-gosa
 @@ -21,7 +21,7 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
diff --git a/gosa-core/debian/patches/04_fix_locale_location.patch b/gosa-core/debian/patches/04_fix_locale_location.patch
index 74f9e3662..72f381c32 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/include/php_setup.inc
+--- a/gosa-core/include/php_setup.inc
++++ b/gosa-core/include/php_setup.inc
 @@ -20,7 +20,7 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
@@ -11,8 +11,8 @@ Description: Fixed location of auto-generated locales
  
  function gosaRaiseError($errno, $errstr, $errfile, $errline)
  {
---- a/update-gosa
-+++ b/update-gosa
+--- a/gosa-core/update-gosa
++++ b/gosa-core/update-gosa
 @@ -185,20 +185,20 @@
  
  	/* For each language, merge the target .mo to the compiled directory. */