From 404f37e8f584a7db90a37aa23d3dbb651ad792be Mon Sep 17 00:00:00 2001 From: Benjamin Sonntag Date: Mon, 29 Sep 2014 16:48:56 +0200 Subject: [PATCH] starting changelog of 3.1.2 and 3.2.2, fixing dovecot-managesieved dependency --- debian/changelog | 7 +- debian/control | 161 +++++++++++++++++++++++++++++++++++++++----- wheezy/control.diff | 73 ++++++++++++++------ 3 files changed, 201 insertions(+), 40 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0f34da76..ca5a2281 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ alternc (3.1.2) oldstable; urgency=low * fix a bug when installing (doing patches from 3.1~rc) + * #1622 fix a bug in debian/alternc.config : overwrote mysql sysusr password all the time + * fix some (5) bugs in the file manager: permission, editor, file deletion... (commit c96f928 81aae4c beebd51) + * #1573 fix dependencies on dovecot-managesieved + * fix LASTLOGIN not working on Wheezy for Dovecot (commit d4d746b) + * fix NOT migrating automatically from /var/alternc/* to /var/(www|mail)/* (commit 4749974) - -- Benjamin Sonntag Fri, 4 Jul 2014 12:44:12 +0100 + -- Benjamin Sonntag Mon, 29 Sep 2014 17:44:12 +0200 alternc (3.1.1) oldstable; urgency=low diff --git a/debian/control b/debian/control index dbd3a5b1..7b3950e8 100644 --- a/debian/control +++ b/debian/control @@ -2,19 +2,78 @@ Source: alternc Section: admin Priority: optional Maintainer: Benjamin Sonntag -Build-Depends-Indep: perl, findutils (>= 4.1.7), gettext (>= 0.10.40-5) -Build-Depends: debhelper (>= 8), po-debconf +Build-Depends-Indep: perl + , findutils (>= 4.1.7) + , gettext (>= 0.10.40-5) +Build-Depends: debhelper (>= 8) + , po-debconf Standards-Version: 3.9.4 Package: alternc Architecture: all -Pre-depends: debconf (>= 0.5.00) | debconf-2.0, bash (>= 4), acl -Depends: debianutils (>= 1.13.1), apache2-mpm-itk, libapache2-mod-php5, php5-mysql, phpmyadmin, postfix, proftpd-mod-mysql, proftpd-basic, bind9, wget, rsync, ca-certificates, locales, perl-suid | perl, postfix-mysql, wwwconfig-common, sasl2-bin, libsasl2-modules, php5-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), sudo, adduser, mysql-client, dnsutils, dovecot-common (>=1:1.2.15), dovecot-common(<< 1:2.0), dovecot-imapd (>= 1:1.2.15), dovecot-pop3d (>= 1:1.2.15), vlogger, mailutils | mailx, incron, cron, opendkim, mysql-client(>= 5.0), ${misc:Depends} -Recommends: mysql-server(>= 5.0), ntp, quota, unzip, bzip2 -Conflicts: alternc-admintools, alternc-awstats (<< 1.0), alternc-webalizer (<= 0.9.4), alternc-mailman (<< 2.0), courier-authlib +Pre-depends: debconf (>= 0.5.00) | debconf-2.0 + , bash (>= 4) + , acl +Depends: debianutils (>= 1.13.1) + , apache2-mpm-itk + , libapache2-mod-php5 + , php5-mysql + , phpmyadmin + , postfix + , proftpd-mod-mysql + , proftpd-basic + , bind9 + , wget + , rsync + , ca-certificates + , locales + , perl-suid | perl + , postfix-mysql + , wwwconfig-common + , sasl2-bin + , libsasl2-modules + , php5-cli + , lockfile-progs (>= 0.1.9) + , gettext (>= 0.10.40-5) + , sudo + , adduser + , mysql-client + , dnsutils + , dovecot-common (>=1:1.2.15) + , dovecot-common(<< 1:2.0) + , dovecot-imapd (>= 1:1.2.15) + , dovecot-pop3d (>= 1:1.2.15) + , vlogger + , mailutils | mailx + , incron + , cron + , opendkim + , mysql-client(>= 5.0) + , ${misc:Depends} +Recommends: mysql-server(>= 5.0) + , ntp + , quota + , unzip + , bzip2 +Conflicts: alternc-admintools + , alternc-awstats (<< 1.0) + , alternc-webalizer (<= 0.9.4) + , alternc-mailman (<< 2.0) + , courier-authlib Provides: alternc-admintools Replaces: alternc-admintools -Suggests: alternc-awstats, alternc-mailman, alternc-changepass, amavisd-new, clamav-daemon, spamassassin, pop-before-smtp, magpierss, zip, ncompress, alternc-squirrelmail, alternc-roundcube +Suggests: alternc-awstats + , alternc-mailman + , alternc-changepass + , amavisd-new + , clamav-daemon + , spamassassin + , pop-before-smtp + , magpierss + , zip + , ncompress + , alternc-squirrelmail + , alternc-roundcube Description: Hosting software managment suite for Debian AlternC is a mutualized hosting software manager for Linux. It allows you to manage your websites, domains, ftp, emails, aliases, @@ -38,12 +97,62 @@ Description-fr.UTF-8: Suite logicielle d'hébergement mutualisé pour Debian Package: alternc-slave Architecture: all Pre-depends: debconf (>= 0.5.00) | debconf-2.0, acl -Depends: debianutils (>= 1.13.1), apache2-mpm-itk, libapache2-mod-php5, php5-mysql, phpmyadmin, postfix, proftpd-mod-mysql, proftpd-basic, postfix-tls, bind9, wget, rsync, ca-certificates, locales, perl-suid, perl, postfix-mysql, wwwconfig-common, sasl2-bin, libsasl2-modules, php5-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), adduser, mysql-client, sudo, dovecot-common (>= 1:1.2.15), dovecot-imapd, dovecot-pop3d, vlogger, mailutils | mailx, incron, cron, opendkim, ${misc:Depends} -Recommends: dovecot-managesieved, dovecot-sieve, dovecot-mysql, quota -Conflicts: alternc-admintools, alternc-awstats (<= 0.3.2), alternc-webalizer (<= 0.9.4), alternc +Depends: debianutils (>= 1.13.1) + , apache2-mpm-itk + , libapache2-mod-php5 + , php5-mysql + , phpmyadmin + , postfix + , proftpd-mod-mysql + , proftpd-basic + , postfix-tls + , bind9 + , wget + , rsync + , ca-certificates + , locales + , perl-suid + , perl + , postfix-mysql + , wwwconfig-common + , sasl2-bin + , libsasl2-modules + , php5-cli + , lockfile-progs (>= 0.1.9) + , gettext (>= 0.10.40-5) + , adduser + , mysql-client + , sudo + , dovecot-common (>=1:1.2.15) + , dovecot-common(<< 1:2.0) + , dovecot-imapd (>= 1:1.2.15) + , dovecot-pop3d (>= 1:1.2.15) + , vlogger + , mailutils | mailx + , incron + , cron + , opendkim + , mysql-client(>= 5.0) + , ${misc:Depends} +Recommends: + quota +Conflicts: alternc-admintools + , alternc-awstats (<= 0.3.2) + , alternc-webalizer (<= 0.9.4) + , alternc Provides: alternc Replaces: alternc -Suggests: alternc-awstats, alternc-mailman, alternc-changepass, amavisd-new, clamav-daemon, spamassassin, pop-before-smtp, magpierss, zip, ncompress, bzip2 +Suggests: alternc-awstats + , alternc-mailman + , alternc-changepass + , amavisd-new + , clamav-daemon + , spamassassin + , pop-before-smtp + , magpierss + , zip + , ncompress + , bzip2 Description: Hosting software managment suite for Debian AlternC is a mutualized hosting software manager for Linux. It allows you to manage your websites, domains, ftp, emails, aliases, @@ -74,8 +183,14 @@ Description-fr.UTF-8: Suite logicielle d'hébergement mutualisé pour Debian 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 +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 @@ -105,7 +220,13 @@ Description-fr.UTF-8: Webmail Squirrelmail pour AlternC Package: alternc-roundcube Architecture: all Pre-depends: debconf (>= 0.5.00) | debconf-2.0 -Depends: debianutils (>= 1.13.1), alternc (>= 3.0~rc1), roundcube (>= 0.7.1), roundcube-mysql (>= 0.7.1), roundcube-plugins (>= 0.7.1), imagemagick, ${misc:Depends} +Depends: debianutils (>= 1.13.1) + , alternc (>= 3.0~rc1) + , roundcube (>= 0.7.1) + , roundcube-mysql (>= 0.7.1) + , roundcube-plugins (>= 0.7.1) + , imagemagick + , ${misc:Depends} Conflicts: alternc (<< 1.1) Provides: alternc-webmail Suggests: @@ -138,7 +259,10 @@ Priority: optional Section: admin Architecture: all Pre-depends: debconf -Depends: alternc (>= 3.0~rc1), awstats (>=6.1-1), php5-cli, ${misc:Depends} +Depends: alternc (>= 3.0~rc1) + , awstats (>=6.1-1) + , php5-cli + , ${misc:Depends} Suggests: apachemerge Description: Awstats statistics module for AlternC AlternC is a mutualized hosting software manager for Linux. @@ -153,7 +277,11 @@ Description: Awstats statistics module for AlternC Package: alternc-upnp Architecture: all Pre-depends: debconf (>= 0.5.00) | debconf-2.0 -Depends: debianutils (>= 1.13.1), alternc (>= 3.0~rc1), miniupnpc, php5-cli, ${misc:Depends} +Depends: debianutils (>= 1.13.1) + , alternc (>= 3.0~rc1) + , miniupnpc + , php5-cli + , ${misc:Depends} Description: UPnP client for AlternC AlternC is a mutualized hosting software manager for Linux. It allows you to manage your websites, domains, ftp, emails, aliases, @@ -177,4 +305,3 @@ Description-fr.UTF-8: Client UPnP pour AlternC situé derrière un routeur NAT. . Pour plus d'informations, consultez http://www.alternc.com/ - diff --git a/wheezy/control.diff b/wheezy/control.diff index cf32389f..8c9f13cf 100644 --- a/wheezy/control.diff +++ b/wheezy/control.diff @@ -1,22 +1,51 @@ ---- control.squeeze 2014-03-28 17:27:11.698414971 +0100 -+++ control 2014-03-28 17:27:42.055068548 +0100 -@@ -9,7 +9,7 @@ - Package: alternc - Architecture: all - Pre-depends: debconf (>= 0.5.00) | debconf-2.0, bash (>= 4), acl --Depends: debianutils (>= 1.13.1), apache2-mpm-itk, libapache2-mod-php5, php5-mysql, phpmyadmin, postfix, proftpd-mod-mysql, proftpd-basic, bind9, wget, rsync, ca-certificates, locales, perl-suid | perl, postfix-mysql, wwwconfig-common, sasl2-bin, libsasl2-modules, php5-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), sudo, adduser, mysql-client, dnsutils, dovecot-common (>=1:1.2.15), dovecot-common(<< 1:2.0), dovecot-imapd (>= 1:1.2.15), dovecot-pop3d (>= 1:1.2.15), vlogger, mailutils | mailx, incron, cron, opendkim, mysql-client(>= 5.0), ${misc:Depends} -+Depends: debianutils (>= 1.13.1), apache2-mpm-itk, libapache2-mod-php5, php5-mysql, phpmyadmin, postfix, proftpd-mod-mysql, proftpd-basic, bind9, wget, rsync, ca-certificates, locales, perl-suid | perl, postfix-mysql, wwwconfig-common, sasl2-bin, libsasl2-modules, php5-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), sudo, adduser, mysql-client, dnsutils, dovecot-common (>=1:2.1.7), dovecot-imapd, dovecot-pop3d, dovecot-mysql, vlogger, mailutils | mailx, incron, cron, opendkim, opendkim-tools, dovecot-sieve, dovecot-managesieved, ${misc:Depends} - Recommends: mysql-server(>= 5.0), ntp, quota, unzip, bzip2 - Conflicts: alternc-admintools, alternc-awstats (<< 1.0), alternc-webalizer (<= 0.9.4), alternc-mailman (<< 2.0), courier-authlib - Provides: alternc-admintools -@@ -38,8 +38,8 @@ - Package: alternc-slave - Architecture: all - Pre-depends: debconf (>= 0.5.00) | debconf-2.0, acl --Depends: debianutils (>= 1.13.1), apache2-mpm-itk, libapache2-mod-php5, php5-mysql, phpmyadmin, postfix, proftpd-mod-mysql, proftpd-basic, postfix-tls, bind9, wget, rsync, ca-certificates, locales, perl-suid, perl, postfix-mysql, wwwconfig-common, sasl2-bin, libsasl2-modules, php5-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), adduser, mysql-client, sudo, dovecot-common (>= 1:1.2.15), dovecot-imapd, dovecot-pop3d, vlogger, mailutils | mailx, incron, cron, opendkim, ${misc:Depends} --Recommends: dovecot-managesieved, dovecot-sieve, dovecot-mysql, quota -+Depends: debianutils (>= 1.13.1), apache2-mpm-itk, libapache2-mod-php5, php5-mysql, phpmyadmin, postfix, proftpd-mod-mysql, proftpd-basic, postfix-tls, bind9, wget, rsync, ca-certificates, locales, perl-suid, perl, postfix-mysql, wwwconfig-common, sasl2-bin, libsasl2-modules, php5-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), adduser, mysql-client, sudo, dovecot-common (>= 1:2.1.7), dovecot-imapd, dovecot-pop3d, dovecot-mysql, vlogger, mailutils | mailx, incron, cron, opendkim, opendkim-tools, dovecot-managesieved, dovecot-sieve, dovecot-mysql, ${misc:Depends} -+Recommends: quota - Conflicts: alternc-admintools, alternc-awstats (<= 0.3.2), alternc-webalizer (<= 0.9.4), alternc - Provides: alternc - Replaces: alternc +--- control.squeeze 2014-09-29 16:44:01.334940844 +0200 ++++ control 2014-09-29 16:31:44.088155733 +0200 +@@ -39,15 +39,18 @@ + , adduser + , mysql-client + , dnsutils +- , dovecot-common (>=1:1.2.15) +- , dovecot-common(<< 1:2.0) +- , dovecot-imapd (>= 1:1.2.15) +- , dovecot-pop3d (>= 1:1.2.15) ++ , dovecot-common (>=1:2.1.7) ++ , dovecot-imapd ++ , dovecot-pop3d ++ , dovecot-mysql + , vlogger + , mailutils | mailx + , incron + , cron + , opendkim ++ , opendkim-tools ++ , dovecot-sieve ++ , dovecot-managesieved + , mysql-client(>= 5.0) + , ${misc:Depends} + Recommends: mysql-server(>= 5.0) +@@ -123,16 +126,20 @@ + , adduser + , mysql-client + , sudo +- , dovecot-common (>=1:1.2.15) +- , dovecot-common(<< 1:2.0) +- , dovecot-imapd (>= 1:1.2.15) +- , dovecot-pop3d (>= 1:1.2.15) ++ , dovecot-common (>= 1:2.1.7) ++ , dovecot-imapd ++ , dovecot-pop3d ++ , dovecot-mysql + , vlogger + , mailutils | mailx + , incron + , cron + , opendkim +- , mysql-client(>= 5.0) ++ , opendkim-tools ++ , dovecot-managesieved ++ , dovecot-sieve ++ , dovecot-mysql ++ , mysql-client(>= 5.0) + , ${misc:Depends} + Recommends: + quota