pango: Fix -dbg and -dev packaging, set LEAD_SONAME (from poky)

6 files changed, 30 insertions, 15 deletions

diff --git a/packages/pango/pango-1.2.5/.mtn2git_empty b/packages/pango/pango-1.2.5/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/pango/pango-1.2.5/.mtn2git_empty
+++ /dev/null
diff --git a/packages/pango/pango_1.10.2.bb b/packages/pango/pango_1.10.2.bb
index 7faf2d9d7e..d9273e0b78 100644
--- a/packages/pango/pango_1.10.2.bb
+++ b/packages/pango/pango_1.10.2.bb
@@ -4,7 +4,7 @@ DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc cairo
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
-PR = "r1"
+PR = "r2"
 
 RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
 
@@ -20,10 +20,13 @@ EXTRA_OECONF = "--disable-glibtest \
 		--enable-explicit-deps=no \
 	        --disable-debug"
 
-FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*"
-
+LEAD_SONAME = "libpango-1.0*"
 LIBV = "1.4.0"
 
+FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*"
+FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
+FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
+
 do_stage () {
 autotools_stage_all
 }
diff --git a/packages/pango/pango_1.12.0.bb b/packages/pango/pango_1.12.0.bb
index f1ddb9a6af..6e07832f34 100644
--- a/packages/pango/pango_1.12.0.bb
+++ b/packages/pango/pango_1.12.0.bb
@@ -4,7 +4,7 @@ DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc cairo
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
-PR = "r1"
+PR = "r2"
 
 RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
 
@@ -22,10 +22,13 @@ EXTRA_OECONF = "--disable-glibtest \
 		--enable-explicit-deps=no \
 	        --disable-debug"
 
-FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*"
-
+LEAD_SONAME = "libpango-1.0*"
 LIBV = "1.5.0"
 
+FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*"
+FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
+FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
+
 do_stage () {
 	for lib in pango pangox pangoft2 pangoxft pangocairo; do
 		oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/
diff --git a/packages/pango/pango_1.13.3.bb b/packages/pango/pango_1.13.3.bb
index 8f4b56ced8..ba0e606c42 100644
--- a/packages/pango/pango_1.13.3.bb
+++ b/packages/pango/pango_1.13.3.bb
@@ -4,7 +4,7 @@ DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc cairo
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
-PR = "r1"
+PR = "r2"
 
 RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
 
@@ -21,10 +21,13 @@ EXTRA_OECONF = "--disable-glibtest \
 		--enable-explicit-deps=no \
 	        --disable-debug"
 
-FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*"
-
+LEAD_SONAME = "libpango-1.0*"
 LIBV = "1.5.0"
 
+FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*"
+FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
+FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
+
 do_stage () {
 	for lib in pango pangox pangoft2 pangoxft pangocairo; do
 		oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/
diff --git a/packages/pango/pango_1.14.0.bb b/packages/pango/pango_1.14.0.bb
index 80e86aeede..b98e241af5 100644
--- a/packages/pango/pango_1.14.0.bb
+++ b/packages/pango/pango_1.14.0.bb
@@ -4,7 +4,7 @@ DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc cairo
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
-PR = "r1"
+PR = "r2"
 
 PACKAGES_DYNAMIC = "pango-module-*"
 
@@ -22,10 +22,13 @@ EXTRA_OECONF = "--disable-glibtest \
 		--enable-explicit-deps=no \
 	        --disable-debug"
 
-FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*"
-
+LEAD_SONAME = "libpango-1.0*"
 LIBV = "1.5.0"
 
+FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*"
+FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
+FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
+
 do_stage () {
 	autotools_stage_all
 }
diff --git a/packages/pango/pango_1.9.1.bb b/packages/pango/pango_1.9.1.bb
index f1ae669135..c0b5b04b98 100644
--- a/packages/pango/pango_1.9.1.bb
+++ b/packages/pango/pango_1.9.1.bb
@@ -5,7 +5,7 @@ RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
-PR = "r0"
+PR = "r1"
 
 # seems to go wrong with default cflags
 FULL_OPTIMIZATION_arm = "-O2"
@@ -19,10 +19,13 @@ EXTRA_OECONF = "--disable-glibtest \
 		--enable-explicit-deps=no \
 	        --disable-debug"
 
-FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*"
-
+LEAD_SONAME = "libpango-1.0*"
 LIBV = "1.4.0"
 
+FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*"
+FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
+FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
+
 do_stage () {
 	for lib in pango pangox pangoft2 pangoxft; do
 		oe_libinstall -so -C pango lib$lib-1.0 ${STAGING_LIBDIR}/