diff --git a/debian/.svnignore b/debian/.svnignore
deleted file mode 100644
index d3939440..00000000
--- a/debian/.svnignore
+++ /dev/null
@@ -1,22 +0,0 @@
-alternc
-alternc-awstats
-alternc-awstats.debhelper.log
-alternc-awstats.postrm.debhelper
-alternc-awstats.substvars
-alternc-roundcube
-alternc-roundcube.debhelper.log
-alternc-roundcube.substvars
-alternc-slave
-alternc-slave.debhelper.log
-alternc-slave.postrm.debhelper
-alternc-slave.substvars
-alternc-squirrelmail
-alternc-squirrelmail.debhelper.log
-alternc-squirrelmail.substvars
-alternc-upnp
-alternc-upnp.debhelper.log
-alternc-upnp.substvars
-alternc.debhelper.log
-alternc.postrm.debhelper
-alternc.substvars
-files
diff --git a/phpunit/tests/bureau/class/m_adminTest.php b/phpunit/tests/bureau/class/m_adminTest.php
index 4f30f3c8..a7d86deb 100644
--- a/phpunit/tests/bureau/class/m_adminTest.php
+++ b/phpunit/tests/bureau/class/m_adminTest.php
@@ -472,15 +472,4 @@ class m_adminTest extends PHPUnit_Framework_TestCase
         );
     }
 
-    /**
-     * @covers m_admin::hook_upnp_list
-     * @todo   Implement testHook_upnp_list().
-     */
-    public function testHook_upnp_list()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
 }
diff --git a/phpunit/tests/bureau/class/m_domTest.php b/phpunit/tests/bureau/class/m_domTest.php
index 0d3e1359..b07f2c4d 100644
--- a/phpunit/tests/bureau/class/m_domTest.php
+++ b/phpunit/tests/bureau/class/m_domTest.php
@@ -784,18 +784,6 @@ class m_domTest extends PHPUnit_Framework_TestCase
         );
     }
 
-    /**
-     * @covers m_dom::hook_upnp_list
-     * @todo   Implement testHook_upnp_list().
-     */
-    public function testHook_upnp_list()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
-
     /**
      * @covers m_dom::get_problems
      * @todo   Implement testGet_problems().
diff --git a/phpunit/tests/bureau/class/m_ftpTest.php b/phpunit/tests/bureau/class/m_ftpTest.php
index 85251f26..75afc778 100644
--- a/phpunit/tests/bureau/class/m_ftpTest.php
+++ b/phpunit/tests/bureau/class/m_ftpTest.php
@@ -235,12 +235,4 @@ class m_ftpTest extends PHPUnit_Framework_TestCase
         );
     }
 
-    /**
-     * @covers m_ftp::hook_upnp_list
-     * @todo   Implement testHook_upnp_list().
-     */
-    public function testHook_upnp_list()
-    {
-        $this->assertArrayHasKey('ftp', $this->object->hook_upnp_list());
-    }
 }
diff --git a/phpunit/tests/bureau/class/m_mailTest.php b/phpunit/tests/bureau/class/m_mailTest.php
index abc11a81..c1bf6a03 100644
--- a/phpunit/tests/bureau/class/m_mailTest.php
+++ b/phpunit/tests/bureau/class/m_mailTest.php
@@ -430,15 +430,4 @@ class m_mailTest extends AlterncTest
         );
     }
 
-    /**
-     * @covers m_mail::hook_upnp_list
-     * @todo   Implement testHook_upnp_list().
-     */
-    public function testHook_upnp_list()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-          'This test has not been implemented yet.'
-        );
-    }
 }
diff --git a/wheezy/originals/alternc.install b/wheezy/originals/alternc.install
deleted file mode 100644
index d8e8b362..00000000
--- a/wheezy/originals/alternc.install
+++ /dev/null
@@ -1,567 +0,0 @@
-#!/bin/bash
-
-# ----------------------------------------------------------------------
-# AlternC - Web Hosting System
-# Copyright (C) 2000-2012 by the AlternC Development Team.
-# https://alternc.org/
-# ----------------------------------------------------------------------
-# LICENSE
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License (GPL)
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# To read the license please visit http://www.gnu.org/copyleft/gpl.html
-# ----------------------------------------------------------------------
-# Purpose of file: Main install script, launch it anytime ;) 
-# ----------------------------------------------------------------------
-
-# Somes check before start operations
-if [ `id -u` -ne 0 ]; then
-    echo "must be launched as root"
-    exit 1
-fi
-
-set -e 
-
-for i in $*; do
-    case "$i" in
-        -f|--force)
-            export force=1; shift;;
-        -s|--slave)
-            export slave=1; shift;;
-        --)
-            break;;
-        *)
-            echo "unknown option $i"; shift;;
-    esac
-done
-
-. /usr/lib/alternc/functions.sh
-
-# hook 
-run-parts --arg=startup /usr/lib/alternc/install.d 
-
-#######################################################################
-# Script configuration
-#
-
-# Configuration template location
-TEMPLATE_DIR="/etc/alternc/templates"
-
-# Find needed configuration files (without the initial '/')
-# replace this one unconditionnally
-CONFIG_FILES="etc/alternc/bureau.conf etc/incron.d/alternc etc/apache2/envvars etc/alternc/apache2.conf etc/alternc/apache_logformat.conf etc/alternc/phpmyadmin.inc.php"
-
-if [ -e /etc/bind/named.conf ]; then
-    CONFIG_FILES="$CONFIG_FILES etc/bind/named.conf.options"
-fi
-if [ -d /etc/postfix ]; then
-    CONFIG_FILES="$CONFIG_FILES etc/postfix/master.cf etc/postfix/myalias.cf etc/postfix/myrelay.cf
-                  etc/postfix/mydomain.cf etc/postfix/myrelay-domain.cf etc/postfix/mygid.cf etc/postfix/myquota.cf
-                  etc/postfix/myvirtual.cf etc/postfix/mytransport.cf etc/postfix/sasl/smtpd.conf
-                  etc/alternc/postfix/postfix.cf etc/alternc/postfix/postfix-slave.cf"
-fi
-if [ -e /etc/proftpd/proftpd.conf ]; then
-    CONFIG_FILES="$CONFIG_FILES etc/proftpd/proftpd.conf etc/proftpd/welcome.msg etc/proftpd/modules.conf"
-fi
-
-if [ -e /etc/default/saslauthd ]; then
-    CONFIG_FILES="$CONFIG_FILES etc/default/saslauthd"
-fi
-
-if [ -e /etc/dovecot/dovecot.conf ]; then
-    CONFIG_FILES="$CONFIG_FILES etc/dovecot/alternc-sql.conf etc/dovecot/alternc-dict-quota.conf etc/dovecot/conf.d/95_alternc.conf"
-fi
-
-INSTALLED_CONFIG_TAR="/var/lib/alternc/backups/etc-installed.tar.gz"
-
-#######################################################################
-# Look for modified configuration files
-#
-if [ -f "$INSTALLED_CONFIG_TAR" ]; then
-    CHANGED="`env LANG=C tar -zdf "$INSTALLED_CONFIG_TAR" -C / 2> /dev/null | 
-              grep -v 'postfix/main.cf' | grep -v 'Uid differs'|grep -v 'Gid differs'  |grep -v 'Mode differs' | 
-              sed -e 's/^\([^:]*\).*/    \1/' | sort -u`"
-    # " shutup emacs
-    if [ ! -z "$CHANGED" ]; then
-        echo "The following configuration files has changed since last AlternC"
-        echo "installation :"
-        echo "$CHANGED"
-        echo ""
-        if [ "$force" = "1" ]; then
-            echo "Replacing them as you requested."
-        else
-            echo "These configuration files should normally be modified by"
-            echo "changing the template in $TEMPLATE_DIR and then calling"
-            echo "$0 to perform the update."
-            echo ""
-            echo "Please examine the situation closely and call '$0 -f'"
-            echo "if you still want to actually overwrite these files."
-            exit 1
-        fi
-    fi
-fi
-
-#######################################################################
-# Prepare template expansions
-#
-
-chown :alterncpanel /etc/alternc/local.sh
-. /etc/alternc/local.sh
-
-# Create the target directory
-for i in "$ALTERNC_HTML" "$ALTERNC_MAIL" "$ALTERNC_LOGS" ; do
-  test -d "$i" || mkdir -p "$i"
-done
-
-find $ALTERNC_LOGS -maxdepth 1 -type d -exec chown alterncpanel:adm {} \; 
-find $ALTERNC_HTML -maxdepth 1 -type d -exec chown alterncpanel:alterncpanel {} \; 
-find $ALTERNC_MAIL -maxdepth 1 -type d -exec chown vmail:vmail {} \;
-
-for i in a b c d e f g h i j k l m n o p q r s t u v w x y z _ 0 1 2 3 4 5 6 7 8 9; do
-  test -d "$ALTERNC_HTML/$i" || ( mkdir -p "$ALTERNC_HTML/$i" && chown www-data:www-data "$ALTERNC_HTML/$i" )
-  test -d "$ALTERNC_MAIL/$i" || ( mkdir -p "$ALTERNC_MAIL/$i" && chown vmail:vmail "$ALTERNC_MAIL/$i" && chmod 775 "$ALTERNC_MAIL/$i" )
-done
-
-
-# Check ACL
-aclcheckfile="$ALTERNC_HTML/test-acl"
-touch "$aclcheckfile"
-setfacl -m u:root:rwx "$aclcheckfile" 2>/dev/null || ( echo "Error : ACL aren't activated on $ALTERNC_HTML . AlternC can't work without it." ; test -e "$aclcheckfile" && rm -f "$aclcheckfile" ; exit 2)
-test -e "$aclcheckfile" && rm -f "$aclcheckfile"
-
-# XXX: copy-paste from debian/config
-if [ -r /etc/alternc/my.cnf ]; then
-    # make mysql configuration available as shell variables
-    # to convert from .cnf to shell syntax, we:
-    # * match only lines with "equal" in them (/=/)
-    # * remove whitespace around the = and add a left quote operator ' (;s)
-    # * add a right quote operator at the end of line (;s)
-    # * convert mysql variables into our MYSQL_ naming convention (;s)
-    # * print the result (;p)
-    eval `sed -n -e "/=/{s/ *= *\"\?/='/;s/\"\?\$/'/;s/host/MYSQL_HOST/;s/user/MYSQL_USER/;s/password/MYSQL_PASS/;s/database/MYSQL_DATABASE/;p}" /etc/alternc/my.cnf`
-    chown root:alterncpanel /etc/alternc/my.cnf
-    chmod 640 /etc/alternc/my.cnf
-fi
-
-if [ -r /etc/alternc/my_mail.cnf ]; then
-    # make mysql configuration available as shell variables
-    # to convert from .cnf to shell syntax, we:
-    # * match only lines with "equal" in them (/=/)
-    # * remove whitespace around the = and add a left quote operator ' (;s)
-    # * add a right quote operator at the end of line (;s)
-    # * convert mysql variables into our MYSQL_ naming convention (;s)
-    # * print the result (;p)
-    eval `sed -n -e "/=/{s/ *= *\"\?/='/;s/\"\?\$/'/;s/host/MYSQL_HOST/;s/user/MYSQL_MAIL_USER/;s/password/MYSQL_MAIL_PASS/;s/database/MYSQL_DATABASE/;p}" /etc/alternc/my_mail.cnf`
-    chown root:alterncpanel /etc/alternc/my_mail.cnf
-    chmod 640 /etc/alternc/my_mail.cnf
-fi
-
-WARNING="WARNING: Do not edit this file, edit the one in /etc/alternc/templates and launch alternc.install again."
-
-if [ "$slave" = "1" ]; then
-    VERSION="`dpkg -s alternc-slave | sed -n -e 's/^Version: \(.*\)/\1/p'`"
-else
-    VERSION="`dpkg -s alternc | sed -n -e 's/^Version: \(.*\)/\1/p'`"
-fi
-
-# /var/ alternc/dns/d/www.example.com
-FQDN_LETTER="`echo $FQDN | sed -e 's/.*\.\([^\.]\)[^\.]*\.[^\.]*$/\1/'`"
-if [ "$FQDN_LETTER" = "$FQDN" ] 
-then
-       FQDN_LETTER="_" 
-fi
-
-NS2_IP=`perl -e "\\$h = (gethostbyname(\"$NS2_HOSTNAME\"))[4];
-                 @ip = unpack('C4', \\$h);
-                 print join (\".\", @ip);"`
-
-if [ -z "$MONITOR_IP" ]; then
-    MONITOR_IP="127.0.0.1"
-fi
-
-PUBLIC_IP_BEGIN=$(echo $PUBLIC_IP|cut -c 1)
-
-# Secret for PhpMyAdmin sessions
-PHPMYADMIN_BLOWFISH="$(generate_string 24)"
-
-# XXX: I assume this is secure if /tmp is sticky (+t)
-# we should have a better way to deal with templating, of course.
-SED_SCRIPT="/tmp/alternc.install.sedscript"
-cat > $SED_SCRIPT <<EOF
-s\\%%hosting%%\\$HOSTING\\;
-s\\%%fqdn%%\\$FQDN\\;
-s\\%%public_ip%%\\$PUBLIC_IP\\;
-s\\%%public_ip_begin%%\\$PUBLIC_IP_BEGIN\\;
-s\\%%internal_ip%%\\$INTERNAL_IP\\;
-s\\%%monitor_ip%%\\$MONITOR_IP\\;
-s\\%%ns1%%\\$NS1_HOSTNAME\\;
-s\\%%ns2%%\\$NS2_HOSTNAME\\;
-s\\%%mx%%\\$DEFAULT_MX\\;
-s\\%%dbhost%%\\$MYSQL_HOST\\;
-s\\%%dbname%%\\$MYSQL_DATABASE\\;
-s\\%%dbuser%%\\$MYSQL_USER\\;
-s\\%%dbpwd%%\\$MYSQL_PASS\\;
-s\\%%db_mail_user%%\\$MYSQL_MAIL_USER\\;
-s\\%%db_mail_pwd%%\\$MYSQL_MAIL_PASS\\;
-s\\%%warning_message%%\\$WARNING\\;
-s\\%%fqdn_lettre%%\\$FQDN_LETTER\\;
-s\\%%version%%\\$VERSION\\;
-s\\%%ns2_ip%%\\$NS2_IP\\;
-s\\%%ALTERNC_HTML%%\\$ALTERNC_HTML\\;
-s\\%%ALTERNC_MAIL%%\\$ALTERNC_MAIL\\;
-s\\%%ALTERNC_LOGS%%\\$ALTERNC_LOGS\\;
-s\\%%PHPMYADMIN_BLOWFISH%%\\$PHPMYADMIN_BLOWFISH\\;
-EOF
-
-# hook 
-test -d /usr/lib/alternc/install.d || mkdir -p /usr/lib/alternc/install.d
-run-parts --arg=templates /usr/lib/alternc/install.d 
-
-
-######################################################################
-# Backup the Main database
-DB_BACKUP="/var/lib/alternc/backups/${MYSQL_DATABASE}-db-`date +%Y%m%d-%H:%M:%S`.gz"
-db_dump="mysqldump --defaults-file=/etc/alternc/my.cnf --add-drop-table --allow-keywords --quote-names --force --quick --add-locks --lock-tables --extended-insert ${MYSQL_DATABASE}"
-$db_dump | /bin/gzip -c > $DB_BACKUP || echo "backup of the main database failed"
-
-#######################################################################
-# Backup configuration files
-#
-BACKUP_FILE="/var/lib/alternc/backups/etc-original-`date +%Y%m%d-%H%M`.tar.gz"
-
-# Only backup what we are really going to replace
-BACKUPS=""
-for file in $CONFIG_FILES; do
-    TEMPLATE="$TEMPLATE_DIR/${file##etc/}"
-    if [ -f "$TEMPLATE" ]; then
-        BACKUPS="$BACKUPS $file"
-    fi
-done
-
-# also backup main.cf since we're doing major changes to it
-BACKUPS="$BACKUPS etc/postfix/main.cf"
-
-tar -zcf "$BACKUP_FILE" -C / $BACKUPS 2>/dev/null || true
-
-#######################################################################
-# Expand templates in the right place
-#
-echo -n "Expanding variables in configuration files:"
-for file in $CONFIG_FILES; do
-    TEMPLATE="$TEMPLATE_DIR/${file##etc/}"
-    echo -n " $file"
-    if [ -f "$TEMPLATE" ]; then
-        sed -f "$SED_SCRIPT" < $TEMPLATE > /$file
-    fi
-done
-echo "."
-rm -f $SED_SCRIPT
-
-######################################################################## 
-# Ad-hoc fixes
-#
-
-php="`ls /usr/lib/apache*/*/*php*.so | sed -e 's/^.*libphp\(.\)\.so$/php\1/' | tail -1`"
-ln -fs /etc/alternc/alternc.ini /etc/$php/conf.d/alternc.ini || true
-if [ -x /usr/sbin/apache2 ]; then
-    # hook 
-    run-parts --arg=apache2 /usr/lib/alternc/install.d 
-    
-    s=""
-    # unused from AlternC 1.0, FIXME: remove it later
-    if [ -L /etc/apache2/mods-enabled/vhost_alias.load ]
-    then
-        a2dismod vhost_alias
-        s="apache2"
-    fi 
-    if ! [ -L /etc/apache2/mods-enabled/$php.load ]
-    then
-	    a2enmod $php
-    fi
-    if ! [ -L /etc/apache2/mods-enabled/rewrite.load ]
-    then
-	    a2enmod rewrite
-    fi
-    if [ -e /etc/alternc/apache.pem ]; then
-        # We enable proftpd tls module
-        cat /etc/proftpd/modules.conf | sed -e 's/^#LoadModule mod_tls.c/LoadModule mod_tls.c/' > /etc/proftpd/modules.conf.alternc-new
-        mv /etc/proftpd/modules.conf.alternc-new /etc/proftpd/modules.conf 
-        cp /etc/proftpd/modules.conf /etc/alternc/templates/proftpd/
-        # We enable apache2 SSL : 
-        if [ ! -L /etc/apache2/mods-enabled/ssl.load ] ; then
-            a2enmod ssl
-            s="apache2"
-        fi
-        if [ ! -h /etc/apache2/conf.d/alternc-ssl.conf ] && [ -e /etc/apache2/conf.d/ ]; then
-            ln -sf /etc/alternc/apache2-ssl.conf /etc/apache2/conf.d/alternc-ssl.conf
-            s="apache2"
-        fi
-
-	# We enable dovecot SSL certificate instructions: (on wheezy we should use a new file in /etc/dovecot/conf.d/ )
-	( echo "ssl_cert = </etc/alternc/apache.pem" ; echo "ssl_key = </etc/alternc/apache.pem" ) >/etc/dovecot/conf.d/96_ssl.conf
-
-    else
-        # We disable proftpd tls module
-        cat /etc/proftpd/modules.conf | sed -e 's/^LoadModule mod_tls.c/#LoadModule mod_tls.c/' > /etc/proftpd/modules.conf.alternc-new
-        mv /etc/proftpd/modules.conf.alternc-new /etc/proftpd/modules.conf 
-        cp /etc/proftpd/modules.conf /etc/alternc/templates/proftpd/
-
-	# We disable dovecot SSL certificate instructions: (on wheezy we should remove a file in /etc/dovecot/conf.d/ )
-	( echo "ssl_cert = </etc/ssl/certs/ssl-cert-snakeoil.pem" ; echo "ssl_key = </etc/ssl/private/ssl-cert-snakeoil.key" ) >/etc/dovecot/conf.d/96_ssl.conf
-
-        echo "SSL not configured"
-        echo "create a certificate in /etc/alternc/apache.pem and rerun alternc.install"
-    fi
-    if [ ! -h /etc/apache2/conf.d/alternc.conf ] && [ -e /etc/apache2/conf.d/ ]; then
-        ln -sf /etc/alternc/apache2.conf /etc/apache2/conf.d/alternc.conf
-        s="apache2"
-    fi
-    if [ -e /etc/apache2/sites-enabled/000-default ]; then
-        a2dissite default
-        s="apache2"
-    fi
-    SERVICES="$SERVICES $s"
-fi
-
-# Copy postfix *_checks if they do not exist
-for file in body_checks header_checks; do
-    if [ ! -e "/etc/postfix/$file" ]; then
-        cp /usr/share/alternc/install/$file /etc/postfix
-    fi
-done
-
-# Attribute the correct rights to critical postfix files
-if [ -e /etc/postfix/myalias.cf -o -e /etc/postfix/mydomain.cf -o -e /etc/postfix/mygid.cf -o -e /etc/postfix/myrelay-domain.sh -o -e /etc/postfix/myvirtual.cf -o -e /etc/postfix/myrelay.cf -o -e /etc/postfix/myquota.cf ]; then
-    chown root:postfix /etc/postfix/my*
-    chmod 640 /etc/postfix/my*
-fi
-
-if [ ! -f /etc/postfix/main.cf ]
-then
-    echo "****************************************"
-    echo "POSTFIX is NOT configured properly"
-    echo "please launch dpkg-reconfigure -plow postfix" 
-    echo "and choose 'Internet Site'"
-    echo "then launch alternc.install again"
-    echo "****************************************"
-    exit 1
-fi
-
-# configure Postfix appropriatly for our needs
-if [ "$slave" = "1" ]; then
-    postfix_conf=/etc/alternc/postfix/postfix-slave.cf
-else
-    postfix_conf=/etc/alternc/postfix/postfix.cf
-fi
-grep -v '^\ *#' $postfix_conf |while read line ; do
-   if echo "$line" | grep -qi '^smtpd_tls_cert_file' ;then
-     line_strip=`echo "$line"|tr -d '[:blank:]'`
-     pattern="*="
-     cert_file=${line_strip#$pattern}
-     if [ -e $cert_file ];then
-        postconf -e "$line"
-     else
-        echo "****************************************"
-        echo "The certificate file : $cert_file does not exists"
-        echo "please go to https://alternc.org/wiki/SSL to get information on how to create a certificate"
-        echo "Then edit the file /etc/alternc/postfix/postfix.cf to add"
-        echo "the cert file path name to the key :smtpd_tls_cert_file"
-        echo "Finally relaunch alternc.install"
-        echo "****************************************"
-     fi
-  else
-        postconf -e "$line"
-  fi
-done
-
-# Conviguring delivery used by Postfix
-/usr/lib/alternc/alternc_add_policy_dovecot
-
-# Bug #1215: configure mydestination when $FQDN is not in
-OLDDESTINATION=`postconf mydestination | awk -F '=' '{print $2}'`
-echo "$OLDDESTINATION" | grep -q -v "$FQDN" && postconf -e "mydestination = $FQDN, $OLDDESTINATION"
-
-# Configure PHPMyAdmin
-include_str='include("/etc/alternc/phpmyadmin.inc.php")'
-pma_config='/etc/phpmyadmin/config.inc.php'
-
-# Sur une configuration vierge, inclure la configuration alternc
-if ! grep -e "${include_str/\"/\\\"}" $pma_config > /dev/null 2>&1; then
-    echo "$include_str;" >> $pma_config
-fi
-
-# Le template de /etc/alternc/phpmyadmin.inc.php viens d'être réappliqué, on 
-# regénére la liste des serveurs MySQL disponible dedans.
-mysql_query "select id,host,name from db_servers;" | while read id host name ; do
-echo "
-// Server #$id in db_servers
-\$i++;
-\$cfg['Servers'][\$i]['connect_type']  = 'tcp';    // How to connect to MySQL server ('tcp' or 'socket')
-\$cfg['Servers'][\$i]['auth_type']     = 'cookie';    // Authentication method (config, http or cookie based)?
-\$cfg['Servers'][\$i]['hide_db']       = 'information_schema';
-\$cfg['Servers'][\$i]['verbose']       = '$name'; // human name
-\$cfg['Servers'][\$i]['host']          = '$host'; // MySQL hostname or IP address
-" >> '/etc/alternc/phpmyadmin.inc.php'
-done
-
-# Reload incron. Useless, but who know?
-SERVICES="$SERVICES incron"
- 
-if [ -e /etc/proftpd.conf ] ; then
-    chmod 640 /etc/proftpd/proftpd.conf
-fi
-
-if [ -x /usr/sbin/locale-gen ] ; then
-    touch /etc/locale.gen
-    LOCALECHANGED=""
-    # Add de_DE ISO-8859-1, en_US ISO-8859-1, es_ES ISO-8859-1, fr_FR ISO-8859-1 to the locales : 
-    if ! grep -q "^de_DE ISO-8859-1$" /etc/locale.gen ; then
-	echo "de_DE ISO-8859-1" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^en_US ISO-8859-1$" /etc/locale.gen ; then
-	echo "en_US ISO-8859-1" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^es_ES ISO-8859-1$" /etc/locale.gen ; then
-	echo "es_ES ISO-8859-1" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^fr_FR ISO-8859-1$" /etc/locale.gen ; then 
-	echo "fr_FR ISO-8859-1" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^de_DE.UTF-8 UTF-8$" /etc/locale.gen ; then
-	echo "de_DE.UTF-8 UTF-8" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^fr_FR.UTF-8 UTF-8$" /etc/locale.gen ; then
-	echo "fr_FR.UTF-8 UTF-8" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^es_ES.UTF-8 UTF-8$" /etc/locale.gen ; then
-	echo "es_ES.UTF-8 UTF-8" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^en_US.UTF-8 UTF-8$" /etc/locale.gen ; then
-	echo "en_US.UTF-8 UTF-8" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^it_IT.UTF-8 UTF-8$" /etc/locale.gen ; then
-	echo "it_IT.UTF-8 UTF-8" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^nl_NL.UTF-8 UTF-8$" /etc/locale.gen ; then
-	echo "nl_NL.UTF-8 UTF-8" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if [ "$LOCALECHANGED" ] ; then
-	locale-gen
-    fi
-fi
-
-# remaining steps are only for the master
-if [ "$slave" = "1" ]; then
-    exit 0
-fi
-
-#######################################################################
-# populate alternc database with the mailname used by postfix to send mail for each vhost
-#
-mailname=`cat /etc/mailname`
-mysql_query "update variable SET value='"$mailname"' where name='mailname_bounce';" 
-# Allow for all the users to view /etc/mailname
-chmod +r "/etc/mailname"
-
-#######################################################################
-# Save installed files to check them during next install
-#
-tar -zcf "$INSTALLED_CONFIG_TAR" -C / $CONFIG_FILES
-
-#######################################################################
-# Last touches
-#
-
-find $ALTERNC_HTML -maxdepth 1 -type d -exec setfacl -b -k -m d:g:alterncpanel:-wx -m g:alterncpanel:-wx {} \;
-
-#creating log file
-if [ ! -e "/var/log/alternc/bureau.log" ]; then
-  test -d "/var/log/alternc/" || mkdir -p "/var/log/alternc/"
-  touch "/var/log/alternc/bureau.log"
-fi
-
-if [ ! -e "/var/log/alternc/update_domains.log" ]; then
-  test -d "/var/log/alternc/" || mkdir -p "/var/log/alternc/"
-  touch "/var/log/alternc/update_domains.log"
-fi
-
-# Be sure of the owner of the logs files
-chmod 640 /var/log/alternc/bureau.log /var/log/alternc/update_domains.log
-chown alterncpanel:adm /var/log/alternc/bureau.log /var/log/alternc/update_domains.log
-
-# Creating admin user if needed
-HAS_ROOT=`mysql --defaults-file=/etc/alternc/my.cnf -e "SELECT COUNT(*) FROM membres WHERE login = 'admin' OR login = 'root' and su = 1" | tail -1`
-
-if [ "$HAS_ROOT" != "1" ]; then
-    echo "Creating admin user..."
-    echo ""
-
-    if su - alterncpanel -s /bin/bash -c /usr/share/alternc/install/newone.php
-      then
-      echo "*******************************************"
-      echo "*                                         *"
-      echo "*               Admin account             *"
-      echo "*               ------------              *"
-      echo "*                                         *"
-      echo "* user: admin             password: admin *"
-      echo "*                                         *"
-      echo "* Please change this as soon as possible! *"
-      echo "*                                         *"
-      echo "*******************************************"
-    else
-	echo "Unable to create the first AlternC account (named 'admin'). newone.php returned $?. Check your MySQL database, PHP, and the /etc/alternc/local.sh file. Also check for any error above during install."
-    fi
-fi
-
-#giving vmail user read access on dovecot sql file
-chgrp vmail /etc/dovecot/dovecot.conf
-chmod g+r /etc/dovecot/dovecot.conf
-
-# Changing owner of web panel's files
-chown -R alterncpanel:alterncpanel "/usr/share/alternc/panel/"
-
-# We force the re-computing of the DNS zones, since we may have changed the IP address (see #460)
-/usr/bin/mysql --defaults-file="/etc/alternc/my.cnf" -B -e "update domaines set dns_action='update';"
-
-# hook 
-run-parts --arg=before-reload /usr/lib/alternc/install.d 
-
-#######################################################################
-# Reload services
-#
-for service in postfix bind9 apache2 dovecot cron proftpd; do
-    invoke-rc.d $service force-reload || true
-done
-
-# We should restart apaches after all configuration stuff ...
-for service in $SERVICES; do
-    test -x /etc/init.d/$service && invoke-rc.d $service stop || true
-done
-for service in $SERVICES; do
-    test -x /etc/init.d/$service && invoke-rc.d $service start || true
-done
-
-#launch fixperms 
-echo "Fix all the permission. May be quite long..."
-/usr/lib/alternc/fixperms.sh
-
-# hook 
-run-parts --arg=end /usr/lib/alternc/install.d 
diff --git a/wheezy/originals/control b/wheezy/originals/control
deleted file mode 100644
index f00015e9..00000000
--- a/wheezy/originals/control
+++ /dev/null
@@ -1,181 +0,0 @@
-Source: alternc
-Section: admin
-Priority: optional
-Maintainer: Antoine Beaupré <anarcat@koumbit.org>
-Uploaders: Benjamin Sonntag <benjamin@alternc.org>
-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:2.1.7), dovecot-imapd, dovecot-pop3d, dovecot-mysql, vlogger, mailutils | mailx, incron, cron, ${misc:Depends}
-Recommends: mysql-server(>= 5.0), ntp, quota, dovecot-sieve, dovecot-managesieved
-Conflicts: alternc-admintools, alternc-awstats (<< 1.0), alternc-webalizer (<= 0.9.4), alternc-mailman (<< 2.0)
-Provides: alternc-admintools
-Replaces: alternc-admintools
-Suggests: alternc-awstats, alternc-mailman, alternc-changepass, amavisd-new, clamav-daemon, spamassassin, pop-before-smtp, magpierss, zip, ncompress, bzip2, 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,
- web statistics, mailing-lists, jabber accounts, etc.
- .
- AlternC is mainly a PHP based administration interface and some conf files
- for the software used by it. 
- .
- More information at http://www.alternc.com/
-Homepage: http://www.alternc.com/
-Description-fr.UTF-8: Suite logicielle d'hébergement mutualisé pour Debian
- AlternC est un logiciel d'hébergement mutualisé pour serveur Linux.
- Il permet de gérer les sites web, domaines, ftp, emails, alias,
- statistiques web, listes de discussions, comptes jabber, etc.
- .
- AlternC est essentiellement une interface d'administration en PHP et
- quelques fichiers de configuration pour les logiciels qu'il utilise.
- .
- Pour plus d'informations, consultez http://www.alternc.com/
-
-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:2.1.7), dovecot-imapd, dovecot-pop3d, dovecot-mysql, vlogger, mailutils | mailx, incron, cron, ${misc:Depends}
-Recommends: dovecot-managesieved, dovecot-sieve, dovecot-mysql, 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
-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,
- web statistics, mailing-lists, jabber accounts, etc.
- .
- AlternC is mainly a PHP based administration interface and some conf files
- for the software used by it. 
- .
- This package is designed for frontend nodes in a load balancing setup, where
- the AlternC directory is not touched and managed over NFS.
- . 
- More information at http://www.alternc.com/
-Homepage: http://www.alternc.com/
-Description-fr.UTF-8: Suite logicielle d'hébergement mutualisé pour Debian
- AlternC est un logiciel d'hébergement mutualisé pour serveur Linux.
- Il permet de gérer les sites web, domaines, ftp, emails, alias,
- statistiques web, listes de discussions, comptes jabber, etc.
- .
- AlternC est essentiellement une interface d'administration en PHP et
- quelques fichiers de configuration pour les logiciels qu'il utilise.
- .
- Ce paquet permet de construire un noeud frontal dans une configuration avec
- répartiteur de charge, ou le dossier /var/alternc n'est pas modifié et géré
- à travers NFS.
- .
- Pour plus d'informations, consultez http://www.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 http://www.alternc.com/
-Homepage: http://www.alternc.com/
-Description-fr.UTF-8: Webmail Squirrelmail pour AlternC
- AlternC est un logiciel d'hébergement mutualisé pour serveur Linux.
- Il permet de gérer les sites web, domaines, ftp, emails, alias,
- statistiques web, listes de discussions, comptes jabber, etc.
- .
- Cette extension d'AlternC installe et configure le webmail Squirrelmail.
- Il configure aussi Avelsieve pour permettre l'accès au filtrage du courrier
- côté serveur, ainsi que le changement de mot de passe via MySQL et la création
- automatique des profiles avec la bonne adresse et la bonne langue.
- .
- Pour plus d'informations, consultez http://www.alternc.com/
-
-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}
-Conflicts: alternc (<< 1.1)
-Provides: alternc-webmail
-Suggests: 
-Description: Roundcube-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
- Roundcube Webmail. It also configure sieve 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 http://www.alternc.com/
-Homepage: http://www.alternc.com/
-Description-fr.UTF-8: Webmail Roundcube pour AlternC
- AlternC est un logiciel d'hébergement mutualisé pour serveur Linux.
- Il permet de gérer les sites web, domaines, ftp, emails, alias,
- statistiques web, listes de discussions, comptes jabber, etc.
- .
- Cette extension d'AlternC installe et configure le webmail Roundcube.
- Il configure aussi sieve pour permettre l'accès au filtrage du courrier
- côté serveur, ainsi que le changement de mot de passe via MySQL et la création
- automatique des profiles avec la bonne adresse et la bonne langue.
- .
- Pour plus d'informations, consultez http://www.alternc.com/
-
-Package: alternc-awstats
-Priority: optional
-Section: admin
-Architecture: all
-Pre-depends: debconf
-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.
- It allows you to manage your websites,   domains, ftp, emails, aliases,
- web statistics, mailing-lists, jabber accounts, etc.
- .
- This package is an optional module that adds awstats statistics
- to the virtual desktop.
- .
- More information on http://www.alternc.com/.
-
-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}
-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,
- web statistics, mailing-lists, jabber accounts, etc.
- .
- This extension to AlternC is installing a UPnP IGD client and make it so
- that your router required tcp and udp port are forwarded to AlternC.
- You need that only if your AlternC's server is behind a NAT router.
- .
- More information at http://www.alternc.com/
-Homepage: http://www.alternc.com/
-Description-fr.UTF-8: Client UPnP pour AlternC
- AlternC est un logiciel d'hébergement mutualisé pour serveur Linux.
- Il permet de gérer les sites web, domaines, ftp, emails, alias,
- statistiques web, listes de discussions, comptes jabber, etc.
- .
- Cette extension d'AlternC installe un client UPnP IGD et fait de telle
- sorte que les ports udp et tcp nécessaire au fonctionnement de votre
- serveur sous AlternC soient transmis depuis votre routeur.
- Vous n'avez besoin de cette extension que si votre serveur AlternC est
- situé derrière un routeur NAT.
- .
- Pour plus d'informations, consultez http://www.alternc.com/
-