[oe-commits] org.oe.dev imlib2: fix -dbg and -dev packages

[justinp commit]

imlib2: fix -dbg and -dev packages

Author: justinp at openembedded.org
Branch: org.openembedded.dev
Revision: 41b64fefd1f7cd87d2cd809bd28c0ab62bd6b0b4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=41b64fefd1f7cd87d2cd809bd28c0ab62bd6b0b4
Files:
1
packages/efl/imlib2-fb_1.2.2.001.bb
packages/efl/imlib2-native_1.2.2.001.bb
packages/efl/imlib2-x11_1.2.2.001.bb
packages/efl/imlib2.inc
Diffs:

#
# mt diff -r28fe31c4c998f1ca6f7f78aa9a0bb7dd71684039 -r41b64fefd1f7cd87d2cd809bd28c0ab62bd6b0b4
#
# 
# 
# patch "packages/efl/imlib2-fb_1.2.2.001.bb"
#  from [34a28008defd5527f21dd721f7ba752de75d5e18]
#    to [7b1be6c3b9df2b8aeb0755c6988088cc0d7986ec]
# 
# patch "packages/efl/imlib2-native_1.2.2.001.bb"
#  from [c485be799c2fc34f6ef4b1147c1f2446306ea24c]
#    to [927e76af05d4495cb11650b4727918ef8a1b4c41]
# 
# patch "packages/efl/imlib2-x11_1.2.2.001.bb"
#  from [de5b590cc74693eb5a8c5e4e363eba7ebb9afaec]
#    to [47d4cbc1ed72e781f61912b55972565b956c4aec]
# 
# patch "packages/efl/imlib2.inc"
#  from [6dcaaaa1a9f15daf70621e5b508ebed3c9304992]
#    to [c241a4a3e020f9f9e97c7634dbb47dcf55ebfc8b]
# 
============================================================
--- packages/efl/imlib2-fb_1.2.2.001.bb	34a28008defd5527f21dd721f7ba752de75d5e18
+++ packages/efl/imlib2-fb_1.2.2.001.bb	7b1be6c3b9df2b8aeb0755c6988088cc0d7986ec
@@ -1,4 +1,5 @@ require imlib2.inc
 require imlib2.inc
+PR = "r1"
 
 EXTRA_OECONF = "--without-x \
 		--disable-mmx"
============================================================
--- packages/efl/imlib2-native_1.2.2.001.bb	c485be799c2fc34f6ef4b1147c1f2446306ea24c
+++ packages/efl/imlib2-native_1.2.2.001.bb	927e76af05d4495cb11650b4727918ef8a1b4c41
@@ -1,7 +1,8 @@ DEPENDS = "freetype-native libpng-native
 require imlib2.inc
 inherit native
 PROVIDES = "imlib2-native"
 DEPENDS = "freetype-native libpng-native jpeg-native"
+PR = "r1"
 
 EXTRA_OECONF = "--disable-mmx \
                 --without-x"
============================================================
--- packages/efl/imlib2-x11_1.2.2.001.bb	de5b590cc74693eb5a8c5e4e363eba7ebb9afaec
+++ packages/efl/imlib2-x11_1.2.2.001.bb	47d4cbc1ed72e781f61912b55972565b956c4aec
@@ -1,6 +1,6 @@ DEPENDS += "virtual/libx11 libxext"
 require imlib2.inc
 DEPENDS += "virtual/libx11 libxext"
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = "--disable-mmx \
                 --with-x \
============================================================
--- packages/efl/imlib2.inc	6dcaaaa1a9f15daf70621e5b508ebed3c9304992
+++ packages/efl/imlib2.inc	c241a4a3e020f9f9e97c7634dbb47dcf55ebfc8b
@@ -30,8 +30,9 @@ do_install() {
 }
 
 do_install() {
+        install -d "${D}${includedir}"
         oe_libinstall -C src/lib libImlib2 ${D}${libdir}/
-        install -m 0644 ${S}/src/lib/Imlib2.h ${D}${incdir}/
+        install -m 0644 ${S}/src/lib/Imlib2.h ${D}${includedir}/
 
         install -d ${D}${libdir}/imlib2/loaders
         for i in src/modules/loaders/.libs/*.so
@@ -47,8 +48,9 @@ PACKAGES =+ "imlib2-loaders imlib2-filte
 }
 
 PACKAGES =+ "imlib2-loaders imlib2-filters"
-FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2"
-FILES_${PN}-dev += "${bindir}/imlib2-config"
+FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so"
+FILES_${PN}-dbg = "${libdir}/imlib2/*/.debug ${libdir}/.debug/"
+FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}"
 FILES_imlib2-bin = "${bindir}"
 FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so"
 FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so"