Commit 96d91ed8 authored by Holger Levsen's avatar Holger Levsen
Browse files

chroot-installation: install mplayer on stretch+sid (instead mplayer2 as before)

parent 7fac9a5d
...@@ -90,7 +90,7 @@ Installation tests inside chroot environments. ...@@ -90,7 +90,7 @@ Installation tests inside chroot environments.
* $distro-install jobs (and $distro-install+upgrade jobs): * $distro-install jobs (and $distro-install+upgrade jobs):
** `debootstrap $distro`, install a *$set_of_packages* (and upgrade to *$2nd_distro*) ** `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. *** 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' ** Then there are also all the corresponding upgrade jobs, eg 'chroot-installation_wheezy_install_gnome_upgrade_to_jessie'
......
...@@ -214,10 +214,10 @@ case $1 in ...@@ -214,10 +214,10 @@ case $1 in
SPECIFIC="libreoffice virt-manager mplayer2 chromium" SPECIFIC="libreoffice virt-manager mplayer2 chromium"
;; ;;
stretch) DISTRO="stretch" stretch) DISTRO="stretch"
SPECIFIC="libreoffice virt-manager mplayer2 chromium" SPECIFIC="libreoffice virt-manager mplayer chromium"
;; ;;
sid) DISTRO="sid" sid) DISTRO="sid"
SPECIFIC="libreoffice virt-manager mplayer2 chromium" SPECIFIC="libreoffice virt-manager mplayer chromium"
;; ;;
*) echo "unsupported distro." *) echo "unsupported distro."
exit 1 exit 1
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment