Added conflict for sid

[gosa.git] / debian / control

diff --git a/debian/control b/debian/control
index 9d462c08a9d87e0bc09dc30215ad9058251b95d0..40c3b2e36b840c72b49fae73e25797181f1ed9ab 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,8 @@ Standards-Version: 3.7.2.2
 
 Package: gosa
 Architecture: all
-Depends: php5, apache2, exim4 | mail-transport-agent, php5-gd, php5-imap, php5-ldap, php5-mhash, php5-mysql, php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, fping, libcrypt-smbhash-perl, smarty, php5-recode, wwwconfig-common, smarty-gettext
+Depends: php5, php5-cli, apache2, exim4 | mail-transport-agent, php5-gd, php5-imap, php5-ldap, php5-mhash, php5-mysql, php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, fping, libcrypt-smbhash-perl, smarty, php5-recode, wwwconfig-common, smarty-gettext
+Conflicts: gosa-help-en
 Suggests: cyrus22-imapd, postfix-ldap, etherwake, slapd, gosa-schema
 Description: Web Based LDAP Administration Program
  Provided is access to posix, shadow, samba, proxy, fax, pureftp and
@@ -20,7 +21,7 @@ Description: Web Based LDAP Administration Program
 Package: gosa-desktop
 Architecture: all
 Depends: iceweasel | mozilla | firefox, debconf, po-debconf
-Suggests: xbase-clients
+Suggests: x11-xserver-utils
 Description: Desktop integration for GOsa
  This package includes a menu definition for your desktop
  environment.
@@ -37,15 +38,6 @@ Description: LDAP schema for GOsa
  GOsa is a combination of system-administrator and end-user web
  interface, designed to handle LDAP based setups.
 
-Package: gosa-help-en
-Architecture: all
-Depends: gosa
-Description: English online help for GOsa
- This package includes the English online documentation for GOsa
- .
- GOsa is a combination of system-administrator and end-user web
- interface, designed to handle LDAP based setups.
-
 Package: gosa-help-de
 Architecture: all
 Depends: gosa