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 8e276dde498134956aab27d09c0349ff2559b718..d7325ae1ae2943cbf803688667a75479fb99da2b 100644 (file)
--- 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 a9536512cdcf94fbce29c7bcd9fa89fbd7317469..cd93a2466be0b12234881d1752c935889af4abcb 100644 (file)
--- 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 f0a795529d411ab707703a4cea831280c5f85f42..51243bdd8a2a0642d2a485c434a28dad31666da7 100644 (file)
--- 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 74f9e366245a6578f2f5428d54784c2200d868cd..72f381c32d8a56588b9458f13b75403d463cc009 100644 (file)
--- 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. */