From: Koen Kooi <koen@openembedded.org>
Date: Thu, 15 Feb 2007 20:14:19 +0000 (+0000)
Subject: openmoko-dates: merge in changes from openmoko.svn and fix packaging
X-Git-Tag: Release-2010-05/1~9230^2~27
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=330fe728fbcc78cc404239b2f799fafb33fc64f2;p=openembedded.git

openmoko-dates: merge in changes from openmoko.svn and fix packaging
---

diff --git a/packages/openmoko-pim/openmoko-dates/intltool-update.in b/packages/openmoko-pim/openmoko-dates/intltool-update.in
index 0342a2740c..661d8fe6ac 100644
--- a/packages/openmoko-pim/openmoko-dates/intltool-update.in
+++ b/packages/openmoko-pim/openmoko-dates/intltool-update.in
@@ -1,4 +1,4 @@
-#!@INTLTOOL_PERL@
+#!@INTLTOOL_PERL@ -w
 # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4  -*-
 
 #
diff --git a/packages/openmoko-pim/openmoko-dates_svn.bb b/packages/openmoko-pim/openmoko-dates_svn.bb
index b1147e9b64..af9fcb0d49 100644
--- a/packages/openmoko-pim/openmoko-dates_svn.bb
+++ b/packages/openmoko-pim/openmoko-dates_svn.bb
@@ -3,16 +3,16 @@ SECTION = "openmoko/pim"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs"
 PV = "0.1+svn${SRCDATE}"
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "svn://svn.o-hand.com/repos/dates/branches/private;module=omoko;proto=https \
-           file://compile-fix.patch;patch=1;maxdate=20070213 \   
+inherit gnome autotools pkgconfig gtk-icon-cache
+
+SRC_URI = "svn://svn.o-hand.com/repos/dates/branches/private;module=omoko;proto=http \
            file://remove-bogus-include.patch;patch=1 \
            file://intltool-update.in"
 
 S = "${WORKDIR}/omoko"
 
-inherit autotools pkgconfig gtk-icon-cache
 
 EXTRA_OECONF = "--enable-omoko"
 
@@ -26,5 +26,6 @@ do_install_append () {
 	install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/dates.png ${D}/${datadir}/pixmaps/
 }
 
-FILES_${PN} += "${datadir}/pixmaps/dates.png"
+FILES_${PN} += "${datadir}/pixmaps/dates.png \
+                ${datadir}/dates/"