From 455ff3242627f6e3178e44b5d43468a9ae81584c Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Tue, 15 Dec 2015 16:32:43 +0000
Subject: meta: more removals of redunant FILES_${PN}-dbg

In some recipes overly-split -dbg packages were merged into PN-dbg.  Unless
there's a very good reason, recipes should have a single -dev and -dbg package.

(From OE-Core rev: a3b000643898d7402b9e57c02e8d10e677cc9722)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-graphics/harfbuzz/harfbuzz_1.1.2.bb         | 3 +--
 meta/recipes-graphics/piglit/piglit_git.bb               | 2 --
 meta/recipes-graphics/tslib/tslib_1.1.bb                 | 1 -
 meta/recipes-graphics/wayland/libinput_0.21.0.bb         | 1 -
 meta/recipes-graphics/xorg-driver/xorg-driver-common.inc | 1 -
 meta/recipes-graphics/xorg-driver/xorg-driver-input.inc  | 1 -
 6 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'meta/recipes-graphics')

diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_1.1.2.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_1.1.2.bb
index f34a647ecf..db1e578128 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_1.1.2.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_1.1.2.bb
@@ -25,10 +25,9 @@ EXTRA_OECONF = "--with-glib --with-freetype --with-cairo --without-graphite2"
 PACKAGECONFIG ??= "icu"
 PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu"
 
-PACKAGES =+ "${PN}-icu ${PN}-icu-dbg ${PN}-icu-dev"
+PACKAGES =+ "${PN}-icu ${PN}-icu-dev"
 
 FILES_${PN}-icu = "${libdir}/libharfbuzz-icu.so.*"
-FILES_${PN}-icu-dbg = "${libdir}/.debug/libharfbuzz-icu.so*"
 FILES_${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \
                        ${libdir}/libharfbuzz-icu.so \
                        ${libdir}/pkgconfig/harfbuzz-icu.pc \
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 0d825c9818..e0bd1fe433 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -28,8 +28,6 @@ do_configure_prepend() {
    fi
 }
 
-FILES_${PN}-dbg += "${libdir}/piglit/*/.debug/"
-
 RDEPENDS_${PN} = "waffle python python-mako python-json python-subprocess \
 	python-argparse python-importlib python-unixadmin \
 	python-multiprocessing python-textutils python-netserver python-shell \
diff --git a/meta/recipes-graphics/tslib/tslib_1.1.bb b/meta/recipes-graphics/tslib/tslib_1.1.bb
index 8e304a6efd..b0264c3b38 100644
--- a/meta/recipes-graphics/tslib/tslib_1.1.bb
+++ b/meta/recipes-graphics/tslib/tslib_1.1.bb
@@ -46,7 +46,6 @@ DEBIAN_NOAUTONAME_tslib-calibrate = "1"
 RDEPENDS_${PN} = "tslib-conf"
 RRECOMMENDS_${PN} = "pointercal"
 
-FILES_${PN}-dbg += "${libdir}/ts/.debug*"
 FILES_${PN}-dev += "${libdir}/ts/*.la"
 FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib"
 FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*"
diff --git a/meta/recipes-graphics/wayland/libinput_0.21.0.bb b/meta/recipes-graphics/wayland/libinput_0.21.0.bb
index ac5a249825..f6c5975bcb 100644
--- a/meta/recipes-graphics/wayland/libinput_0.21.0.bb
+++ b/meta/recipes-graphics/wayland/libinput_0.21.0.bb
@@ -21,4 +21,3 @@ PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind"
 PACKAGECONFIG[gui] = "--enable-event-gui,--disable-event-gui,cairo gtk+3"
 
 FILES_${PN} += "${libdir}/udev/"
-FILES_${PN}-dbg += "${libdir}/udev/.debug"
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
index 7ddd1c7da5..57a4c827dd 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
@@ -12,7 +12,6 @@ DEPENDS = "virtual/xserver xproto randrproto util-macros"
 SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2"
 
 FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so"
-FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug"
 
 inherit autotools pkgconfig distro_features_check
 # depends on virtual/xserver
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
index 21b60c47b2..c4dba1b19c 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
@@ -10,4 +10,3 @@ PACKAGEFUNCS =+ "add_xorg_abi_depends"
 FILES_${PN} += " ${libdir}/xorg/modules/input/*.so \
                  ${datadir}/X11/xorg.conf.d \
                  "
-FILES_${PN}-dbg += " ${libdir}/xorg/modules/input/.debug"
-- 
cgit v1.2.3-54-g00ecf