diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-03-29 12:53:15 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-03-29 12:53:15 +0000 |
| commit | c8b71beba89a1d40d4b195df28f5e753a03f876c (patch) | |
| tree | 8c88671ce643fdc3af9d0f1eda883a6d075100a0 | |
| parent | fa30c973cc72f69f469bfcffb210069ee443351b (diff) | |
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
| -rw-r--r-- | packages/openmoko-pim/openmoko-dates_svn.bb | 5 | ||||
| -rw-r--r-- | packages/pimlico/dates.inc | 3 | ||||
| -rw-r--r-- | packages/pimlico/dates_0.3.1.bb | 2 | ||||
| -rw-r--r-- | packages/pimlico/dates_svn.bb | 2 |
4 files changed, 10 insertions, 2 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" 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}" |