Updated ACL handling for users.

[gosa.git] / gosa-core / dh-make-gosa

diff --git a/gosa-core/dh-make-gosa b/gosa-core/dh-make-gosa
index 4b85a9e53abac944c73c17cd4a7db3f1863cd1fa..ded67ec9064372c384043457e810d425fee98a32 100755 (executable)
--- 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}
+  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
@@ -142,10 +146,10 @@ echo "Apdapting debian descriptive files..."
 
 # Generate install file
 for dir in admin personal addons; do
-       [ -d $dir ] && echo -e "$dir\t\t\t/usr/share/gosa/plugins" > debian/install
+       [ -d $dir ] && echo -e "$dir\t\t\t/usr/share/gosa/plugins" >> debian/install
 done
 for dir in help/*; do
-       echo -e "$dir\t\t\t/usr/share/gosa/plugins/$PL_NAME" >> debian/install
+       echo -e "$dir\t\t\t/usr/share/gosa/doc/plugins/$PL_NAME" >> debian/install
 done
 for dir in $(ls -1 locale | grep -v "^en$" | grep -v "^messages.po$"); do
        echo -e "locale/$dir\t\t\t/usr/share/gosa/locale/plugins/$PL_NAME" >> debian/install
@@ -177,6 +181,7 @@ sed -i '/^Upstream/,/^$/d' debian/copyright
 sed -i 's/^Section: unknown/Section: web/g' debian/control
 sed -i 's/^Architecture: any/Architecture: all/g' debian/control
 sed -i 's/^Depends: .*$/Depends: gosa/g' debian/control
+sed -i 's/^\(Build-Depends: .*\)$/\1, dpatch/g' debian/control
 sed -i "s/^Description: .*$/Description: $PL_NAME plugin for GOsa/g" debian/control
 sed -i "s/^ <.*$/ %DESCRIPTION%/g" debian/control
 dsc=$(tempfile)
@@ -192,6 +197,9 @@ sed -i "/%DESCRIPTION%/r $dsc" debian/control
 sed -i "/%DESCRIPTION%/d" debian/control
 rm $dsc
 
+# Create patch directory
+[ ! -d debian/patches ] && mkdir debian/patches
+
 # Adapt README.debian
 cat <<EOF > debian/README.Debian
 README.Debian for GOsa $PL_NAME plugin $PL_VERSION
@@ -224,20 +232,29 @@ configure-stamp:
        dh_testdir
        touch configure-stamp
 
+patch: patch-stamp
+patch-stamp:
+       dpatch apply-all
+       dpatch cat-all >patch-stamp
 
-build: build-stamp
+build: patch build-stamp
 
 build-stamp: configure-stamp 
        dh_testdir
 
        touch $@
 
-clean:
+clean: clean-patched unpatch
+clean-patched:
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
        dh_clean 
 
+unpatch:
+       dpatch deapply-all
+       rm -rf patch-stamp debian/patched
+
 install: build
        dh_testdir
        dh_testroot