From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 3 Jun 2008 07:17:50 +0000 (+0000)
Subject: * Fixed patch to work with current trunk
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e60886bb690837db24fc907b0e7f8006521132e0;p=gosa.git

* Fixed patch to work with current trunk
* Fixed make-gosa-package to build plugins


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

diff --git a/gosa-core/contrib/make-gosa-package b/gosa-core/contrib/make-gosa-package
index c9a346cfe..51199ecea 100755
--- a/gosa-core/contrib/make-gosa-package
+++ b/gosa-core/contrib/make-gosa-package
@@ -56,7 +56,7 @@ for plugin in $MAKE_PLUGINS; do
 	mv "gosa-plugins-${BRANCH}/$plugin" .
 
 	echo "Debianizing plugin $plugin"
-	yes | ./dh-make-gosa $plugin
+	yes | dh-make-gosa $plugin
 	rm -rf "$plugin"
 
 	echo "Packing original sources 'gosa-plugin-$plugin-${GOSA_VER}'..."
@@ -115,9 +115,9 @@ else
 fi
 
 echo "Removing gosa snapshot..."
-for dir in $GOSA_DIR $GOSA_SI_DIR $GOSA_PLUGIN_DIRS; do
-	rm -rf "$dir"
-done
+#for dir in $GOSA_DIR $GOSA_SI_DIR $GOSA_PLUGIN_DIRS; do
+#	rm -rf "$dir"
+#done
 
 echo
 echo "Moving result to 'dest'"
diff --git a/gosa-core/debian/patches/02_fix_template_location.dpatch b/gosa-core/debian/patches/02_fix_template_location.dpatch
index 07f38b1ab..522adcbe0 100755
--- a/gosa-core/debian/patches/02_fix_template_location.dpatch
+++ b/gosa-core/debian/patches/02_fix_template_location.dpatch
@@ -5,13 +5,13 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad gosa-2.6.0~/include/functions.inc gosa-2.6.0/include/functions.inc
---- gosa-2.6.0~/include/functions.inc	2008-05-08 10:06:47.000000000 +0200
-+++ gosa-2.6.0/include/functions.inc	2008-05-09 10:17:09.000000000 +0200
-@@ -23,7 +23,7 @@
- /* Configuration file location */
- define ("CONFIG_DIR", "/etc/gosa");
- define ("CONFIG_FILE", "gosa.conf");
+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
+@@ -40,7 +40,7 @@
+   define ("CONFIG_FILE",$_SERVER['CONFIG_FILE']);
+ }
+ 
 -define ("CONFIG_TEMPLATE_DIR", "../contrib/");
 +define ("CONFIG_TEMPLATE_DIR", "/usr/share/doc/gosa/contrib/");
  define ("TEMP_DIR","/var/cache/gosa/tmp");