From 2e7cbdc4beada61a4b8a190312d29b221aa9f688 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 21 Mar 2007 11:09:17 +0000
Subject: dates: unify recipes, fix PV in svn version (from Poky)
---
packages/pimlico/dates.inc | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 packages/pimlico/dates.inc
(limited to 'packages/pimlico/dates.inc')
diff --git a/packages/pimlico/dates.inc b/packages/pimlico/dates.inc
new file mode 100644
index 0000000000..fd640844ba
--- /dev/null
+++ b/packages/pimlico/dates.inc
@@ -0,0 +1,17 @@
+DESCRIPTION = "Dates is a calendar application."
+LICENSE = "LGPL"
+SECTION = "x11"
+DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
+RDEPENDS = "libedata-cal"
+
+inherit autotools pkgconfig gtk-icon-cache
+
+# EXTRA_OECONF = "--disable-debug"
+
+FILES_${PN} += "${datadir}/pixmaps/dates.png"
+
+do_install_append () {
+ install -d ${D}/${datadir}/pixmaps
+ install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/
+}
+
--
cgit v1.2.3
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 +++
1 file changed, 3 insertions(+)
(limited to 'packages/pimlico/dates.inc')
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"
--
cgit v1.2.3
From 582c7a75d0b25062783b087ffcc6cd4a3cd86f4c Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 30 Mar 2007 13:27:13 +0000
Subject: (openmoko-)dates: fix Rconflicts/Rreplaces: they do not replace each
other but conflict and only PN
---
packages/pimlico/dates.inc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'packages/pimlico/dates.inc')
diff --git a/packages/pimlico/dates.inc b/packages/pimlico/dates.inc
index 641ff60aea..4f92b2c767 100644
--- a/packages/pimlico/dates.inc
+++ b/packages/pimlico/dates.inc
@@ -3,8 +3,7 @@ LICENSE = "LGPL"
SECTION = "x11"
DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
RDEPENDS = "libedata-cal"
-RCONFLICTS = "openmoko-dates"
-RREPLACES = "openmoko-dates"
+RCONFLICTS_${PN} = "openmoko-dates"
inherit autotools pkgconfig gtk-icon-cache
--
cgit v1.2.3