[oe-commits] org.oe.dev dates: unify recipes, fix PV in svn version (from Poky)

[hrw commit]

dates: unify recipes, fix PV in svn version (from Poky)

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

#
# mt diff -rf0a5ff5ad5ad38dda668893d6345ffcb7c559cc7 -r8b675ccc53dfab5cb741e302ba279dca3cd6cf5c
#
# 
# 
# add_file "packages/pimlico/dates.inc"
#  content [a64609f3f3056abc3ec4fb11dcea81c42a9757cb]
# 
# patch "packages/pimlico/dates_0.3.1.bb"
#  from [e15f25db929a0de65c10e4800a9d1d5bc9885251]
#    to [0d82614c9974a690d03a027b66595d92a965b882]
# 
# patch "packages/pimlico/dates_svn.bb"
#  from [b21e6a4fa06d37cff2da111686e26f8970b8ddf0]
#    to [e18884ca4c8f458513d4f2b4b896dcb49a4a267c]
# 
============================================================
--- packages/pimlico/dates.inc	a64609f3f3056abc3ec4fb11dcea81c42a9757cb
+++ packages/pimlico/dates.inc	a64609f3f3056abc3ec4fb11dcea81c42a9757cb
@@ -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/
+}
+
============================================================
--- packages/pimlico/dates_0.3.1.bb	e15f25db929a0de65c10e4800a9d1d5bc9885251
+++ packages/pimlico/dates_0.3.1.bb	0d82614c9974a690d03a027b66595d92a965b882
@@ -1,13 +1,5 @@
-DESCRIPTION = "Dates is a calendar application."
-SECTION = "x11"
-LICENSE = "LGPL"
-PR = "r1"
+require dates.inc
 
-DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
+PR = "r1"
 
+SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz"
-SRC_URI = "http://projects.o-hand.com/sources/dates/${P}.tar.gz"
-
-inherit autotools pkgconfig gtk-icon-cache
-
-FILES_${PN} += "${datadir}/pixmaps/dates.png"
-
============================================================
--- packages/pimlico/dates_svn.bb	b21e6a4fa06d37cff2da111686e26f8970b8ddf0
+++ packages/pimlico/dates_svn.bb	e18884ca4c8f458513d4f2b4b896dcb49a4a267c
@@ -1,18 +1,8 @@
-LICENSE = "LGPL"
-SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
-DESCRIPTION = "Dates is a calendar application."
+require dates.inc
 
-PV = "0.1+svn${SRCDATE}"
+DEFAULT_PREFERENCE = "-1"
+
+PV = "0.3.1+svn${SRCDATE}"
 S = "${WORKDIR}/trunk"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http"
-
-inherit autotools pkgconfig gtk-icon-cache
-
-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/
-}