Upgrade libglade to 2.6.2

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2347 311d38ba-8fff-0310-9ca6-ca027cbcb966

4 files changed, 2 insertions, 12 deletions

diff --git a/meta/packages/libglade/libglade-2.5.1/glade-cruft.patch b/meta/packages/libglade/libglade-2.6.2/glade-cruft.patch
index 0fceccf0c4..0fceccf0c4 100644
--- a/meta/packages/libglade/libglade-2.5.1/glade-cruft.patch
+++ b/meta/packages/libglade/libglade-2.6.2/glade-cruft.patch
diff --git a/meta/packages/libglade/libglade-2.5.1/no-deprecation.patch b/meta/packages/libglade/libglade-2.6.2/no-deprecation.patch
index 514c761b01..514c761b01 100644
--- a/meta/packages/libglade/libglade-2.5.1/no-deprecation.patch
+++ b/meta/packages/libglade/libglade-2.6.2/no-deprecation.patch
diff --git a/meta/packages/libglade/libglade-2.5.1/no-xml2.patch b/meta/packages/libglade/libglade-2.6.2/no-xml2.patch
index 1c2e215b8d..1c2e215b8d 100644
--- a/meta/packages/libglade/libglade-2.5.1/no-xml2.patch
+++ b/meta/packages/libglade/libglade-2.6.2/no-xml2.patch
diff --git a/meta/packages/libglade/libglade_2.5.1.bb b/meta/packages/libglade/libglade_2.6.2.bb
index 3aa16c4ef7..90b7ce5447 100644
--- a/meta/packages/libglade/libglade_2.5.1.bb
+++ b/meta/packages/libglade/libglade_2.6.2.bb
@@ -6,10 +6,7 @@ DEPENDS = "gtk+ gtk-doc"
 
 inherit autotools pkgconfig gnome
 
-PR = "r2"
-
-SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1 \
-            file://no-deprecation.patch;patch=1"
+SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1"
 
 EXTRA_OECONF += "--without-libxml2"
 
@@ -21,13 +18,6 @@ FILES_${PN}-data = "${datadir}/xml/libglade/glade-2.0.dtd"
 FILES_${PN}-dev += "${bindir}/libglade-convert"
 #RDEPENDS_${PN} = "${PN}-data"
 
-headers = "glade-build.h glade-init.h glade-parser.h glade-xml.h glade.h"
-
 do_stage () {
-        oe_libinstall -a -so -C glade libglade-2.0 ${STAGING_LIBDIR}
-
-        mkdir -p ${STAGING_INCDIR}/libglade-2.0/glade
-        for i in ${headers}; do
-                install -m 0644 ${S}/glade/$i ${STAGING_INCDIR}/libglade-2.0/glade/$i
-        done
+        autotools_stage_all
 }