From: Koen Kooi <koen@openembedded.org>
Date: Thu, 20 Nov 2008 14:01:09 +0000 (+0100)
Subject: nautilus: update to use mime.bbclass
X-Git-Tag: Release-2010-05/1~5154
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b387be20fe7993e39b393e1d8785747a38a14b24;p=openembedded.git

nautilus: update to use mime.bbclass
---

diff --git a/packages/nautilus/nautilus_2.24.1.bb b/packages/nautilus/nautilus_2.24.1.bb
index 4742641437..50653dc85c 100644
--- a/packages/nautilus/nautilus_2.24.1.bb
+++ b/packages/nautilus/nautilus_2.24.1.bb
@@ -2,7 +2,7 @@
 # Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 
-PR = "r1"
+PR = "r2"
 
 inherit gnome
 LICENSE="GPL"
@@ -12,15 +12,12 @@ RRECOMMENDS = "shared-mime-info"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
-PACKAGES += "nautilus-mime-data libnautilus"
+PACKAGES += " libnautilus"
 
 FILES_${PN} += "${datadir}/icons  /usr/libexec/ "
 FILES_libnautilus = "/usr/lib/*.so*"
 FILES_${PN}-dbg += "/usr/libexec/.debug"
 
-# This conflicts with shared-mime-info
-FILES_nautilus-mime-data += "${datadir}/mime"
-
 do_stage() {
 	autotools_stage_all
 }