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 0342a27..661d8fe 100644 (file)
--- 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 b1147e9..af9fcb0 100644 (file)
--- 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/"