xserver-(kdrive,xorg): versions newer then 1.3.0.0 require HAL also on device

Moved hal dependency from angstrom-x11-base-depends into xservers.

diff --git a/packages/angstrom/angstrom-x11-base-depends.bb b/packages/angstrom/angstrom-x11-base-depends.bb
index 6c4c19d807966f610067b7e71628c35645b7f53f..cbad10868064b66cc4676d0fa60cc34928ba2cd6 100644 (file)
--- a/packages/angstrom/angstrom-x11-base-depends.bb
+++ b/packages/angstrom/angstrom-x11-base-depends.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r41"
+PR = "r42"
 
 inherit task
 
@@ -11,8 +11,7 @@ DEPENDS = "virtual/xserver"
 
 RDEPENDS = "\
     ${XSERVER} \
-    hal \
-       dbus-x11 \
+    dbus-x11 \
     ttf-dejavu-sans \
     ttf-dejavu-sans-mono \
     "

diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb b/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb
index 5caec02a7b6127fa0d9ac2cb6fcf1ce2680e2a88..70503d749c1e64bf51ec824904d602f2f60ded46 100644 (file)
--- a/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb
@@ -1,9 +1,10 @@
 require xserver-kdrive-common.inc
 
 DEPENDS += "hal libxkbfile libxcalibrate pixman"
+RDEPENDS += "hal"
 
 PE = "1"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        ${KDRIVE_COMMON_PATCHES} \

diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.2.bb b/packages/xorg-xserver/xserver-kdrive_1.4.2.bb
index 922d8f58f33d1a7b6f55f1ce3bc2fab73bde43d8..e6e791ad4f71fbe35ac447c40a9d5c727e5a10c2 100644 (file)
--- a/packages/xorg-xserver/xserver-kdrive_1.4.2.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.4.2.bb
@@ -1,9 +1,10 @@
 require xserver-kdrive-common.inc
 
 DEPENDS += "hal libxkbfile libxcalibrate pixman"
+RDEPENDS += "hal"
 
 PE = "1"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        ${KDRIVE_COMMON_PATCHES} \

diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb b/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
index 04470d3d9a31e2e169fb2d8c66f67fc337cd66f6..161390179d4643a2bcafd3fd8c853255e83c87dc 100644 (file)
--- a/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb
@@ -1,11 +1,12 @@
 require xserver-kdrive-common.inc
 
 DEPENDS += "hal libxkbfile libxcalibrate pixman"
+RDEPENDS += "hal"
 
 DEFAULT_PREFERENCE = "-99" 
 
 PE = "1"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        ${KDRIVE_COMMON_PATCHES} \

diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.bb b/packages/xorg-xserver/xserver-kdrive_1.4.bb
index 5a46d7dd17a4853ff824d4ad297e69baee5cc03d..e792c84ce077029c29559f4be2cc011b32fde9aa 100644 (file)
--- a/packages/xorg-xserver/xserver-kdrive_1.4.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.4.bb
@@ -1,9 +1,10 @@
 require xserver-kdrive-common.inc
 
 DEPENDS += "hal libxkbfile libxcalibrate pixman"
+RDEPENDS += "hal"
 
 PE = "1"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        ${KDRIVE_COMMON_PATCHES} \

diff --git a/packages/xorg-xserver/xserver-kdrive_1.5.3.bb b/packages/xorg-xserver/xserver-kdrive_1.5.3.bb
index ce0d9e1638cd4b86775e72151982d5090593d8aa..686826eca3ef7aba2673c8346dc534fbdf367123 100644 (file)
--- a/packages/xorg-xserver/xserver-kdrive_1.5.3.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.5.3.bb
@@ -1,10 +1,12 @@
 require xserver-kdrive-common.inc
 
 DEPENDS += "hal libxkbfile libxcalibrate pixman"
+RDEPENDS += "hal"
 
 DEFAULT_PREFERENCE = "-99" 
 
 PE = "1"
+PR = "r1"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        ${KDRIVE_COMMON_PATCHES} \

diff --git a/packages/xorg-xserver/xserver-xorg_1.4.2.bb b/packages/xorg-xserver/xserver-xorg_1.4.2.bb
index 852e847265c48e0726430650fdb498a92271dafd..2c4f3d87166e14f123aa651aced4dffc374ef288 100644 (file)
--- a/packages/xorg-xserver/xserver-xorg_1.4.2.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.4.2.bb
@@ -2,8 +2,9 @@ require xorg-xserver-common.inc
 
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
+RDEPENDS += "hal"
 PE = "1"
-PR = "r10"
+PR = "r11"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \

diff --git a/packages/xorg-xserver/xserver-xorg_1.4.bb b/packages/xorg-xserver/xserver-xorg_1.4.bb
index ba64d72d357aad43d0614349c8a867273ebe6600..cb9ddcd9d39769d83d31abc325b99378313ba80a 100644 (file)
--- a/packages/xorg-xserver/xserver-xorg_1.4.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.4.bb
@@ -2,8 +2,9 @@ require xorg-xserver-common.inc
 
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
+RDEPENDS += "hal"
 PE = "1"
-PR = "r8"
+PR = "r9"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \

diff --git a/packages/xorg-xserver/xserver-xorg_1.5.1.bb b/packages/xorg-xserver/xserver-xorg_1.5.1.bb
index 2e21fbdd1caa801d014bb0aaaa41d478f354da6c..d4b8caffa06f5f8495f46d9b5740f381ad69fc78 100644 (file)
--- a/packages/xorg-xserver/xserver-xorg_1.5.1.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.5.1.bb
@@ -2,8 +2,9 @@ require xorg-xserver-common.inc
 
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl"
+RDEPENDS += "hal"
 PE = "1"
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://sysroot_fix.patch;patch=1"

diff --git a/packages/xorg-xserver/xserver-xorg_1.5.3.bb b/packages/xorg-xserver/xserver-xorg_1.5.3.bb
index 1402c8e653bbd97879101cfb6e38946561761f62..79df5b3bf272fd193daa348527c2138b47047c8f 100644 (file)
--- a/packages/xorg-xserver/xserver-xorg_1.5.3.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.5.3.bb
@@ -2,8 +2,9 @@ require xorg-xserver-common.inc
 
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl"
+RDEPENDS += "hal"
 PE = "2"
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://sysroot_fix.patch;patch=1"