aboutsummaryrefslogtreecommitdiffstats
path: root/packages/openmoko-pim
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2007-03-29 12:53:15 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2007-03-29 12:53:15 +0000
commitc8b71beba89a1d40d4b195df28f5e753a03f876c (patch)
tree8c88671ce643fdc3af9d0f1eda883a6d075100a0 /packages/openmoko-pim
parentfa30c973cc72f69f469bfcffb210069ee443351b (diff)
downloadopenembedded-c8b71beba89a1d40d4b195df28f5e753a03f876c.tar.gz
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
Diffstat (limited to 'packages/openmoko-pim')
-rw-r--r--packages/openmoko-pim/openmoko-dates_svn.bb5
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/openmoko-pim/openmoko-dates_svn.bb b/packages/openmoko-pim/openmoko-dates_svn.bb
index 346a8d03e1..cc5978f546 100644
--- a/packages/openmoko-pim/openmoko-dates_svn.bb
+++ b/packages/openmoko-pim/openmoko-dates_svn.bb
@@ -3,8 +3,10 @@ SECTION = "openmoko/pim"
LICENSE = "GPL"
DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs"
RDEPENDS = "libedata-cal"
+RCONFLICTS = "dates"
+RREPLACES = "dates"
PV = "0.1+svn${SRCDATE}"
-PR = "r6"
+PR = "r7"
inherit gnome autotools pkgconfig gtk-icon-cache
@@ -23,3 +25,4 @@ do_install_append () {
FILES_${PN} += "${datadir}/pixmaps/dates.png \
${datadir}/dates/"
+PRIVATE_LIBS = "libgtkdatesview.so.0"