xserver-xorg: add CONFFILES for xorg.conf

diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc
index 0189a5d..bd191ea 100644 (file)
--- a/packages/xorg-xserver/xorg-xserver-common.inc
+++ b/packages/xorg-xserver/xorg-xserver-common.inc
@@ -36,12 +36,14 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
                    ${libdir}/xorg/modules/*/*/.debug \
                    "
 
+CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf"
+
 do_stage() {
        autotools_stage_all
 }
 
 do_install_append () {
-       install -d ${D}/etc/X11
-       install -m 0644 ${WORKDIR}/xorg.conf ${D}/etc/X11/
+       install -d ${D}/${sysconfdir}/X11
+       install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
        ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts
 }

diff --git a/packages/xorg-xserver/xserver-xorg_1.4.bb b/packages/xorg-xserver/xserver-xorg_1.4.bb
index 0b0f847..0a61cb2 100644 (file)
--- a/packages/xorg-xserver/xserver-xorg_1.4.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.4.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 PE = "1"
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \