From: opensides Date: Thu, 3 Dec 2009 10:34:13 +0000 (+0000) Subject: - Fix patch not applying correctly X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=503f744b9885f416c60fce2050c2dc372cd70f8f;p=gosa.git - Fix patch not applying correctly git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14867 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/debian/patches/02_fix_template_location.dpatch b/gosa-core/debian/patches/02_fix_template_location.dpatch index c081279e7..5a797304c 100755 --- a/gosa-core/debian/patches/02_fix_template_location.dpatch +++ b/gosa-core/debian/patches/02_fix_template_location.dpatch @@ -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 */ +