[Piuparts-commits] [piuparts] 03/10: pre_install_database-server: use default-mysql-* in stretch+

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit d88c2038b81e10a8be8e566ed15372d8271bbee7
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon Dec 19 04:42:54 2016 +0100

    pre_install_database-server: use default-mysql-* in stretch+
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 .../scripts/pre_distupgrade_zz_database-server     |  1 +
 custom-scripts/scripts/pre_install_database-server | 25 +++++++++++++++-------
 debian/changelog                                   |  2 +-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/custom-scripts/scripts/pre_distupgrade_zz_database-server b/custom-scripts/scripts/pre_distupgrade_zz_database-server
index 6290d91..2fe58a3 100755
--- a/custom-scripts/scripts/pre_distupgrade_zz_database-server
+++ b/custom-scripts/scripts/pre_distupgrade_zz_database-server
@@ -17,6 +17,7 @@ if [ "$PIUPARTS_PHASE" = "" ]; then
 fi
 
 CANDIDATES=""
+CANDIDATES="$CANDIDATES default-mysql-server"
 CANDIDATES="$CANDIDATES mysql-server"
 CANDIDATES="$CANDIDATES postgresql"
 CANDIDATES="$CANDIDATES postgresql-8.4"
diff --git a/custom-scripts/scripts/pre_install_database-server b/custom-scripts/scripts/pre_install_database-server
index 93f14ca..163a70a 100755
--- a/custom-scripts/scripts/pre_install_database-server
+++ b/custom-scripts/scripts/pre_install_database-server
@@ -10,6 +10,7 @@ POSTGRESQL=
 SQLITE3=
 FUSIONFORGE=
 CLIENT=
+INSTALL=
 
 case ${PIUPARTS_OBJECTS%%=*} in
 	acidbase)				MYSQL=yes ;;
@@ -191,25 +192,33 @@ if [ "$FUSIONFORGE" = "yes" ]; then
 			POSTGRESQL=yes
 			;;
 		*)
-			echo "Installing fusionforge-db-local..."
-			apt-get -y install fusionforge-db-local
+			INSTALL="$INSTALL fusionforge-db-local"
 			;;
 	esac
 fi
 
 if [ "$MYSQL" = "yes" ]; then
-	echo "Installing mysql-server..."
-	apt-get -y install mysql-server ${CLIENT:+mysql-client}
+	case "$PIUPARTS_DISTRIBUTION" in
+		lenny*|squeeze*|wheezy*|jessie*)
+			INSTALL="$INSTALL mysql-server ${CLIENT:+mysql-client}"
+			;;
+		*)
+			INSTALL="$INSTALL default-mysql-server ${CLIENT:+default-mysql-client}"
+			;;
+	esac
 fi
 
 if [ "$POSTGRESQL" = "yes" ]; then
-	echo "Installing postgresql..."
-	apt-get -y install postgresql
+	INSTALL="$INSTALL postgresql"
 fi
 
 if [ "$SQLITE3" = "yes" ]; then
-	echo "Installing sqlite3..."
-	apt-get -y install sqlite3
+	INSTALL="$INSTALL sqlite3"
+fi
+
+if [ -n "$INSTALL" ]; then
+	echo "Installing ${INSTALL# }..."
+	apt-get -y install $INSTALL
 fi
 
 exit 0
diff --git a/debian/changelog b/debian/changelog
index 02d3803..81caf83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 piuparts (0.74) UNRELEASED; urgency=medium
 
-  * 
+  * pre_install_database-server: Use default-mysql-* from stretch onwards.
 
  -- Andreas Beckmann <anbe at debian.org>  Mon, 19 Dec 2016 03:10:28 +0100
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git