Commit a1231eb1 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[ADD] - owbuildchroot now handles the webkit dependency properly for the different distributions.

parent 9aa178b5
...@@ -192,25 +192,24 @@ chroot_setup_suite() ...@@ -192,25 +192,24 @@ chroot_setup_suite()
# NOTE: I tested only debian sid and ubuntu natty and maverick. Maverick currently has some problem with libopenscenegraph. # NOTE: I tested only debian sid and ubuntu natty and maverick. Maverick currently has some problem with libopenscenegraph.
# Please add others here if needed # Please add others here if needed
case "$SUITE" in case "$SUITE" in
natty | maverick | lucid ) oneiric | natty | maverick )
# this is needed for ppa adding with automatic keyring downloading stuff
# chroot_do apt-get -y --allow-unauthenticated install python-software-properties
# the eigen3 ppa
# chroot_do add-apt-repository ppa:gaschler/rl/eigen3
# multiverse and universe needed for several packs # multiverse and universe needed for several packs
echo "deb http://de.archive.ubuntu.com/ubuntu $SUITE restricted universe multiverse" > ./$CHROOTDIR/etc/apt/sources.list.d/universeMultiverse.sources.list echo "deb http://de.archive.ubuntu.com/ubuntu $SUITE restricted universe multiverse" > ./$CHROOTDIR/etc/apt/sources.list.d/universeMultiverse.sources.list
# This is very important: the pinning prohibits an update to some new boost version which is NOT available in
# neurodeb or ubunut now, but at ppa:gaschler # they provide qtwebkit
#echo "Package: * chroot_do apt-get install libqtwebkit-dev
#Pin: origin ppa.launchpad.net ;;
#Pin-Priority: -1 lucid )
# # lucid does not provide libqtwebkit-qt .. so, do not install. only add multi/universe
#Package: libeigen3-dev # multiverse and universe needed for several packs
#Pin: origin ppa.launchpad.net echo "deb http://de.archive.ubuntu.com/ubuntu $SUITE restricted universe multiverse" > ./$CHROOTDIR/etc/apt/sources.list.d/universeMultiverse.sources.list
#Pin-Priority: 1000" > ./$CHROOTDIR/etc/apt/preferences.d/noBoostFromGaschler ;;
sid | testing )
# they provide qtwebkit
chroot_do apt-get install libqtwebkit-dev
;; ;;
*) *)
# nothing needed for debian sid # debian 6 does not have libqtwebkit
;; ;;
esac esac
...@@ -226,7 +225,7 @@ chroot_finalize_suite() ...@@ -226,7 +225,7 @@ chroot_finalize_suite()
{ {
# handle some special suites # handle some special suites
case "$SUITE" in case "$SUITE" in
natty | maverick) oneiric | natty | maverick | lucid )
# ubuntu hack: kill this xapian-index stuff. If not done, chroot_umount will fail # ubuntu hack: kill this xapian-index stuff. If not done, chroot_umount will fail
chroot_do killall -q update-apt-xapian-index | echo chroot_do killall -q update-apt-xapian-index | echo
;; ;;
......
Markdown is supported
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