From c8b71beba89a1d40d4b195df28f5e753a03f876c Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 29 Mar 2007 12:53:15 +0000
Subject: dates/openmoko-dates: mark libgtkdatesview.so as PRIVATE, make them
 conflict - both packages provide libgtkdatesview.so.0 which is not used
 outside of dates - both packages provide binaries of same names

---
 packages/pimlico/dates.inc      | 3 +++
 packages/pimlico/dates_0.3.1.bb | 2 +-
 packages/pimlico/dates_svn.bb   | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'packages/pimlico')

diff --git a/packages/pimlico/dates.inc b/packages/pimlico/dates.inc
index fd640844ba..641ff60aea 100644
--- a/packages/pimlico/dates.inc
+++ b/packages/pimlico/dates.inc
@@ -3,6 +3,8 @@ LICENSE = "LGPL"
 SECTION = "x11"
 DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
 RDEPENDS = "libedata-cal"
+RCONFLICTS = "openmoko-dates"
+RREPLACES = "openmoko-dates"
 
 inherit autotools pkgconfig gtk-icon-cache
 
@@ -15,3 +17,4 @@ do_install_append () {
 	install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/
 }
 
+PRIVATE_LIBS = "libgtkdatesview.so.0"
diff --git a/packages/pimlico/dates_0.3.1.bb b/packages/pimlico/dates_0.3.1.bb
index 51d3acc9ed..731ca31289 100644
--- a/packages/pimlico/dates_0.3.1.bb
+++ b/packages/pimlico/dates_0.3.1.bb
@@ -1,5 +1,5 @@
 require dates.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz"
diff --git a/packages/pimlico/dates_svn.bb b/packages/pimlico/dates_svn.bb
index 474fdde27a..956eb3dc64 100644
--- a/packages/pimlico/dates_svn.bb
+++ b/packages/pimlico/dates_svn.bb
@@ -1,5 +1,7 @@
 require dates.inc
 
+PR = "r1"
+
 DEFAULT_PREFERENCE = "-1"
 
 PV = "0.3.1+svn${SRCDATE}"
-- 
cgit v1.2.3