libxml2: stop overriding PACKAGES

diff --git a/recipes/libxml/libxml2.inc b/recipes/libxml/libxml2.inc
index f7ecaff97752047760347f2bcc1b24d56f0250c0..bc31123e7cd10db6a7a420b565fe27d159ad9a90 100644 (file)
--- a/recipes/libxml/libxml2.inc
+++ b/recipes/libxml/libxml2.inc
@@ -5,6 +5,8 @@ LICENSE = "MIT"
 
 SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz"
 
+PR = "r1"
+
 inherit autotools pkgconfig binconfig
 
 EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"
@@ -23,7 +25,14 @@ do_stage() {
 
 DEBIANNAME_${PN} = "libxml2"
 
-PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+PACKAGES =+ "${PN}-utils"
+FILES_${PN} = "${libexecdir}/* ${libdir}/lib*${SOLIBS} \
+            ${sysconfdir} ${sharedstatedir} ${localstatedir} \
+            ${base_libdir}/*${SOLIBS} \
+            ${datadir}/${PN} ${libdir}/${PN}/* \
+            ${datadir}/pixmaps ${datadir}/applications \
+            ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
+            ${libdir}/bonobo/servers"
 
 FILES_${PN}-dev += "${bindir}/*-config"
-FILES_${PN}-utils += "${bindir}/* ${libdir}/*.sh"
+FILES_${PN}-utils = "${bindir}/xmllint ${bindir}/xmlcatalog ${libdir}/*.sh"

diff --git a/recipes/libxml/libxml2_2.7.3.bb b/recipes/libxml/libxml2_2.7.3.bb
index 555a436a633bdc536b16a631dc9313b6586764e0..fa80f36f2f2fcfedcf4ca60991b1ea1284c5caf1 100644 (file)
--- a/recipes/libxml/libxml2_2.7.3.bb
+++ b/recipes/libxml/libxml2_2.7.3.bb
@@ -1,4 +1,2 @@
 require libxml2.inc
 
-PR = "r0"
-