diff --git a/pkg-list/le4/escola/install.list b/pkg-list/le4/escola/install.list index 60769d1a34c15473b3776d1b91ede66febcc7944..8da3c6f912d848531a83f371e71754afe2bb03cf 100644 --- a/pkg-list/le4/escola/install.list +++ b/pkg-list/le4/escola/install.list @@ -1,5 +1,6 @@ vlc-nox=1.0.6-1ubuntu1.4userful vlc=1.0.6-1ubuntu1.4userful +libdvdcss2 le-all le-users le-edubar diff --git a/pkg-list/le4/escola/install.list-desktop b/pkg-list/le4/escola/install.list-desktop index af186367771b850d5622c299a68887ca2e1fe049..46a6f8e03c29117fe3cd154c73932f444b6e7c76 100644 --- a/pkg-list/le4/escola/install.list-desktop +++ b/pkg-list/le4/escola/install.list-desktop @@ -1,5 +1,6 @@ vlc-nox=1.0.6-1ubuntu1.4userful vlc=1.0.6-1ubuntu1.4userful +libdvdcss2 le-all le-users le-edubar diff --git a/scripts/00-update_le4 b/scripts/00-update_le4 index 6fe3da06678436bb8004e6483c760573b98efd2c..9ee6b2f645a7ec878efa96c811397bc94af88cc3 100755 --- a/scripts/00-update_le4 +++ b/scripts/00-update_le4 @@ -58,6 +58,15 @@ chroot "$CHROOTDIR" wget http://windu.c3sl.ufpr.br/le/public.key -O /dev/stdout > "$TMP/windu.key" chroot "$CHROOTDIR" apt-key add - < "$TMP/windu.key" +# Videolan repositories +echo 'deb http://download.videolan.org/pub/debian/stable/ / +deb-src http://download.videolan.org/pub/debian/stable/ /' \ + >> "$CHROOTDIR/etc/apt/sources.list.d/videolan-repos.list" + +chroot "$CHROOTDIR" wget http://download.videolan.org/pub/debian/videolan-apt.asc -O /dev/stdout \ + > "$TMP/videolan.asc" +chroot "$CHROOTDIR" apt-key add - < "$TMP/videolan.asc" + # Changes distro chroot "$CHROOTDIR" apt-get -y --force-yes update diff --git a/scripts/40-configure_le4 b/scripts/40-configure_le4 index 93a9d6536fd9cc990a49aa751ff59dcbe9db30ca..585907515071c9e07d3d73c14716ed43efb86b33 100755 --- a/scripts/40-configure_le4 +++ b/scripts/40-configure_le4 @@ -124,9 +124,6 @@ cp -f "$TEMPLATES"/kdm/* "$CHROOTDIR"/etc/kde4/kdm/ # removes Kubuntu Autorun rm -rf "$CDDIR"/wubi.exe "$CDDIR"/autorun.inf -# run the script to download and install libdvdcss2 -"$CHROOTDIR"/usr/share/doc/libdvdread4/install-css.sh - # Turn off acpi for light version if [ "$1" != "le4/light" ]; then echo "ACPI OFF"