3 files changed, 11 insertions, 3 deletions
diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc
index 82f132d567..0a91cfed12 100644
--- a/packages/xorg-xserver/xorg-xserver-common.inc
+++ b/packages/xorg-xserver/xorg-xserver-common.inc
@@ -27,13 +27,17 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-builddocs"
 
-PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils"
+PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xnest ${PN}-dmx"
 
-FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print"
+FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print ${bindir}/Xprt"
 FILES_${PN}-xvfb = "${bindir}/Xvfb"
+FILES_${PN}-xnest = "${bindir}/Xnest"
+FILES_${PN}-dmx = "${bindir}/Xdmx ${bindir}/dmx* ${bindir}/xdmxconfig ${bindir}/xdmx ${bindir}/vdltodmx"
 FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
-FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/modules ${libdir}/xorg/modules /etc/X11 "
+FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/xorg/modules/*.so ${libdir}/xorg/modules/*/*.so /etc/X11"
 FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled"
+FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug ${libdir}/xorg/modules/*/.debug"
+FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"
 
 do_stage() {
 	autotools_stage_all
diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb b/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb
index 2a7ba03431..06270e4316 100644
--- a/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb
+++ b/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb
@@ -1,5 +1,7 @@
 require xorg-xserver-common.inc
 
+PR = "r1"
+
 #DESCRIPTION = ""
 
 #DEPENDS += " "
diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
index 3db5c640c7..acf1f2abb0 100644
--- a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
+++ b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
@@ -2,6 +2,8 @@ require xorg-xserver-common.inc
 
 SRC_URI += "file://drmfix.patch;patch=1"
 
+PR = "r1"
+
 EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no "
 
 #DESCRIPTION = ""