From b56885cc047cf768d0ba0d407365dc83b1d57435 Mon Sep 17 00:00:00 2001 From: cajus Date: Mon, 8 Dec 2008 09:14:20 +0000 Subject: [PATCH] Some more debian cleanup git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13175 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/debian/control | 19 ++++++++++--------- gosa-core/debian/gosa-dev.install | 1 - gosa-core/debian/rules | 4 ++++ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/gosa-core/debian/control b/gosa-core/debian/control index 0c708f2b5..2d4f913f5 100644 --- a/gosa-core/debian/control +++ b/gosa-core/debian/control @@ -3,11 +3,11 @@ Section: web Priority: optional Maintainer: Cajus Pollmeier Build-Depends: debhelper (>= 5), dpatch, po-debconf -Standards-Version: 3.7.2 +Standards-Version: 3.8.0 Package: gosa Architecture: all -Depends: php5, php5-cli, apache2-mpm-worker | apache2-mpm-threadpool | apache2-mpm-prefork | apache2-mpm-perchild, exim4 | mail-transport-agent, php5-gd, php5-imap, php5-ldap, php5-mhash, php5-mcrypt, php5-mysql, php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, libcrypt-smbhash-perl, smarty, php5-recode, smarty-gettext, smarty-acl-render, gettext, libapache2-mod-php5 +Depends: ${misc:Depends}, php5, php5-cli, apache2-mpm-worker | apache2-mpm-threadpool | apache2-mpm-prefork | apache2-mpm-perchild, exim4 | mail-transport-agent, php5-gd, php5-imap, php5-ldap, php5-mhash, php5-mcrypt, php5-mysql, php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, libcrypt-smbhash-perl, smarty, php5-recode, smarty-gettext, smarty-acl-render, gettext, libapache2-mod-php5 Suggests: gosa-si-server, cyrus21-imapd (>= 2.1.11), postfix-ldap, slapd, gosa-schema, php5-suhosin, php-apc Description: Web Based LDAP Administration Program Provided is access to posix, shadow, samba, proxy, fax, pureftp and @@ -19,7 +19,7 @@ Description: Web Based LDAP Administration Program Package: gosa-dev Architecture: all -Depends: gosa, php5-cli, latex2html, lyx +Depends: ${misc:Depends}, gosa, php5-cli, lyx Description: GOsa development utiles This package contains a couple of tools to generate online help, extract localisations and aid developing. @@ -29,7 +29,7 @@ Description: GOsa development utiles Package: gosa-desktop Architecture: all -Depends: konqueror | iceweasel | mozilla | firefox, debconf +Depends: ${misc:Depends}, konqueror | iceweasel | mozilla | firefox, debconf Description: Desktop integration for GOsa This package includes a menu definition for your desktop environment. @@ -40,6 +40,7 @@ Description: Desktop integration for GOsa Package: gosa-schema Architecture: all Recommends: slapd +Depends: ${misc:Depends} Description: LDAP schema for GOsa This package includes the LDAP schema needed by GOsa. . @@ -48,7 +49,7 @@ Description: LDAP schema for GOsa Package: gosa-help-en Architecture: all -Depends: gosa +Depends: ${misc:Depends}, gosa Description: English online help for GOsa This package includes the English online documentation for GOsa . @@ -57,7 +58,7 @@ Description: English online help for GOsa Package: gosa-help-de Architecture: all -Depends: gosa +Depends: ${misc:Depends}, gosa Description: German online help for GOsa This package includes the German online documentation for GOsa . @@ -66,7 +67,7 @@ Description: German online help for GOsa Package: gosa-help-fr Architecture: all -Depends: gosa +Depends: ${misc:Depends}, gosa Description: French online help for GOsa This package includes the French online documentation for GOsa . @@ -75,7 +76,7 @@ Description: French online help for GOsa Package: gosa-help-nl Architecture: all -Depends: gosa +Depends: ${misc:Depends}, gosa Description: Dutch online help for GOsa This package includes the Dutch online documentation for GOsa . @@ -84,7 +85,7 @@ Description: Dutch online help for GOsa Package: smarty-acl-render Architecture: all -Depends: smarty +Depends: ${misc:Depends}, smarty Suggests: gosa Description: Provide ACL based rendering for Smarty smarty-acl-render provides acl based rendering support for Smarty, diff --git a/gosa-core/debian/gosa-dev.install b/gosa-core/debian/gosa-dev.install index 8892a0301..1e2645c98 100644 --- a/gosa-core/debian/gosa-dev.install +++ b/gosa-core/debian/gosa-dev.install @@ -1,4 +1,3 @@ update-locale /usr/bin -update-online-help /usr/bin update-pdf-help /usr/bin dh-make-gosa /usr/bin diff --git a/gosa-core/debian/rules b/gosa-core/debian/rules index e67d1410e..cc4af94a7 100755 --- a/gosa-core/debian/rules +++ b/gosa-core/debian/rules @@ -24,6 +24,7 @@ build: patch build-indep #* please stand by * #************************************************* + build-indep: build-indep-stamp build-indep-stamp: configure-stamp touch $@ @@ -60,6 +61,7 @@ binary-common: dh_installman rm -rf debian/gosa/usr/share/gosa/include/smarty dh_strip + dh_desktop dh_compress # This is an ugly workaround to preserve gosa.conf from beeing compressed. Excluding it # above does not work, because the manual page will match the expression, too. @@ -79,4 +81,6 @@ binary-indep: build-indep install-indep $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common binary: binary-indep + +binary-arch: .PHONY: build clean binary-indep binary install install-indep configure -- 2.30.2