2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
index b4a348c1aa..c71896a3ed 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
@@ -8,4 +8,4 @@ SRC_URI += "file://crosscompile.patch \
 SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
 SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
-PR = "r6"
+PR = "r7"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 6133344b38..98fe534d49 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -66,7 +66,7 @@ PACKAGES =+ "${PN}-security-policy \
 RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
 RDEPENDS_${PN}-xvfb += "xkeyboard-config"
-RREPLACES_${PN}-module-exa = "${PN}"
+RCONFLICTS_${PN}-module-exa = "${PN} (<${PV})"
 FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
 FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc index b4a348c1aa..c71896a3ed 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
@@ -8,4 +8,4 @@ SRC_URI += "file://crosscompile.patch \
8	SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"	8	SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
9	SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"	9	SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
10		10
11	PR = "r6"	11	PR = "r7"


diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc index 6133344b38..98fe534d49 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -66,7 +66,7 @@ PACKAGES =+ "${PN}-security-policy \
66		66
67	RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"	67	RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
68	RDEPENDS_${PN}-xvfb += "xkeyboard-config"	68	RDEPENDS_${PN}-xvfb += "xkeyboard-config"
69	RREPLACES_${PN}-module-exa = "${PN}"	69	RCONFLICTS_${PN}-module-exa = "${PN} (<${PV})"
70		70
71	FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/.so ${libdir}/xorg/modules/.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"	71	FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/.so ${libdir}/xorg/modules/.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
72	FILES_${PN}-dev += "${libdir}/xorg/modules/.la ${libdir}/xorg/modules//*.la"	72	FILES_${PN}-dev += "${libdir}/xorg/modules/.la ${libdir}/xorg/modules//*.la"