[Qa-jenkins-scm] [jenkins.debian.net] 01/01: chroot-installation: install mplayer on stretch+sid (instead mplayer2 as before)

[Holger Levsen]

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

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 96d91ed82fe41cc35b9703bb64d01d3ca6afd7bf
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Dec 24 09:54:24 2015 +0100

    chroot-installation: install mplayer on stretch+sid (instead mplayer2 as before)
---
 README                     | 2 +-
 bin/chroot-installation.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README b/README
index b9c07d6..bb94495 100644
--- a/README
+++ b/README
@@ -90,7 +90,7 @@ Installation tests inside chroot environments.
 
 * $distro-install jobs (and $distro-install+upgrade jobs):
 ** `debootstrap $distro`, install a *$set_of_packages* (and upgrade to *$2nd_distro*)
-** these $set_of_packages exist: 'gnome', 'kde', 'kde-full', 'lxde', 'xfc', 'full_desktop' (all five desktops plus `vlc evince iceweasel chromium cups build-essential devscripts wine texlive-full asciidoc vim emacs` and (`libreoffice virt-manager mplayer2` (jessie/sid) or `openoffice virtualbox mplayer` (squeeze/wheezy)) and 'develop'
+** these $set_of_packages exist: 'gnome', 'kde', 'kde-full', 'lxde', 'xfc', 'full_desktop' (all five desktops plus `vlc evince iceweasel chromium cups build-essential devscripts wine texlive-full asciidoc vim emacs` and (`libreoffice virt-manager mplayer` (stretch/sid) and 'develop'
 *** install is done with `apt-get install`, except for 'develop' where `apt-get build-dep` is used to install the build dependencies of these packages.
 ** Then there are also all the corresponding upgrade jobs, eg 'chroot-installation_wheezy_install_gnome_upgrade_to_jessie'
 
diff --git a/bin/chroot-installation.sh b/bin/chroot-installation.sh
index cb35412..6c65bbe 100755
--- a/bin/chroot-installation.sh
+++ b/bin/chroot-installation.sh
@@ -214,10 +214,10 @@ case $1 in
 			SPECIFIC="libreoffice virt-manager mplayer2 chromium"
 			;;
 	stretch)	DISTRO="stretch"
-			SPECIFIC="libreoffice virt-manager mplayer2 chromium"
+			SPECIFIC="libreoffice virt-manager mplayer chromium"
 			;;
 	sid)		DISTRO="sid"
-			SPECIFIC="libreoffice virt-manager mplayer2 chromium"
+			SPECIFIC="libreoffice virt-manager mplayer chromium"
 			;;
 	*)		echo "unsupported distro."
 			exit 1

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