From 8de469a7825dca63e93bee8bbd11a918206493b7 Mon Sep 17 00:00:00 2001 From: cajus Date: Fri, 9 May 2008 08:18:42 +0000 Subject: [PATCH] Updated patches and debian build scripts git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10855 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/debian/patches/02_fix_template_location.dpatch | 8 ++++---- gosa-core/dh-make-gosa | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gosa-core/debian/patches/02_fix_template_location.dpatch b/gosa-core/debian/patches/02_fix_template_location.dpatch index 448eca877..07f38b1ab 100755 --- a/gosa-core/debian/patches/02_fix_template_location.dpatch +++ b/gosa-core/debian/patches/02_fix_template_location.dpatch @@ -5,15 +5,15 @@ ## DP: No description. @DPATCH@ -diff -urNad gosa-core~/include/functions.inc gosa-core/include/functions.inc ---- gosa-core~/include/functions.inc 2008-04-07 23:17:29.000000000 +0200 -+++ gosa-core/include/functions.inc 2008-04-07 23:17:56.000000000 +0200 +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"); -define ("CONFIG_TEMPLATE_DIR", "../contrib/"); +define ("CONFIG_TEMPLATE_DIR", "/usr/share/doc/gosa/contrib/"); + define ("TEMP_DIR","/var/cache/gosa/tmp"); /* Define get_list flags */ - define("GL_NONE", 0); diff --git a/gosa-core/dh-make-gosa b/gosa-core/dh-make-gosa index 203ca26f1..178fcf5fa 100755 --- a/gosa-core/dh-make-gosa +++ b/gosa-core/dh-make-gosa @@ -75,7 +75,11 @@ if [ -d "$file" ]; then load_dsc $file/plugin.dsc # Setup build environment - BUILD_PATH=${DEST}gosa-plugin-${PL_NAME}-${PL_VERSION}${ADD_VERSION} + if [ "$OVERRIDE_VERSION" ]; then + BUILD_PATH=${DEST}gosa-plugin-${PL_NAME}-${OVERRIDE_VERSION} + else + BUILD_PATH=${DEST}gosa-plugin-${PL_NAME}-${PL_VERSION} + fi if [ -d "$BUILD_PATH" ]; then echo "Error: build path $BUILD_PATH already exists" >&2 exit 2 -- 2.30.2