summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2013-09-14 13:22:15 +0200
committerHolger Levsen <holger@layer-acht.org>2013-09-14 13:22:15 +0200
commit5386bab2596978df94219a622db2736021bfc314 (patch)
treea9ada15ef35abc66c67dadb2a8203233953bbc69
parent067be61fbda48e68c672fd1afe90877b3a70afdd (diff)
downloadjenkins.debian.net-5386bab2596978df94219a622db2736021bfc314.tar.xz
use mplayer2 for sid+jessie
-rw-r--r--README2
-rwxr-xr-xbin/chroot-installation.sh10
2 files changed, 6 insertions, 6 deletions
diff --git a/README b/README
index e372fcc1..5899dad1 100644
--- a/README
+++ b/README
@@ -89,7 +89,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 mplayer wine texlive-full asciidoc vim emacs`) 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 mplayer2` (jessie/sid) or `openoffice virtualbox mplayer` (squeeze/wheezy)) 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.
=== webcheck jobs
diff --git a/bin/chroot-installation.sh b/bin/chroot-installation.sh
index 054bd287..ffd6e835 100755
--- a/bin/chroot-installation.sh
+++ b/bin/chroot-installation.sh
@@ -127,16 +127,16 @@ trap cleanup_all INT TERM EXIT
case $1 in
squeeze) DISTRO="squeeze"
- SPECIFIC="openoffice.org virtualbox-ose"
+ SPECIFIC="openoffice.org virtualbox-ose mplayer"
;;
wheezy) DISTRO="wheezy"
- SPECIFIC="libreoffice virtualbox"
+ SPECIFIC="libreoffice virtualbox mplayer"
;;
jessie) DISTRO="jessie"
- SPECIFIC="libreoffice virt-manager"
+ SPECIFIC="libreoffice virt-manager mplayer2"
;;
sid) DISTRO="sid"
- SPECIFIC="libreoffice virt-manager"
+ SPECIFIC="libreoffice virt-manager mplayer2"
;;
*) echo "unsupported distro."
exit 1
@@ -145,7 +145,7 @@ esac
bootstrap $DISTRO
if [ "$2" != "" ] ; then
- FULL_DESKTOP="$SPECIFIC desktop-base gnome kde-plasma-desktop kde-full kde-standard xfce4 lxde vlc evince iceweasel chromium cups build-essential devscripts mplayer wine texlive-full asciidoc vim emacs"
+ FULL_DESKTOP="$SPECIFIC desktop-base gnome kde-plasma-desktop kde-full kde-standard xfce4 lxde vlc evince iceweasel chromium cups build-essential devscripts wine texlive-full asciidoc vim emacs"
case $2 in
none) ;;
gnome) install_packages gnome gnome desktop-base