2 files changed, 16 insertions, 7 deletions

diff --git a/meta/packages/librsvg/librsvg_2.11.1.bb b/meta/packages/librsvg/librsvg_2.11.1.bb
index 7f6d91fda1..e9100bc643 100644
--- a/meta/packages/librsvg/librsvg_2.11.1.bb
+++ b/meta/packages/librsvg/librsvg_2.11.1.bb
@@ -2,17 +2,21 @@ DESCRIPTION = "Library for rendering SVG files"
 SECTION = "x11/utils"
 DEPENDS = "gtk+ libcroco libart-lgpl libxml2 popt"
 LICENSE = "LGPL"
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = "--disable-mozilla-plugin"
 
 inherit autotools pkgconfig gnome
 
-PACKAGES =+ "librsvg-gtk librsvg-gtk-dev rsvg"
+PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
 FILES_${PN} = "${libdir}/*.so.*"
 FILES_rsvg = "${bindir}/rsvg ${bindir}/rsvg-view ${datadir}/pixmaps/svg-viewer.svg"
 FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so"
-FILES_librsvg-gtk-dev = "${libdir}/gtk-2.0"
+FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.*a \
+                          ${libdir}/gtk-2.0/*/loaders/*.*a \
+                          ${libdir}/gtk-2.0/*/engines/*.*a"
+FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug \
+                          ${libdir}/gtk-2.0/*/*/.debug"
 
 EXTRA_OECONF = "--disable-mozilla-plugin"
 
diff --git a/meta/packages/librsvg/librsvg_2.16.1.bb b/meta/packages/librsvg/librsvg_2.16.1.bb
index 5c8d1e7ab5..57ee2de17d 100644
--- a/meta/packages/librsvg/librsvg_2.16.1.bb
+++ b/meta/packages/librsvg/librsvg_2.16.1.bb
@@ -1,20 +1,25 @@
 DESCRIPTION = "Library for rendering SVG files"
 SECTION = "x11/utils"
-DEPENDS = "gtk+ libcroco cairo libart-lgpl libxml2"
+DEPENDS = "gtk+ libcroco cairo libart-lgpl libxml2 popt"
 LICENSE = "LGPL"
+PR = "r1"
 
 EXTRA_OECONF = "--disable-mozilla-plugin"
 
 inherit autotools pkgconfig gnome
 
-PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg rsvg"
+PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
 FILES_${PN} = "${libdir}/*.so.*"
 FILES_rsvg = "${bindir}/rsvg \
               ${bindir}/rsvg-view \
               ${bindir}/rsvg-convert \
               ${datadir}/pixmaps/svg-viewer.svg"
-FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so"
-FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/*/*/.debug"
+FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so.*"
+FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.*a \
+                          ${libdir}/gtk-2.0/*/loaders/*.*a \
+                          ${libdir}/gtk-2.0/*/engines/*.*a"
+FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug \
+                          ${libdir}/gtk-2.0/*/*/.debug"
 
 EXTRA_OECONF = "--disable-mozilla-plugin"