From: opensides Date: Mon, 18 Oct 2010 23:31:34 +0000 (+0000) Subject: - Removed all triggers files / svn merge didnt function :/ X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6e13bc9670be3848264790cd72c191bbced5c4c6;p=gosa.git - Removed all triggers files / svn merge didnt function :/ - Added debian bug to changelog git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@20087 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/debian/changelog b/gosa-core/debian/changelog index 17f593dd9..245d698ed 100644 --- a/gosa-core/debian/changelog +++ b/gosa-core/debian/changelog @@ -5,6 +5,8 @@ gosa (2.6.11-2) unstable; urgency=low * Added missing scripts in gosa-dev package * Added missing README.squid to gosa-plugin-squid package * Added patch for security in using gosa hook for password + * package explicitly depends on preform MPM (Closes: #591043) + * default config refers to missing FCGIWrapper (Closes: #591046) -- Benoit Mortier Sun, 17 Oct 2010 16:00:00 +0200 diff --git a/gosa-core/debian/control b/gosa-core/debian/control index e2465d1d7..ab9eb1705 100644 --- a/gosa-core/debian/control +++ b/gosa-core/debian/control @@ -14,7 +14,7 @@ DM-Upload-Allowed: yes Package: gosa Architecture: all Depends: php5, php5-cli, apache2 | lighttpd | httpd , exim4 | mail-transport-agent, php5-gd, php5-imap, php5-ldap, 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, ${misc:Depends}, libapache2-mod-php5 | php5-cgi -Suggests: gosa-si-server, cyrus21-imapd (>= 2.1.11), postfix-ldap, slapd, gosa-schema, php5-suhosin, php-apc, php-fpdf +Suggests: goto-si-server, cyrus21-imapd (>= 2.1.11), postfix-ldap, slapd, gosa-schema, php5-suhosin, php-apc, php-fpdf Description: Web Based LDAP Administration Program Provided is access to posix, shadow, samba, proxy, fax, pureftp and kerberos accounts. It is able to manage the postfix/cyrus server diff --git a/gosa-core/debian/gosa-plugin-addressbook.triggers b/gosa-core/debian/gosa-plugin-addressbook.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-addressbook.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-connectivity.triggers b/gosa-core/debian/gosa-plugin-connectivity.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-connectivity.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-dhcp.triggers b/gosa-core/debian/gosa-plugin-dhcp.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-dhcp.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-dns.triggers b/gosa-core/debian/gosa-plugin-dns.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-dns.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-fai.triggers b/gosa-core/debian/gosa-plugin-fai.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-fai.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-gofax.triggers b/gosa-core/debian/gosa-plugin-gofax.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-gofax.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-gofon.triggers b/gosa-core/debian/gosa-plugin-gofon.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-gofon.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-goto.triggers b/gosa-core/debian/gosa-plugin-goto.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-goto.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-kolab.triggers b/gosa-core/debian/gosa-plugin-kolab.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-kolab.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-ldapmanager.triggers b/gosa-core/debian/gosa-plugin-ldapmanager.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-ldapmanager.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-log.triggers b/gosa-core/debian/gosa-plugin-log.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-log.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-mail.triggers b/gosa-core/debian/gosa-plugin-mail.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-mail.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-mit-krb5.triggers b/gosa-core/debian/gosa-plugin-mit-krb5.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-mit-krb5.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-nagios.triggers b/gosa-core/debian/gosa-plugin-nagios.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-nagios.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-netatalk.triggers b/gosa-core/debian/gosa-plugin-netatalk.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-netatalk.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-opengroupware.triggers b/gosa-core/debian/gosa-plugin-opengroupware.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-opengroupware.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-openxchange.triggers b/gosa-core/debian/gosa-plugin-openxchange.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-openxchange.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-opsi.triggers b/gosa-core/debian/gosa-plugin-opsi.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-opsi.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-phpgw.triggers b/gosa-core/debian/gosa-plugin-phpgw.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-phpgw.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-phpscheduleit.triggers b/gosa-core/debian/gosa-plugin-phpscheduleit.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-phpscheduleit.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-pptp.triggers b/gosa-core/debian/gosa-plugin-pptp.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-pptp.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-pureftpd.triggers b/gosa-core/debian/gosa-plugin-pureftpd.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-pureftpd.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-rolemanagement.triggers b/gosa-core/debian/gosa-plugin-rolemanagement.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-rolemanagement.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-rsyslog.triggers b/gosa-core/debian/gosa-plugin-rsyslog.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-rsyslog.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-samba.triggers b/gosa-core/debian/gosa-plugin-samba.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-samba.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-scalix.triggers b/gosa-core/debian/gosa-plugin-scalix.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-scalix.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-squid.triggers b/gosa-core/debian/gosa-plugin-squid.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-squid.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-ssh.triggers b/gosa-core/debian/gosa-plugin-ssh.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-ssh.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-sudo.triggers b/gosa-core/debian/gosa-plugin-sudo.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-sudo.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-systems.triggers b/gosa-core/debian/gosa-plugin-systems.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-systems.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-uw-imap.triggers b/gosa-core/debian/gosa-plugin-uw-imap.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-uw-imap.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-webdav.triggers b/gosa-core/debian/gosa-plugin-webdav.triggers deleted file mode 100644 index 9b7a5987b..000000000 --- a/gosa-core/debian/gosa-plugin-webdav.triggers +++ /dev/null @@ -1 +0,0 @@ -activate update-gosa-plugins diff --git a/gosa-core/debian/gosa.postinst b/gosa-core/debian/gosa.postinst index 8aa3db73f..c5be14243 100644 --- a/gosa-core/debian/gosa.postinst +++ b/gosa-core/debian/gosa.postinst @@ -106,30 +106,6 @@ chmod 770 -R /var/spool/gosa chown root.$WEBGROUP -R /var/cache/gosa chmod 770 -R /var/cache/gosa -# Activating triggers -echo DEBUG: triggertest postinst called, $# args: "$@" - -if [ "$1" = "configure" ]; then - # in the general case, update-foo and update-bar should always be called - # when the central package is updated - update-gosa - -elif [ "$1" = "triggered" ]; then - # since the example ships two triggers, we should determine how to act - # based on which trigger was activated. - for triggername in $2; do - echo DEBUG: processing trigger "'$triggername'" - case "$triggername" in - "/usr/share/gosa") - update-gosa - ;; - *) - echo "unhandled/unknown trigger!" - exit 1 - ;; - esac - done -fi - +update-gosa exit 0 diff --git a/gosa-core/debian/gosa.triggers b/gosa-core/debian/gosa.triggers index 63f118fe8..920f3cb05 100644 --- a/gosa-core/debian/gosa.triggers +++ b/gosa-core/debian/gosa.triggers @@ -1,2 +1,2 @@ -interest /usr/share/gosa/ -interest update-gosa-plugins +interest update-gosa +interest /usr/share/gosa/plugins