[oe-commits] org.oe.dev xserver-xorg: put .la files in -dev, .debug files in -dbg, dmx files in -dmx, Xnest in

[pb commit]

xserver-xorg: put .la files in -dev, .debug files in -dbg, dmx files in -dmx, Xnest in 
-xnest.

Author: pb at openembedded.org
Branch: org.openembedded.dev
Revision: 3e5b35d7a212e5aba8eb41203422ab26d9983fb8
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3e5b35d7a212e5aba8eb41203422ab26d9983fb8
Files:
1
packages/xorg-xserver/xorg-xserver-common.inc
packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb
packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb
Diffs:

#
# mt diff -r1d90f8b3fde028de88013d6ba739663a71281009 -r3e5b35d7a212e5aba8eb41203422ab26d9983fb8
#
# 
# 
# patch "packages/xorg-xserver/xorg-xserver-common.inc"
#  from [dc95cb3f39626556303b2b36a7d46aa74533734a]
#    to [b3aa1f089527f6d30c1cc9c6a9cf9370c9b639d4]
# 
# patch "packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb"
#  from [ca071cadf2bb6382fcf6a9066a2031ec511d493f]
#    to [7891629db84975157d9eb48d9bdb116f02f28c7c]
# 
# patch "packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb"
#  from [3e050d8a5fbfa8968933d584ae1646a71b19f222]
#    to [31da1190ef61e1c4771c10ea822cadb1ce13284e]
# 
============================================================
--- packages/xorg-xserver/xorg-xserver-common.inc	dc95cb3f39626556303b2b36a7d46aa74533734a
+++ packages/xorg-xserver/xorg-xserver-common.inc	b3aa1f089527f6d30c1cc9c6a9cf9370c9b639d4
@@ -27,13 +27,17 @@ EXTRA_OECONF = "--disable-builddocs"
 
 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
============================================================
--- packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb	ca071cadf2bb6382fcf6a9066a2031ec511d493f
+++ packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb	7891629db84975157d9eb48d9bdb116f02f28c7c
@@ -1,5 +1,7 @@ require xorg-xserver-common.inc
 require xorg-xserver-common.inc
 
+PR = "r1"
+
 #DESCRIPTION = ""
 
 #DEPENDS += " "
============================================================
--- packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb	3e050d8a5fbfa8968933d584ae1646a71b19f222
+++ packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb	31da1190ef61e1c4771c10ea822cadb1ce13284e
@@ -1,7 +1,9 @@ SRC_URI += "file://drmfix.patch;patch=1"
 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 = ""