Updated build to remove a set of lintian errors

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

diff --git a/debian/control b/debian/control
index 3aa8dfaf01942e77db8fd6b19c50b3c847e53f63..d87bda78265811313479f95144f16a5290df9d1a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Package: gosa-help-de
 Architecture: all
 Depends: gosa
 Description: German online help for GOsa
- This package includes the german online documentation for GOsa
+ This package includes the German online documentation for GOsa
  .
  GOsa is a combination of system-administrator and end-user web
  interface, designed to handle LDAP based setups.
@@ -39,7 +39,7 @@ Package: gosa-help-fr
 Architecture: all
 Depends: gosa
 Description: French online help for GOsa
- This package includes the french online documentation for GOsa
+ This package includes the French online documentation for GOsa
  .
  GOsa is a combination of system-administrator and end-user web
  interface, designed to handle LDAP based setups.
@@ -48,7 +48,7 @@ Package: gosa-help-nl
 Architecture: all
 Depends: gosa
 Description: Dutch online help for GOsa
- This package includes the dutch online documentation for GOsa
+ This package includes the Dutch online documentation for GOsa
  .
  GOsa is a combination of system-administrator and end-user web
  interface, designed to handle LDAP based setups.

diff --git a/debian/gosa.postinst b/debian/gosa.postinst
index f320e7ebbf1cd8a55ae32870ddb4927bcf12c7fb..7df5d1b7380fe04be5246997de182f0ace786fcb 100755 (executable)
--- a/debian/gosa.postinst
+++ b/debian/gosa.postinst
@@ -49,7 +49,11 @@ done
 
 # Finally restart servers
 for server in $servers; do
-       /etc/init.d/$server reload || /bin/true
+       if [ -x /usr/sbin/invoke-rc.d ]; then
+               invoke-rc.d $server restart
+       else
+               /etc/init.d/$server restart
+       fi
 done
 
 exit 0

diff --git a/debian/rules b/debian/rules
index 788d3c146f741b30658dd82b3113caebb756613f..a58807144663139a591e2e7e8cf1a30a4847cf5d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -30,10 +30,18 @@ install-stamp:
        -find debian/gosa -type d -name ".svn" -exec rm -rf {} \; &> /dev/null || /bin/true
        -cp -R debian/gosa/usr/share/gosa/contrib/* debian/gosa/usr/share/doc/gosa/contrib/
        -cp debian/gosa/usr/share/gosa/contrib/openldap/go*.schema debian/gosa-schema/etc/ldap/schema
-       -mkdir -p debian/gosa-schema/usr/share/doc/gosa-schema
        -cp -R INSTALL debian/gosa/usr/share/doc/gosa/README.INSTALL
        -gzip -c9 debian/changelog > debian/gosa/usr/share/doc/gosa/changelog.Debian.gz
+       -mkdir -p debian/gosa-schema/usr/share/doc/gosa-schema
        -gzip -c9 debian/changelog > debian/gosa-schema/usr/share/doc/gosa-schema/changelog.Debian.gz
+       -mkdir -p debian/gosa-help-de/usr/share/doc/gosa-help-de
+       -gzip -c9 debian/changelog > debian/gosa-help-de/usr/share/doc/gosa-help-de/changelog.Debian.gz
+       -mkdir -p debian/gosa-help-en/usr/share/doc/gosa-help-en
+       -gzip -c9 debian/changelog > debian/gosa-help-en/usr/share/doc/gosa-help-en/changelog.Debian.gz
+       -mkdir -p debian/gosa-help-fr/usr/share/doc/gosa-help-fr
+       -gzip -c9 debian/changelog > debian/gosa-help-fr/usr/share/doc/gosa-help-fr/changelog.Debian.gz
+       -mkdir -p debian/gosa-help-nl/usr/share/doc/gosa-help-nl
+       -gzip -c9 debian/changelog > debian/gosa-help-nl/usr/share/doc/gosa-help-nl/changelog.Debian.gz
        -gzip -c9 Changelog > debian/gosa/usr/share/doc/gosa/changelog.gz
        -cp AUTHORS TODO README FAQ README.safemode DEVEL debian/gosa/usr/share/doc/gosa/
        -rm debian/gosa/usr/share/gosa/README debian/gosa/usr/share/gosa/INSTALL
@@ -67,6 +75,7 @@ install-stamp:
        -rm -rf debian/gosa/usr/share/gosa/contrib
        -rm -rf debian/gosa/usr/share/gosa/locale/en
        -rm -rf debian/gosa/usr/share/gosa/gen_locale.sh
+       -rm -rf debian/gosa/usr/share/gosa/gen_online_help.sh
        -rm -rf debian/gosa/usr/share/gosa/gen_function_list.php
        -rm -rf debian/gosa/usr/share/gosa/update.sh
        -mkdir -p debian/gosa/usr/share/php/smarty/libs/plugins