xserver-kdrive 20050207: move apm-hack from overrides to the main SRC_URI

diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb
index f6f38a8..1fca483 100644 (file)
--- a/packages/xserver/xserver-kdrive_20050207.bb
+++ b/packages/xserver/xserver-kdrive_20050207.bb
@@ -20,7 +20,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep
 DESCRIPTION_xserver-kdrive-fake = "Fake X server"
 DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
 
-PR = "r8"
+PR = "r9"
 
 FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
 FILES_xserver-kdrive-ati = "${bindir}/Xati"
@@ -35,36 +35,24 @@ FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \
        file://kmode.patch;patch=1 \
+       file://disable-apm.patch;patch=1 \
        file://fbdev-not-fix.patch;patch=1 "
 
 SRC_URI_append_mnci   =        " file://onlyfb.patch;patch=1 \
                                  file://faster-rotated.patch;patch=1 \
-                                 file://devfs.patch;patch=1 \
-                                 file://disable-apm.patch;patch=1"
+                                 file://devfs.patch;patch=1"
 SRC_URI_append_collie =        " file://faster-rotated.patch;patch=1"
 SRC_URI_append_poodle =        " file://xserver-kdrive-poodle.patch;patch=1 \
                                  file://faster-rotated.patch;patch=1"
-SRC_URI_append_c7x0 =          " file://disable-apm.patch;patch=1"
-SRC_URI_append_ipaq-pxa270=    " file://disable-apm.patch;patch=1"
 SRC_URI_append_h3600 =                 " file://faster-rotated.patch;patch=1"
-SRC_URI_append_h3900 =                 " file://disable-apm.patch;patch=1"
-SRC_URI_append_h2200 =          " file://disable-apm.patch;patch=1"
-SRC_URI_append_spitz =          " file://disable-apm.patch;patch=1 \
-                                  file://faster-rotated.patch;patch=1"
-SRC_URI_append_akita =          " file://disable-apm.patch;patch=1 \
-                                  file://faster-rotated.patch;patch=1"
-SRC_URI_append_borzoi =         " file://disable-apm.patch;patch=1 \
-                                  file://faster-rotated.patch;patch=1"
-SRC_URI_append_simpad =         " file://disable-apm.patch;patch=1"
+SRC_URI_append_spitz =          " file://faster-rotated.patch;patch=1"
+SRC_URI_append_akita =          " file://faster-rotated.patch;patch=1"
+SRC_URI_append_borzoi =         " file://faster-rotated.patch;patch=1"
 
-PACKAGE_ARCH_simpad = "simpad" 
+PACKAGE_ARCH_mnci = "mnci"
 PACKAGE_ARCH_collie = "collie"
 PACKAGE_ARCH_poodle = "poodle"
-PACKAGE_ARCH_c7x0 = "c7x0"
-PACKAGE_ARCH_ipaq-pxa270 = "ipaq-pxa270"
 PACKAGE_ARCH_h3600 = "h3600"
-PACKAGE_ARCH_h3900 = "h3900"
-PACKAGE_ARCH_h2200 = "h2200"
 PACKAGE_ARCH_spitz = "spitz"
 PACKAGE_ARCH_akita = "akita"
 PACKAGE_ARCH_borzoi = "borzoi"