From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Wed, 16 Sep 2015 13:59:18 +0000 (+0300)
Subject: adwaita-icon-theme: RREPLACE gnome-icon-theme
X-Git-Tag: 2015-10~400
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f2805453ea34694b684f9ab567cfeee147ee1e35;p=openembedded-core.git

adwaita-icon-theme: RREPLACE gnome-icon-theme

RREPLACE, RCONFLICT and RPROVIDE gnome-icon-theme to make on-device
upgrades work.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb
index 526e699e99..0d7fa0cd64 100644
--- a/meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb
+++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_3.16.2.1.bb
@@ -27,6 +27,10 @@ do_install_append() {
 
 PACKAGES = "${PN}-cursors ${PN}-symbolic ${PN}-hires ${PN}"
 
+RREPLACES_${PN} = "gnome-icon-theme"
+RCONFLICTS_${PN} = "gnome-icon-theme"
+RPROVIDES_${PN} = "gnome-icon-theme"
+
 FILES_${PN}-cursors = "${prefix}/share/icons/Adwaita/cursors/"
 FILES_${PN}-symbolic = "${prefix}/share/icons/Adwaita/*/*/*.symbolic.png"
 FILES_${PN}-hires = "${prefix}/share/icons/Adwaita/256x256/"