gnome-control-center: Unbreak gnome images
authorKhem Raj <raj.khem@gmail.com>
Wed, 23 Apr 2014 21:35:40 +0000 (14:35 -0700)
committerPatrick Ohly <patrick.ohly@intel.com>
Fri, 9 Jan 2015 16:37:30 +0000 (08:37 -0800)
commitbbf8c2432237146f0fb25c0b61c1b5f4caf1f742
treeb0499b5617f3f48b91b6fcee096535a4017d5d2a
parent8ba65c6ffb635a48245f515b74c837dc51ff5c94
gnome-control-center: Unbreak gnome images

images that now include both shared-mime-info and gnome-control-center We get

Collected errors:
 * check_data_file_clashes: Package gnome-control-center wants to
 * install file
 * /home/kraj/work/angstrom-repo/build/tmp-angstrom_next-eglibc/work/beaglebone-angstrom-linux-gnueabi/systemd-gnome-image/1.0-r0/rootfs/usr/share/mime/generic-icons
        But that file is already provided by package  * shared-mime-info

This brings it back to wheree it was additionally removes the packaging
warnings

(From meta-openembedded rev: 09e3cab4dae188bb5b22b0014cdcbc4e6f0424f9)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb