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

diff --git a/packages/openmoko-pim/openmoko-dates_svn.bb b/packages/openmoko-pim/openmoko-dates_svn.bb
index 346a8d0..cc5978f 100644 (file)
--- 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"

diff --git a/packages/pimlico/dates.inc b/packages/pimlico/dates.inc
index fd64084..641ff60 100644 (file)
--- 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 51d3acc..731ca31 100644 (file)
--- 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 474fdde..956eb3d 100644 (file)
--- 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}"