[oe-commits] org.oe.dev openmoko-dates: merge in changes from openmoko.svn and fix packaging

[koen commit]

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

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 17456d839ed6d5a9ca1e700a26784cc663820a4d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=17456d839ed6d5a9ca1e700a26784cc663820a4d
Files:
1
packages/openmoko-pim/openmoko-dates/intltool-update.in
packages/openmoko-pim/openmoko-dates_svn.bb
Diffs:

#
# mt diff -r9977b5659951e82f900130b4ff0d49012d06abad -r17456d839ed6d5a9ca1e700a26784cc663820a4d
#
# 
# 
# patch "packages/openmoko-pim/openmoko-dates/intltool-update.in"
#  from [b66bce5c6724910ec058c62cc14d5987adb6ff75]
#    to [3c59717bc4d33a29df7b17d1b8d7b608b0710889]
# 
# patch "packages/openmoko-pim/openmoko-dates_svn.bb"
#  from [1ea351e3f04fd215bd87ca0403365994547c200f]
#    to [741bd7b760314d251e405c762604a8ab82c5b387]
# 
============================================================
--- packages/openmoko-pim/openmoko-dates/intltool-update.in	b66bce5c6724910ec058c62cc14d5987adb6ff75
+++ packages/openmoko-pim/openmoko-dates/intltool-update.in	3c59717bc4d33a29df7b17d1b8d7b608b0710889
@@ -1,4 +1,4 @@
-#!@INTLTOOL_PERL@
+#!@INTLTOOL_PERL@ -w
 # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4  -*-
 
 #
============================================================
--- packages/openmoko-pim/openmoko-dates_svn.bb	1ea351e3f04fd215bd87ca0403365994547c200f
+++ packages/openmoko-pim/openmoko-dates_svn.bb	741bd7b760314d251e405c762604a8ab82c5b387
@@ -1,18 +1,18 @@ PV = "0.1+svn${SRCDATE}"
 DESCRIPTION = "Dates is a calendar application."
 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/"