dates: unify recipes, fix PV in svn version

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1377 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 7 insertions, 24 deletions

diff --git a/meta/packages/pimlico/dates.inc b/meta/packages/pimlico/dates.inc
index 014f5524e1..fd640844ba 100644
--- a/meta/packages/pimlico/dates.inc
+++ b/meta/packages/pimlico/dates.inc
@@ -1,9 +1,8 @@
+DESCRIPTION = "Dates is a calendar application."
 LICENSE = "LGPL"
 SECTION = "x11"
 DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
-DESCRIPTION = "Dates is a calendar application."
-
-SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz"
+RDEPENDS = "libedata-cal"
 
 inherit autotools pkgconfig gtk-icon-cache
 
diff --git a/meta/packages/pimlico/dates_0.3.1.bb b/meta/packages/pimlico/dates_0.3.1.bb
index 09bd20da68..51d3acc9ed 100644
--- a/meta/packages/pimlico/dates_0.3.1.bb
+++ b/meta/packages/pimlico/dates_0.3.1.bb
@@ -1,8 +1,5 @@
-LICENSE = "LGPL"
-SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ intltool eds-dbus"
-RDEPENDS = "libedata-cal"
+require dates.inc
 
-DESCRIPTION = "Dates is a calendar application."
+PR = "r1"
 
-include dates.inc
+SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz"
diff --git a/meta/packages/pimlico/dates_svn.bb b/meta/packages/pimlico/dates_svn.bb
index ed66774ff0..474fdde27a 100644
--- a/meta/packages/pimlico/dates_svn.bb
+++ b/meta/packages/pimlico/dates_svn.bb
@@ -1,21 +1,8 @@
-LICENSE = "LGPL"
-SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ intltool eds-dbus"
-RDEPENDS = "libedata-cal"
-DESCRIPTION = "Dates is a calendar application."
+require dates.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PV = "0.0+svn${SRCDATE}"
+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/
-}