Code

- Fix patch not applying correctly
authoropensides <opensides@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 3 Dec 2009 10:34:13 +0000 (10:34 +0000)
committeropensides <opensides@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 3 Dec 2009 10:34:13 +0000 (10:34 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14867 594d385d-05f5-0310-b6e9-bd551577e9d8

gosa-core/debian/patches/02_fix_template_location.dpatch

index c081279e736be3b7d1d724e0f4ed929e79ca5465..5a797304ce05f8aac3f7b912d6a305a56a5a5f5d 100755 (executable)
@@ -5,15 +5,16 @@
 ## DP: Fix location of configuration template.
 
 @DPATCH@
-diff -urNad gosa-core~/include/functions.inc gosa-core/include/functions.inc
---- gosa-core~/include/functions.inc   2008-05-30 10:39:33.000000000 +0200
-+++ gosa-core/include/functions.inc    2008-06-03 09:16:19.000000000 +0200
+diff -uNr gosa-core/include/functions.inc gosa-core/include/functions.new
+--- gosa-core/include/functions.inc       2009-12-03 11:23:55.000000000 +0100
++++ gosa-core/include/functions.new       2009-12-03 11:26:16.000000000 +0100
 @@ -40,7 +40,7 @@
-   define ("CONFIG_FILE",$_SERVER['CONFIG_FILE']);
  }
+
+ /* Define common locatitions */
 -define ("CONFIG_TEMPLATE_DIR", "../contrib");
 +define ("CONFIG_TEMPLATE_DIR", "/usr/share/doc/gosa");
  define ("TEMP_DIR","/var/cache/gosa/tmp");
+
  /* Define get_list flags */
+