Updated build structure

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

diff --git a/debian/control b/debian/control
index 70548cb0edc609386c22332a8df826e534836eb3..d91c4b16abe46fa7e71cf3db7afe05140b999a8c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.6.1.0
 
 Package: gosa
 Architecture: all
-Depends: php4 (>= 4.1.1-1) | libapache2-mod-php4, apache | apache-ssl | apache2-mpm-worker | apache2-mpm-threadpool | apache2-mpm-prefork | apache2-mpm-perchild, exim4 | mail-transport-agent, php4-cgi | libapache2-mod-php4, php4-gd, php4-imap, php4-ldap, php4-mcrypt, php4-mhash, php4-mysql, php4-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, fping, libcrypt-smbhash-perl, smarty, php4-recode
+Depends: php4 (>= 4.1.1-1) | libapache2-mod-php4 | libapache2-mod-php5 | php5, apache | apache-ssl | apache2-mpm-worker | apache2-mpm-threadpool | apache2-mpm-prefork | apache2-mpm-perchild, exim4 | mail-transport-agent, php4-cgi | libapache2-mod-php4 | php5-cgi | libapache2-mod-php5, php4-gd | php5-gd, php4-imap | php5-imap, php4-ldap | php5-ldap, php4-mhash | php5-mhash, php4-mysql | php5-mysql, php4-imagick | php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, fping, libcrypt-smbhash-perl, smarty, php4-recode | php5-recode, wwwconfig-common
 Suggests: cupsys-server, cyrus21-imapd (>= 2.1.11), postfix-ldap, php4-kadm5, php4-cups, etherwake, slapd, gosa-schema
 Description: Web Based LDAP Administration Program
  Provided is access to posix, shadow, samba, proxy, fax, pureftp and

diff --git a/debian/gosa.dirs b/debian/gosa.dirs
index 04b3d79e4794d068f525ef214799f1a9d5d18f1e..084bf22107832bc0ea81b02db725aa925f52cd91 100644 (file)
--- a/debian/gosa.dirs
+++ b/debian/gosa.dirs
@@ -1,4 +1,5 @@
 etc/gosa
+usr/bin
 usr/share/gosa
 usr/share/doc/gosa
 usr/share/doc/gosa/contrib

diff --git a/debian/rules b/debian/rules
index d84f3456a5a95da6cfb6dd060074d260ad14c866..d1f6cb387eb97050e4234eae671422ba001b83cd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -59,6 +59,7 @@ install-stamp:
        -mv debian/gosa/usr/share/gosa/bin/* debian/gosa/usr/bin
        -rm -rf debian/gosa/usr/share/gosa/bin
        -find debian/gosa -type f -exec chmod -x {} \;
+       -chmod +x debian/gosa/usr/bin/mkntpasswd
        -chmod +x debian/gosa/usr/lib/gosa/*
        -rm -rf debian/gosa/usr/share/gosa/gen_locale.sh
        -rm -rf debian/gosa/usr/share/gosa/gen_function_list.php