Show
Ignore:
Timestamp:
03/30/08 14:13:11 (9 months ago)
Author:
bryank
Message:

Merge changes made in these recipes in OE, but don't undo changes we made locally.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openembedded/zipitZ2BBfiles/xorg-xserver/xserver-kdrive_1.4.bb

    r60 r63  
    44 
    55PE = "1" 
    6 PR = "r3" 
     6PR = "r4" 
    77 
    88SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ 
    …… 
    1919        file://keyboard-resume-workaround.patch;patch=1 \ 
    2020        file://xorg-avr32-support.diff;patch=1 \ 
     21        file://pkgconfig_fix.patch;patch=1 \ 
    2122        file://xkb-ensure-assign-nTty.patch;patch=1 \ 
    2223        file://xkb-dont-map-keys.patch;patch=1 \ 

  • openembedded/zipitZ2BBfiles/xorg-xserver/xserver-kdrive-common.inc

    r56 r63  
    1010             xserver-kdrive-epson \ 
    1111             xserver-kdrive-ati \ 
    12              xserver-kdrive-glamo \ 
    1312             xserver-kdrive-chips \ 
    1413             xserver-kdrive-i810 \ 
    …… 
    3231DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version" 
    3332DESCRIPTION_xserver-kdrive-ati = "X server from freedesktop.org, supporting ATI devices" 
    34 DESCRIPTION_xserver-kdrive-glamo = "X server from freedesktop.org, supporting Smedia Glamo chipset" 
    3533DESCRIPTION_xserver-kdrive-chips = "X server from freedesktop.org, supporting Chips chipsets" 
    3634DESCRIPTION_xserver-kdrive-i810 = "X server from freedesktop.org, supporting Intel chipsets" 
    …… 
    5452FILES_xserver-kdrive-sdl = "${bindir}/Xsdl" 
    5553FILES_xserver-kdrive-ati = "${bindir}/Xati" 
    56 FILES_xserver-kdrive-glamo = "${bindir}/Xglamo" 
    5754FILES_xserver-kdrive-chips = "${bindir}/Xchips" 
    5855FILES_xserver-kdrive-i810 = "${bindir}/Xi810" 
    …… 
    7471RDEPENDS_xserver-kdrive-sdl = "${PN}" 
    7572RDEPENDS_xserver-kdrive-ati = "${PN}" 
    76 RDEPENDS_xserver-kdrive-glamo = "${PN}" 
    7773RDEPENDS_xserver-kdrive-chips = "${PN}" 
    7874RDEPENDS_xserver-kdrive-i810 = "${PN}"