gvfs-gdu-volume-monitor: avoid double packaging gvfs locale
authorAndreas Müller <schnitzeltony@googlemail.com>
Wed, 12 Dec 2012 11:35:46 +0000 (11:35 +0000)
committerPatrick Ohly <patrick.ohly@intel.com>
Fri, 9 Jan 2015 16:26:24 +0000 (08:26 -0800)
Fix error for do_rootfs:
| Collected errors:
|  * check_data_file_clashes: Package gvfs-gdu-volume-monitor-locale-fr wants to install file /home/Superandy/tmp/oe-core-eglibc/work/overo-angstrom-linux-gnueabi/xfce4-full-image/1.0-r0/rootfs/usr/share/locale/fr/LC_MESSAGES/gvfs.mo
|  But that file is already provided by package  * gvfs-locale-fr
|  * opkg_install_cmd: Cannot install package gvfs-gdu-volume-monitor-locale-fr.
|  * check_data_file_clashes: Package gvfs-locale-en-gb wants to install file /home/Superandy/tmp/oe-core-eglibc/work/overo-angstrom-linux-gnueabi/xfce4-full-image/1.0-r0/rootfs/usr/share/locale/en_GB/LC_MESSAGES/gvfs.mo
|  But that file is already provided by package  * gvfs-gdu-volume-monitor-locale-en-gb
|  * opkg_install_cmd: Cannot install package gvfs-locale-en-gb.
|  * check_data_file_clashes: Package gvfs-gdu-volume-monitor-locale-de wants to install file /home/Superandy/tmp/oe-core-eglibc/work/overo-angstrom-linux-gnueabi/xfce4-full-image/1.0-r0/rootfs/usr/share/locale/de/LC_MESSAGES/gvfs.mo
|  But that file is already provided by package  * gvfs-locale-de
|  * opkg_install_cmd: Cannot install package gvfs-gdu-volume-monitor-locale-de.

* MJ: added PR bump

(From meta-openembedded rev: ee97efeec28cca615eb29b1e8ba73d3ccf29a57e)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.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/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb

index fe5af46..1939f09 100644 (file)
@@ -4,7 +4,7 @@ BPN = "gvfs"
 
 DEPENDS = "gvfs gnome-disk-utility"
 
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
 
 # we need gdu files only: reduce files to delete in libexecdir
 EXTRA_OECONF += "--disable-gphoto2"
@@ -20,6 +20,7 @@ do_install_append() {
        rm -rf ${D}${datadir}/glib-2.0
        rm -rf ${D}${datadir}/GConf
        rm -f ${D}${datadir}/dbus-1/services/gvfs-*
+       rm -rf ${D}${datadir}/locale
        rm -f ${D}${libexecdir}/gvfsd*
        rm -f ${D}${libexecdir}/gvfs-fuse-daemon
        rm -f ${D}${libexecdir}/gvfs-gphoto2-volume-monitor