[oe-commits] org.oe.dev dates/openmoko-dates: mark libgtkdatesview.so as PRIVATE, make them conflict

[hrw commit]

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

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: d480f9cabdae6665d72014f672ba86052a2fa1cf
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d480f9cabdae6665d72014f672ba86052a2fa1cf
Files:
1
packages/openmoko-pim/openmoko-dates_svn.bb
packages/pimlico/dates.inc
packages/pimlico/dates_0.3.1.bb
packages/pimlico/dates_svn.bb
Diffs:

#
# mt diff -r0d2e69a0248ac99b9f990dfb473d63c9653f0f7c -rd480f9cabdae6665d72014f672ba86052a2fa1cf
#
# 
# 
# patch "packages/openmoko-pim/openmoko-dates_svn.bb"
#  from [3c8266f76280e518251f226f0bb8eb00dd1fc071]
#    to [20a9e6532534f98641249d3415259acb51f782d4]
# 
# patch "packages/pimlico/dates.inc"
#  from [a64609f3f3056abc3ec4fb11dcea81c42a9757cb]
#    to [3c8175461e2a23c3fe274e3a505e5a6ee08ac90b]
# 
# patch "packages/pimlico/dates_0.3.1.bb"
#  from [0d82614c9974a690d03a027b66595d92a965b882]
#    to [80a887d5c62bb01c78a0805df7d5773d4b729cc5]
# 
# patch "packages/pimlico/dates_svn.bb"
#  from [e18884ca4c8f458513d4f2b4b896dcb49a4a267c]
#    to [bf8526b69a3d4b919e5b5b3be7b3aa24a4af9115]
# 
============================================================
--- packages/openmoko-pim/openmoko-dates_svn.bb	3c8266f76280e518251f226f0bb8eb00dd1fc071
+++ packages/openmoko-pim/openmoko-dates_svn.bb	20a9e6532534f98641249d3415259acb51f782d4
@@ -1,10 +1,12 @@ RDEPENDS = "libedata-cal"
 DESCRIPTION = "Dates is a calendar application."
 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 @@ FILES_${PN} += "${datadir}/pixmaps/dates
 FILES_${PN} += "${datadir}/pixmaps/dates.png \
                 ${datadir}/dates/"
 
+PRIVATE_LIBS = "libgtkdatesview.so.0"
============================================================
--- packages/pimlico/dates.inc	a64609f3f3056abc3ec4fb11dcea81c42a9757cb
+++ packages/pimlico/dates.inc	3c8175461e2a23c3fe274e3a505e5a6ee08ac90b
@@ -1,8 +1,10 @@ RDEPENDS = "libedata-cal"
 DESCRIPTION = "Dates is a calendar application."
 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"
============================================================
--- packages/pimlico/dates_0.3.1.bb	0d82614c9974a690d03a027b66595d92a965b882
+++ packages/pimlico/dates_0.3.1.bb	80a887d5c62bb01c78a0805df7d5773d4b729cc5
@@ -1,5 +1,5 @@ require dates.inc
 require dates.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz"
============================================================
--- packages/pimlico/dates_svn.bb	e18884ca4c8f458513d4f2b4b896dcb49a4a267c
+++ packages/pimlico/dates_svn.bb	bf8526b69a3d4b919e5b5b3be7b3aa24a4af9115
@@ -1,5 +1,7 @@ require dates.inc
 require dates.inc
 
+PR = "r1"
+
 DEFAULT_PREFERENCE = "-1"
 
 PV = "0.3.1+svn${SRCDATE}"