merge of '6c7f9afdafc67f5e5a8263301ca0cfce430be173'

     and '8ee01e7aef977a6c51cf71b7d11f65f42e0dc413'

8 files changed, 21 insertions, 9 deletions

diff --git a/packages/efl/edje-native_0.5.0.037.bb b/packages/efl/edje-native_0.5.0.037.bb
index c66639d25e..1dc5c1de10 100644
--- a/packages/efl/edje-native_0.5.0.037.bb
+++ b/packages/efl/edje-native_0.5.0.037.bb
@@ -13,7 +13,7 @@ do_configure_prepend() {
 }
 
 do_stage_append() {
-	edje_data_dir=`${STAGING_BINDIR}/edje-config-native --datadir`
+	edje_data_dir=`edje-config --datadir`
 	# could also use ${STAGING_DATADIR}/edje/include
 	install -d $edje_data_dir/include
 	install -m 0644 data/include/edje.inc $edje_data_dir/include
diff --git a/packages/efl/evas-fb_0.9.9.037.bb b/packages/efl/evas-fb_0.9.9.037.bb
index 3e29b80cc0..4acc857982 100644
--- a/packages/efl/evas-fb_0.9.9.037.bb
+++ b/packages/efl/evas-fb_0.9.9.037.bb
@@ -1,5 +1,5 @@
 require evas.inc
-PR = "r5"
+PR = "r6"
 
 EXTRA_OECONF = "--enable-fb         \
 		--disable-directfb          \
diff --git a/packages/efl/evas-x11_0.9.9.037.bb b/packages/efl/evas-x11_0.9.9.037.bb
index 121922591e..765a8b73d4 100644
--- a/packages/efl/evas-x11_0.9.9.037.bb
+++ b/packages/efl/evas-x11_0.9.9.037.bb
@@ -1,6 +1,6 @@
 require evas.inc
 DEPENDS += "edb virtual/libx11 libxext freetype"
-PR = "r7"
+PR = "r8"
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11  \
 		--x-libraries=${STAGING_LIBDIR} \
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index f065d944f8..ceca03c0a8 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -28,6 +28,10 @@ do_configure_prepend() {
 	fi
 }
 
+#do_install_append() {
+#    find "${S}" -name .debug -type d | xargs -iBLAH rm -rf "BLAH"
+#}
+
 do_stage_append() {
 	cd src
 	modules=`find modules -name ".libs"`
@@ -40,4 +44,6 @@ do_stage_append() {
 
 headers = "<override me>"
 libraries = "libevas"
-FILES_${PN} += "/usr/lib/evas/"
+FILES_${PN} += "/usr/lib/evas/modules/*/*/*/*.so"
+FILES_${PN}-dev += "/usr/lib/evas/modules/*/*/*/*.a /usr/lib/evas/modules/*/*/*/*.la"
+FILES_${PN}-dbg += "/usr/lib/evas/modules/*/*/*/.debug/"
\ No newline at end of file
diff --git a/packages/efl/imlib2-fb_1.2.2.001.bb b/packages/efl/imlib2-fb_1.2.2.001.bb
index 776acb43f6..f2ee48f5d9 100644
--- a/packages/efl/imlib2-fb_1.2.2.001.bb
+++ b/packages/efl/imlib2-fb_1.2.2.001.bb
@@ -1,4 +1,5 @@
 require imlib2.inc
+PR = "r2"
 
 EXTRA_OECONF = "--without-x \
 		--disable-mmx"
diff --git a/packages/efl/imlib2-native_1.2.2.001.bb b/packages/efl/imlib2-native_1.2.2.001.bb
index da75e8f439..65c5b672b2 100644
--- a/packages/efl/imlib2-native_1.2.2.001.bb
+++ b/packages/efl/imlib2-native_1.2.2.001.bb
@@ -2,6 +2,7 @@ require imlib2.inc
 inherit native
 PROVIDES = "imlib2-native"
 DEPENDS = "freetype-native libpng-native jpeg-native"
+PR = "r2"
 
 EXTRA_OECONF = "--disable-mmx \
                 --without-x"
diff --git a/packages/efl/imlib2-x11_1.2.2.001.bb b/packages/efl/imlib2-x11_1.2.2.001.bb
index e7814971c3..67ed947e08 100644
--- a/packages/efl/imlib2-x11_1.2.2.001.bb
+++ b/packages/efl/imlib2-x11_1.2.2.001.bb
@@ -1,6 +1,6 @@
 require imlib2.inc
 DEPENDS += "virtual/libx11 libxext"
-PR = "r1"
+PR = "r3"
 
 EXTRA_OECONF = "--disable-mmx \
                 --with-x \
diff --git a/packages/efl/imlib2.inc b/packages/efl/imlib2.inc
index 4691bf2ce0..6a040c5386 100644
--- a/packages/efl/imlib2.inc
+++ b/packages/efl/imlib2.inc
@@ -30,8 +30,9 @@ do_stage_append() {
 }
 
 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
@@ -46,9 +47,12 @@ do_install() {
         done
 }
 
-PACKAGES =+ "imlib2-loaders imlib2-filters"
-FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2"
-FILES_${PN}-dev += "${bindir}/imlib2-config"
+PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters"
+FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so"
+FILES_${PN}-dbg = "${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"
+FILES_imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug"
+FILES_imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug"