From d938745fc6760913c5f74588445a2e683a1e3fd1 Mon Sep 17 00:00:00 2001
From: Laurent Declercq <l.declercq@nuxwin.com>
Date: Mon, 27 Jan 2014 18:10:56 +0100
Subject: [PATCH] Fixed: Avoid DPKG error while switching from MySQL to MariaDB
 and vice-versa Small fixes

---
 autoinstaller/Adapter/Debian.pm  | 5 -----
 docs/Debian/packages-jessie.xml  | 1 +
 docs/Debian/packages-squeeze.xml | 5 +++++
 docs/Debian/packages-wheezy.xml  | 5 ++++-
 docs/Ubuntu/packages-lucid.xml   | 4 ++++
 docs/Ubuntu/packages-precise.xml | 3 +++
 docs/Ubuntu/packages-quantal.xml | 3 +++
 docs/Ubuntu/packages-raring.xml  | 3 +++
 docs/Ubuntu/packages-saucy.xml   | 3 +++
 docs/Ubuntu/packages-trusty.xml  | 1 +
 10 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/autoinstaller/Adapter/Debian.pm b/autoinstaller/Adapter/Debian.pm
index 4ad0980668..2d5d2db74a 100644
--- a/autoinstaller/Adapter/Debian.pm
+++ b/autoinstaller/Adapter/Debian.pm
@@ -444,11 +444,6 @@ Do you agree?
 
 	@{$self->{'packagesToUninstall'}} = uniq(@{$self->{'packagesToUninstall'}});
 
-	# Do not remove a package scheduled for installation
-	@{$self->{'packagesToUninstall'}} = grep {
-		not $_ ~~  @{$self->{'packagesToInstall'}}
-	} @{$self->{'packagesToUninstall'}};
-
 	# This test is needed to be sure to not try to remove package no longer available
 	if(@{$self->{'packagesToUninstall'}}) {
 		my ($stdout, $stderr);
diff --git a/docs/Debian/packages-jessie.xml b/docs/Debian/packages-jessie.xml
index 1faf10cf04..ee65d08cda 100644
--- a/docs/Debian/packages-jessie.xml
+++ b/docs/Debian/packages-jessie.xml
@@ -60,6 +60,7 @@
                     >
                 <package>mysql-server-5.5</package>
                 <package>mysql-client-5.5</package>
+                <package>libmysqlclient18</package>
             </mysql_5.5>
             <remote_server>
                 <package>mysql-client</package>
diff --git a/docs/Debian/packages-squeeze.xml b/docs/Debian/packages-squeeze.xml
index e5ef529bcb..376711ed90 100644
--- a/docs/Debian/packages-squeeze.xml
+++ b/docs/Debian/packages-squeeze.xml
@@ -75,6 +75,7 @@
                     >
                 <package>mysql-server-5.1</package>
                 <package>mysql-client-5.1</package>
+                <package>libmysqlclient16</package>
             </mysql_5.1>
             <mysql_5.5
                     pinning_package="mysql-server-5.5 mysql-server-5.5 mysql-common libmysqlclient18"
@@ -86,6 +87,7 @@
                     >
                 <package>mysql-server-5.5</package>
                 <package>mysql-client-5.5</package>
+                <package>libmysqlclient18</package>
             </mysql_5.5>
             <mariadb_5.3
                     pinning_package="mariadb-client-5.3 mariadb-server-5.3 mariadb-common libmysqlclient16"
@@ -98,6 +100,7 @@
                     >
                 <package>mariadb-client-5.3</package>
                 <package>mariadb-server-5.3</package>
+                <package>libmysqlclient16</package>
             </mariadb_5.3>
             <mariadb_5.5
                     pinning_package="mariadb-client-5.5 mariadb-server-5.5 mariadb-common libmysqlclient18"
@@ -110,6 +113,7 @@
                     >
                 <package>mariadb-client-5.5</package>
                 <package>mariadb-server-5.5</package>
+                <package>libmysqlclient18</package>
             </mariadb_5.5>
             <mariadb_10.0
                     pinning_package="mariadb-client-10.0 mariadb-server-10.0 mariadb-common libmysqlclient18"
@@ -122,6 +126,7 @@
                     >
                 <package>mariadb-client-10.0</package>
                 <package>mariadb-server-10.0</package>
+                <package>libmysqlclient18</package>
             </mariadb_10.0>
             <remote_server>
                 <package>mysql-client</package>
diff --git a/docs/Debian/packages-wheezy.xml b/docs/Debian/packages-wheezy.xml
index a05172826e..0b32eda8f4 100644
--- a/docs/Debian/packages-wheezy.xml
+++ b/docs/Debian/packages-wheezy.xml
@@ -72,6 +72,7 @@
                     >
                 <package>mysql-server-5.5</package>
                 <package>mysql-client-5.5</package>
+                <package>libmysqlclient18</package>
             </mysql_5.5>
             <mariadb_5.5
                     pinning_package="mariadb-client-5.5 mariadb-server-5.5 mariadb-common mysql-common libmysqlclient18"
@@ -84,6 +85,7 @@
                     >
                 <package>mariadb-client-5.5</package>
                 <package>mariadb-server-5.5</package>
+                <package>libmysqlclient18</package>
             </mariadb_5.5>
             <mariadb_10.0
                     pinning_package="mariadb-client-10.0 mariadb-server-10.0 mariadb-common libmysqlclient18"
@@ -96,6 +98,7 @@
                     >
                 <package>mariadb-client-10.0</package>
                 <package>mariadb-server-10.0</package>
+                <package>libmysqlclient18</package>
             </mariadb_10.0>
             <remote_server>
                 <package>mysql-client</package>
@@ -111,7 +114,7 @@
         <package>php5-imap</package>
         <package>php5-intl</package>
         <package>php5-mcrypt</package>
-        <package>php5-mysql</package>
+        <package>php5-mysqlnd</package>
     </php>
     <perl>
         <package>perl</package>
diff --git a/docs/Ubuntu/packages-lucid.xml b/docs/Ubuntu/packages-lucid.xml
index f8ad239be0..12ff4ea588 100644
--- a/docs/Ubuntu/packages-lucid.xml
+++ b/docs/Ubuntu/packages-lucid.xml
@@ -64,6 +64,7 @@
                     >
                 <package>mysql-server-5.1</package>
                 <package>mysql-client-5.1</package>
+                <package>libmysqlclient16</package>
             </mysql_5.1>
             <mariadb_5.3
                     pinning_package="mariadb-client-5.3 mariadb-server-5.3 mariadb-common mysql-common libmysqlclient16"
@@ -76,6 +77,7 @@
                     >
                 <package>mariadb-client-5.3</package>
                 <package>mariadb-server-5.3</package>
+                <package>libmysqlclient16</package>
             </mariadb_5.3>
             <mariadb_5.5
                     pinning_package="mariadb-client-5.5 mariadb-server-5.5 mariadb-common mysql-common libmysqlclient18"
@@ -88,6 +90,7 @@
                     >
                 <package>mariadb-client-5.5</package>
                 <package>mariadb-server-5.5</package>
+                <package>libmysqlclient18</package>
             </mariadb_5.5>
             <mariadb_10.0
                     pinning_package="mariadb-client-10.0 mariadb-server-10.0 mariadb-common mysql-common libmysqlclient18"
@@ -100,6 +103,7 @@
                     >
                 <package>mariadb-client-10.0</package>
                 <package>mariadb-server-10.0</package>
+                <package>libmysqlclient18</package>
             </mariadb_10.0>
             <remote_server>
                 <package>mysql-client</package>
diff --git a/docs/Ubuntu/packages-precise.xml b/docs/Ubuntu/packages-precise.xml
index 16183c49ff..e810c607fe 100644
--- a/docs/Ubuntu/packages-precise.xml
+++ b/docs/Ubuntu/packages-precise.xml
@@ -72,6 +72,7 @@
                     >
                 <package>mysql-server-5.5</package>
                 <package>mysql-client-5.5</package>
+                <package>libmysqlclient18</package>
             </mysql_5.5>
             <mariadb_5.5
                     pinning_package="mariadb-client-5.5 mariadb-server-5.5 mariadb-common mysql-common libmysqlclient18"
@@ -84,6 +85,7 @@
                     >
                 <package>mariadb-client-5.5</package>
                 <package>mariadb-server-5.5</package>
+                <package>libmysqlclient18</package>
             </mariadb_5.5>
             <mariadb_10.0
                     pinning_package="mariadb-client-10.0 mariadb-server-10.0 mariadb-common mysql-common libmysqlclient18"
@@ -96,6 +98,7 @@
                     >
                 <package>mariadb-client-10.0</package>
                 <package>mariadb-server-10.0</package>
+                <package>libmysqlclient18</package>
             </mariadb_10.0>
             <remote_server>
                 <package>mysql-client</package>
diff --git a/docs/Ubuntu/packages-quantal.xml b/docs/Ubuntu/packages-quantal.xml
index c644560edf..62f358fde9 100644
--- a/docs/Ubuntu/packages-quantal.xml
+++ b/docs/Ubuntu/packages-quantal.xml
@@ -72,6 +72,7 @@
                     >
                 <package>mysql-server-5.5</package>
                 <package>mysql-client-5.5</package>
+                <package>libmysqlclient18</package>
             </mysql_5.5>
             <mariadb_5.5
                     pinning_package="mariadb-client-5.5 mariadb-server-5.5 mariadb-common mysql-common libmysqlclient18"
@@ -84,6 +85,7 @@
                     >
                 <package>mariadb-client-5.5</package>
                 <package>mariadb-server-5.5</package>
+                <package>libmysqlclient18</package>
             </mariadb_5.5>
             <mariadb_10.0
                     pinning_package="mariadb-client-10.0 mariadb-server-10.0 mariadb-common mysql-common libmysqlclient18"
@@ -96,6 +98,7 @@
                     >
                 <package>mariadb-client-10.0</package>
                 <package>mariadb-server-10.0</package>
+                <package>libmysqlclient18</package>
             </mariadb_10.0>
             <remote_server>
                 <package>mysql-client</package>
diff --git a/docs/Ubuntu/packages-raring.xml b/docs/Ubuntu/packages-raring.xml
index 40b02a3a70..70ad5609c9 100644
--- a/docs/Ubuntu/packages-raring.xml
+++ b/docs/Ubuntu/packages-raring.xml
@@ -72,6 +72,7 @@
                     >
                 <package>mysql-server-5.5</package>
                 <package>mysql-client-5.5</package>
+                <package>libmysqlclient18</package>
             </mysql_5.5>
             <mariadb_5.5
                     pinning_package="mariadb-client-5.5 mariadb-server-5.5 mariadb-common mysql-common libmysqlclient18"
@@ -84,6 +85,7 @@
                     >
                 <package>mariadb-client-5.5</package>
                 <package>mariadb-server-5.5</package>
+                <package>libmysqlclient18</package>
             </mariadb_5.5>
             <mariadb_10.0
                     pinning_package="mariadb-client-10.0 mariadb-server-10.0 mariadb-common mysql-common libmysqlclient18"
@@ -96,6 +98,7 @@
                     >
                 <package>mariadb-client-10.0</package>
                 <package>mariadb-server-10.0</package>
+                <package>libmysqlclient18</package>
             </mariadb_10.0>
             <remote_server>
                 <package>mysql-client</package>
diff --git a/docs/Ubuntu/packages-saucy.xml b/docs/Ubuntu/packages-saucy.xml
index add96ed28d..1a58d0f737 100644
--- a/docs/Ubuntu/packages-saucy.xml
+++ b/docs/Ubuntu/packages-saucy.xml
@@ -72,6 +72,7 @@
                     >
                 <package>mysql-server-5.5</package>
                 <package>mysql-client-5.5</package>
+                <package>libmysqlclient18</package>
             </mysql_5.5>
             <mariadb_5.5
                     pinning_package="mariadb-client-5.5 mariadb-server-5.5 mariadb-common mysql-common libmysqlclient18"
@@ -84,6 +85,7 @@
                     >
                 <package>mariadb-client-5.5</package>
                 <package>mariadb-server-5.5</package>
+                <package>libmysqlclient18</package>
             </mariadb_5.5>
             <mariadb_10.0
                     pinning_package="mariadb-client-10.0 mariadb-server-10.0 mariadb-common mysql-common libmysqlclient18"
@@ -96,6 +98,7 @@
                     >
                 <package>mariadb-client-10.0</package>
                 <package>mariadb-server-10.0</package>
+                <package>libmysqlclient18</package>
             </mariadb_10.0>
             <remote_server>
                 <package>mysql-client</package>
diff --git a/docs/Ubuntu/packages-trusty.xml b/docs/Ubuntu/packages-trusty.xml
index 40949262c9..914de9a547 100644
--- a/docs/Ubuntu/packages-trusty.xml
+++ b/docs/Ubuntu/packages-trusty.xml
@@ -72,6 +72,7 @@
                     >
                 <package>mysql-server-5.5</package>
                 <package>mysql-client-5.5</package>
+                <package>libmysqlclient18</package>
             </mysql_5.5>
             <remote_server>
                 <package>mysql-client</package>