diff options
author | Michael Lauer <mickey@vanille-media.de> | 2008-05-03 22:44:02 +0000 |
---|---|---|
committer | Michael Lauer <mickey@vanille-media.de> | 2008-05-03 22:44:02 +0000 |
commit | 6a9276de8f5d2f6f1f4826659b4fbb00cd4b694f (patch) | |
tree | 0439e152089ee7167a75f1038a18bdb7b6fe3359 /packages/xserver-common | |
parent | 02c3dce797180ae9392503ff75f984f9d5599016 (diff) | |
parent | 873d048d895290f6784e2d6a42721361834f6ad8 (diff) |
merge of '2ee8158109b81fad266d6373b64175e13ea659e4'
and 'f2a34edab33cdaedb8303991dc23cc54c1c370ff'
Diffstat (limited to 'packages/xserver-common')
-rw-r--r-- | packages/xserver-common/files/kdrive-1.4-fixes.patch | 2 | ||||
-rw-r--r-- | packages/xserver-common/xserver-common_1.22.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/xserver-common/files/kdrive-1.4-fixes.patch b/packages/xserver-common/files/kdrive-1.4-fixes.patch index 07b82c3a98..dea824e19f 100644 --- a/packages/xserver-common/files/kdrive-1.4-fixes.patch +++ b/packages/xserver-common/files/kdrive-1.4-fixes.patch @@ -13,7 +13,7 @@ + ARGS="$ARGS -mouse tslib" +else + if [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ] ; then -+ ARGS="$ARGS -mouse /dev/input/mice" ++ ARGS="$ARGS -mouse mouse" + fi fi diff --git a/packages/xserver-common/xserver-common_1.22.bb b/packages/xserver-common/xserver-common_1.22.bb index cbc199b81c..018ca71adb 100644 --- a/packages/xserver-common/xserver-common_1.22.bb +++ b/packages/xserver-common/xserver-common_1.22.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" -PR = "r2" +PR = "r3" PACKAGE_ARCH = "all" |