diff --git a/bureau/admin/adm_doms_def_type.php b/bureau/admin/adm_doms_def_type.php index e325630b..8ee27217 100755 --- a/bureau/admin/adm_doms_def_type.php +++ b/bureau/admin/adm_doms_def_type.php @@ -20,7 +20,7 @@ /** * Manages default domain types, * they are the subdomains automatically installed on a domain when you host it. - * AlternC's modules such as squirrelmail or roundcube may create new ones, you'll see them here + * AlternC's modules such as roundcube may create new ones, you'll see them here * * @copyright AlternC-Team 2000-2017 https://alternc.com/ */ diff --git a/bureau/admin/index.php b/bureau/admin/index.php index d8133a66..ec51deb3 100755 --- a/bureau/admin/index.php +++ b/bureau/admin/index.php @@ -106,7 +106,7 @@ if ( empty($logo) || ! $logo ) {
invoke("hook_admin_webmail"); if (($wr=variable_get("webmail_redirect")) && isset($res[$wr]) && $res[$wr]) { diff --git a/bureau/locales/Makefile b/bureau/locales/Makefile index 06e24ab8..1625f8ff 100644 --- a/bureau/locales/Makefile +++ b/bureau/locales/Makefile @@ -1,6 +1,6 @@ all: messages.pot */LC_MESSAGES/messages.po -messages.pot: ../*/*.php ../../squirrelmail/alternc_changepass/*.php +messages.pot: ../*/*.php [ -r $@ ] || touch $@ xgettext --copyright-holder="AlternC Team" --package-name="AlternC" --package-version="2.0" --msgid-bugs-address="i18n@alternc.org" --force-po -o $@ --keyword=__ --keyword=_ -L PHP -F --from-code UTF-8 $^ diff --git a/debian/alternc-slave.dirs b/debian/alternc-slave.dirs index e2d32540..9390e0a0 100644 --- a/debian/alternc-slave.dirs +++ b/debian/alternc-slave.dirs @@ -4,7 +4,6 @@ etc/bind etc/bind/templates etc/phpmyadmin etc/postfix -etc/squirrelmail usr/bin usr/lib/alternc usr/sbin diff --git a/debian/alternc-squirrelmail.dirs b/debian/alternc-squirrelmail.dirs deleted file mode 100644 index c9905bbf..00000000 --- a/debian/alternc-squirrelmail.dirs +++ /dev/null @@ -1,7 +0,0 @@ -etc/alternc -etc/alternc/templates/squirrelmail -etc/alternc/templates/apache2 -etc/squirrelmail -usr/lib/alternc/install.d -usr/share/alternc/panel/class -usr/share/squirrelmail/plugins/alternc_changepass diff --git a/debian/alternc-squirrelmail.postinst b/debian/alternc-squirrelmail.postinst deleted file mode 100644 index 050004b3..00000000 --- a/debian/alternc-squirrelmail.postinst +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -set -e - -# Source debconf library. -. /usr/share/debconf/confmodule - -CONFIGFILE="/etc/alternc/local.sh" - -case "$1" in - configure) - - # add alternc-squirrelmail user for php-itk special rights - if ! getent passwd alternc-squirrelmail; then - useradd -g nogroup -u 1997 alternc-squirrelmail -d /usr/share/squirrelmail - fi - dpkg-statoverride --list /var/spool/squirrelmail/attach >/dev/null || - dpkg-statoverride --add alternc-squirrelmail root 0750 /var/spool/squirrelmail/attach - dpkg-statoverride --list /var/lib/squirrelmail/data >/dev/null || - dpkg-statoverride --add alternc-squirrelmail root 0750 /var/lib/squirrelmail/data - chown -R alternc-squirrelmail:root /var/spool/squirrelmail/attach /var/lib/squirrelmail/data - chmod -R 750 /var/spool/squirrelmail/attach /var/lib/squirrelmail/data - # Enable the squirrelmail plugin - squirrelmail-configure --remove-plugin alternc_changepass - squirrelmail-configure --install-plugin alternc_changepass - echo "**********************************************" - echo "* ALTERNC-SQUIRRELMAIL: *" - echo "* Please run alternc.install to fully deploy *" - echo "**********************************************" - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. -#DEBHELPER# diff --git a/debian/control b/debian/control index 4c75928f..cc7d3cf1 100644 --- a/debian/control +++ b/debian/control @@ -90,7 +90,6 @@ Suggests: alternc-awstats , pop-before-smtp , magpierss , ncompress - , alternc-squirrelmail , alternc-roundcube Description: Hosting software management suite for Debian AlternC is a mutualized hosting software manager for Linux. @@ -189,32 +188,6 @@ Description: Hosting software management suite for Debian More information at https://alternc.com/ Homepage: https://alternc.com/ -Package: alternc-squirrelmail -Architecture: all -Pre-depends: debconf (>= 0.5.00) | debconf-2.0 -Depends: debianutils (>= 1.13.1) - , alternc (>= 3.0~rc1) - , squirrelmail - , squirrelmail-locales - , avelsieve - , ${misc:Depends} -Conflicts: alternc (<= 1.0.3) - , alternc-changepass -Provides: alternc-webmail -Suggests: -Description: Squirrelmail-Webmail plugin and configuration for AlternC - AlternC is a mutualized hosting software manager for Linux. - It allows you to manage your websites, domains, ftp, emails, aliases, - web statistics, mailing-lists, jabber accounts, etc. - . - This extension to AlternC is installing and configuring properly the - Squirrelmail Webmail. It also configure Avelsieve to allow server-side - filtering, the password changing through MySQL, and the automatic - creation of proper profile with the right address and language. - . - More information at https://alternc.com/ -Homepage: https://alternc.com/ - Package: alternc-roundcube Architecture: all Pre-depends: debconf (>= 0.5.00) | debconf-2.0 diff --git a/debian/rules b/debian/rules index 03b7b0eb..6f113ff6 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,6 @@ export DH_VERBOSE=1 override_dh_install: #dh install $(MAKE) install-alternc DESTDIR=$(CURDIR)/debian/alternc - $(MAKE) install-squirrelmail DESTDIR=$(CURDIR)/debian/alternc-squirrelmail $(MAKE) install-roundcube DESTDIR=$(CURDIR)/debian/alternc-roundcube $(MAKE) install-awstats DESTDIR=$(CURDIR)/debian/alternc-awstats $(MAKE) install-slave DESTDIR=$(CURDIR)/debian/alternc-slave