From: Michael Mrozek <EvilDragon@openpandora.de>
Date: Wed, 8 Jun 2011 01:45:42 +0000 (+0200)
Subject: task-pandora-xfce: Removed Midori and Links, added Links2
X-Git-Tag: sz_beta3~152
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f6ccf1a9b85f83338b02c553bb778bfcf6d0790;p=openpandora.oe.git

task-pandora-xfce: Removed Midori and Links, added Links2
---

diff --git a/recipes/tasks/task-pandora-xfce.bb b/recipes/tasks/task-pandora-xfce.bb
index 81bd599..193e5f8 100755
--- a/recipes/tasks/task-pandora-xfce.bb
+++ b/recipes/tasks/task-pandora-xfce.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Task file for the XFCE Pandora image"
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r50"
+PR = "r51"
 
 inherit task
 
@@ -18,7 +18,7 @@ APPS = " \
   networkmanager network-manager-applet netm-cli \ 
   vnc x11vnc angstrom-x11vnc-xinit \
   xchat \
-  links \
+  links-x11 \
 #  xournal \
 #  arora \
 "
@@ -99,7 +99,7 @@ PANDORA = " \
   pandora-scripts \
   pandora-wallpaper-official \
   pandora-xfce-defaults \
-  pandora-midori-defaults midori \
+#  pandora-midori-defaults midori \
   libgles2d \
   pandora-misc \
 "
@@ -143,8 +143,8 @@ QT_SUPPORT = " \
 
 # We want all of the Qt metapackage (for dev use) without the demos/examples.
 BAD_RECOMMENDATIONS += " \
-  qt4-demos \
-  qt4-examples \
+  ${QT_SELECTED}-demos \
+  ${QT_SELECTED}-examples \
 "
 
 TOTEM = " \