Updates:

* apache template
* remove dependency on a php5 binary
* fixed patch installation problem in dh-make-gosa

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

diff --git a/gosa-core/debian/gosa-apache.conf b/gosa-core/debian/gosa-apache.conf
index 98cb4eacdc3e504764c403d8523e8aab7c00b9ed..b4b54f184d3c014c9e3a027352fcd8240a1a75fc 100644 (file)
--- a/gosa-core/debian/gosa-apache.conf
+++ b/gosa-core/debian/gosa-apache.conf
@@ -9,7 +9,7 @@ Alias /gosa /usr/share/gosa/html
     php_admin_flag zend.ze1_compatibility_mode off
     php_admin_flag register_long_arrays off
     php_admin_flag magic_quotes_gpc on
-       php_admin_value upload_tmp_dir /var/spool/gosa/
-    php_admin_value open_basedir /usr/share/gosa:/var/cache/gosa/tmp:/var/spool/gosa:/etc/gosa:/etc/debian_version:/tmp/gosa.auth
+    php_admin_value upload_tmp_dir /var/spool/gosa/
+    php_admin_value open_basedir /usr/share/gosa:/var/cache/gosa/tmp:/var/spool/gosa:/etc/gosa:/etc/debian_version:/tmp/gosa.auth:/usr/bin/mkntpasswd
     include /etc/gosa/gosa.secrets
 </Location>

diff --git a/gosa-core/dh-make-gosa b/gosa-core/dh-make-gosa
index 178fcf5fa0ad3b2d216fbb4bb5080e06817da50c..179117af7208ea37935245114920d53dc8c14d44 100755 (executable)
--- a/gosa-core/dh-make-gosa
+++ b/gosa-core/dh-make-gosa
@@ -181,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)
@@ -196,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
@@ -223,11 +227,15 @@ cat <<EOF > debian/rules
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-configure: configure-stamp
+configure: patch configure-stamp
 configure-stamp:
        dh_testdir
        touch configure-stamp
 
+patch: patch-stamp
+patch-stamp:
+       dpatch apply-all
+       dpatch cat-all >patch-stamp
 
 build: build-stamp
 
@@ -236,12 +244,17 @@ build-stamp: configure-stamp
 
        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

diff --git a/gosa-core/update-gosa b/gosa-core/update-gosa
index 4ee35090d3f705a467618f42b59a4c13931abca8..a8827e8cd3f3c709816876453bad19249262b8e9 100755 (executable)
--- a/gosa-core/update-gosa
+++ b/gosa-core/update-gosa
@@ -1,4 +1,4 @@
-#!/usr/bin/php5
+#!/usr/bin/php
 <?php
 /*
  * This code is part of GOsa (http://www.gosa-project.org)