Cleanup

i-MSCP · Jan 17, 2019 · c29e569 · c29e569
1 parent b5e03e3
commit c29e569
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 56 deletions.
diff --git a/autoinstaller/Packages/debian-jessie.xml b/autoinstaller/Packages/debian-jessie.xml
@@ -83,8 +83,6 @@
             <package post_install_tasks="phpenmod apcu">php-apcu</package>
             <package>php-pear</package>
             <package>libapache2-mod-php5.6</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php5.6>
         <php7.0
                 description="PHP 7.0"
@@ -124,8 +122,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.0</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.0>
         <php7.1
                 description="PHP 7.1"
@@ -165,8 +161,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.1</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.1>
         <php7.2
                 description="PHP 7.2"
@@ -205,8 +199,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.2</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.2>
         <php7.3
                 description="PHP 7.3"

diff --git a/autoinstaller/Packages/debian-stretch.xml b/autoinstaller/Packages/debian-stretch.xml
@@ -121,8 +121,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.0</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.0>
         <php7.1
                 description="PHP 7.1"
@@ -162,8 +160,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.1</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.1>
         <php7.2
                 description="PHP 7.2"
@@ -202,8 +198,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.2</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.2>
         <php7.3
                 description="PHP 7.3"
@@ -242,8 +236,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.3</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.3>
     </php>
     <po>

diff --git a/autoinstaller/Packages/devuan-ascii.xml b/autoinstaller/Packages/devuan-ascii.xml
@@ -121,8 +121,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.0</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.0>
         <php7.1
                 description="PHP 7.1"
@@ -162,8 +160,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.1</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.1>
         <php7.2
                 description="PHP 7.2"
@@ -202,8 +198,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.2</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.2>
         <php7.3
                 description="PHP 7.3"
@@ -242,8 +236,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.3</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.3>
     </php>
     <po>

diff --git a/autoinstaller/Packages/devuan-jessie.xml b/autoinstaller/Packages/devuan-jessie.xml
@@ -121,8 +121,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.0</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.0>
         <php7.1
                 description="PHP 7.1"
@@ -162,8 +160,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.1</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.1>
         <php7.2
                 description="PHP 7.2"
@@ -202,8 +198,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.2</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.2>
         <php7.3
                 description="PHP 7.3"
@@ -242,8 +236,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.3</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.3>
     </php>
     <po>

diff --git a/autoinstaller/Packages/ubuntu-bionic.xml b/autoinstaller/Packages/ubuntu-bionic.xml
@@ -124,8 +124,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.0</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.0>
         <php7.1
                 description="PHP 7.1"
@@ -165,8 +163,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.1</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.1>
         <php7.2
                 description="PHP 7.2"
@@ -205,8 +201,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.2</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.2>
         <php7.3
                 description="PHP 7.3"
@@ -245,8 +239,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.3</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.3>
     </php>
     <po>

diff --git a/autoinstaller/Packages/ubuntu-trusty.xml b/autoinstaller/Packages/ubuntu-trusty.xml
@@ -135,8 +135,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.0</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.0>
         <php7.1
                 description="PHP 7.1"
@@ -177,8 +175,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.1</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.1>
         <php7.2
                 description="PHP 7.2"
@@ -218,8 +214,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.2</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.2>
         <php7.3
                 description="PHP 7.3"
@@ -259,8 +253,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.3</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.3>
     </php>
     <po>

diff --git a/autoinstaller/Packages/ubuntu-xenial.xml b/autoinstaller/Packages/ubuntu-xenial.xml
@@ -124,8 +124,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.0</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.0>
         <php7.1
                 description="PHP 7.1"
@@ -165,8 +163,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.1</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.1>
         <php7.2
                 description="PHP 7.2"
@@ -205,8 +201,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.2</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.2>
         <php7.3
                 description="PHP 7.3"
@@ -245,8 +239,6 @@
             <package post_install_tasks="phpenmod apcu_bc">php-apcu-bc</package>
             <package>php-pear</package>
             <package>libapache2-mod-php7.3</package>
-            <package_conflict>php5-common</package_conflict>
-            <package_conflict>libapache2-mod-php5</package_conflict>
         </php7.3>
     </php>
     <po>