--- dates-0.4.8.orig/debian/changelog +++ dates-0.4.8/debian/changelog @@ -0,0 +1,187 @@ +dates (0.4.8-1ubuntu6) oneiric; urgency=low + + * Rebuild against libecal1.2-10 and libedataserver1.2-15. + + -- Colin Watson Mon, 22 Aug 2011 18:10:59 +0100 + +dates (0.4.8-1ubuntu5) oneiric; urgency=low + + * No change rebuild for libecal1.2-9 transition + + -- Angel Abad Mon, 11 Jul 2011 13:19:53 +0200 + +dates (0.4.8-1ubuntu4) natty; urgency=low + + * Add 05_timezone_of_today.patch: fix effect of timezone on Today, thanks + to Israel Cepeda (LP: #696658). + + -- Kees Cook Fri, 08 Apr 2011 11:30:49 -0700 + +dates (0.4.8-1ubuntu3) natty; urgency=low + + * New patch 03_no-add-needed: fix FTBFS with new linker. + * New patch 04_eds-api-usage-fix: fix FTBFS due to API changes. + + -- Ilya Barygin Sun, 09 Jan 2011 14:46:42 +0300 + +dates (0.4.8-1ubuntu2) maverick; urgency=low + + * No-change upload to build against current evolution library ABI. + + -- Martin Pitt Wed, 04 Aug 2010 17:39:22 +0200 + +dates (0.4.8-1ubuntu1) karmic; urgency=low + + * merge from debian/unstable, remaining changes: + - 02_ubuntu_desktop_file_location.patch: Only install the desktop-file + to /usr/share/applications + + -- Andreas Moog Thu, 23 Jul 2009 13:31:05 +0200 + +dates (0.4.8-1) unstable; urgency=low + + * New upstream release, acknowlege NMUs + * Remove 02_fix-missing-includes.patch, fixed upstream. + * Bump Standards + + -- Ross Burton Wed, 22 Jul 2009 21:27:46 +0100 + +dates (0.4.6-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS due to missing GETTEXT_PACKAGE by including where + needed, thanks to Elías A. M. for the patch (Closes: #527679): + - 02_fix-missing-includes.patch + * Set urgency to “medium” as this bug affects testing too. + + -- Cyril Brulebois Sun, 19 Jul 2009 19:00:59 +0200 + +dates (0.4.6-1.1ubuntu2) karmic; urgency=low + + * Dump 03_ubuntu_desktop_file_onlyshowin.patch, it isn't needed any more. + + -- Steve Kowalik Thu, 04 Jun 2009 19:46:54 +1000 + +dates (0.4.6-1.1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/patches + - 02_ubuntu_desktop_file_location.patch: Only install the .desktop file to + /usr/share/applications. + - 03_ubuntu_desktop_file_onlyshowin.patch: Add OnlyShowIn to the .desktop file. + - 04_missing_configh_include.patch: + Fix FTBFS due to missing include of config.h (LP: #356039) + + -- Andreas Moog Tue, 02 Jun 2009 20:17:58 +0200 + +dates (0.4.6-1.1) unstable; urgency=low + + * Non-maintainer upload. + * 01_hildon-includes.patch: patch from Riku Voipio to add missing + hildon includes. Closes: #519633. + + -- Josselin Mouette Mon, 23 Mar 2009 21:00:50 +0100 + +dates (0.4.6-1ubuntu1) intrepid; urgency=low + + * Add two patches: + - desktop-file-location.patch: Only install the .desktop file to + /usr/share/applications. + - desktop-file-onlyshowin.patch: Add OnlyShowIn to the .desktop file. + * Munge Maintainer as per spec. + + -- Steve Kowalik Wed, 07 May 2008 16:46:25 +1000 + +dates (0.4.6-1) unstable; urgency=low + + * New upstream release. + + -- Rob Bradford Wed, 27 Feb 2008 12:04:28 +0000 + +dates (0.4.5-1) unstable; urgency=low + + [ Loic Minier ] + + * New upstream release. + - Drop temporary usr/include and usr/lib exclusion hack. + * Rework to build a Hildon flavor of the package. + - New binary package dates-hildon; add conflicts with dates and update + descriptions; add install files for both packages. + - Add build hooks for configure, build, and install to add flavor / + package specific rules and configure flags. + - Build-dep on libhildon-1-dev (>= 0.12.0), libdbus-1-dev, libosso-dev for + the Hildon flavor. + * Include CDBS' utils for list-missing. + + [ Ross Burton ] + * Update Standards Version + * Add explicit Copyright statement to debian/copyright + + -- Ross Burton Wed, 20 Feb 2008 16:06:27 +0000 + +dates (0.4.4-1) unstable; urgency=low + + * New upstream release. + * Remove old libglade build-dep + * Remove libgtkdatesview packages + + -- Ross Burton Thu, 12 Jul 2007 20:56:31 +0100 + +dates (0.4.3-1) unstable; urgency=low + + * New upstream release. + * Update Standards. + + -- Ross Burton Tue, 5 Jun 2007 09:17:18 +0100 + +dates (0.4.1-2) unstable; urgency=low + + * Rebuild for new EDS. + + -- Ross Burton Wed, 25 Apr 2007 16:25:46 +0100 + +dates (0.4.1-1) unstable; urgency=low + + * New upstream release. + * Add Rob as an uploader + + -- Ross Burton Fri, 13 Apr 2007 14:41:31 +0100 + +dates (0.4.0-1) unstable; urgency=low + + * New upstream release. + + -- Rob Bradford Thu, 12 Apr 2007 16:55:14 +0100 + +dates (0.3.1-1) unstable; urgency=low + + * New upstream release. + + -- Ross Burton Sat, 3 Feb 2007 18:27:06 +0000 + +dates (0.3-2) unstable; urgency=low + + * Actually install the man page. + + -- Ross Burton Fri, 2 Feb 2007 16:35:55 +0000 + +dates (0.3-1) unstable; urgency=low + + * New upstream release + - Add man page (Closes: #402206) + + -- Ross Burton Fri, 2 Feb 2007 14:29:42 +0000 + +dates (0.2-1) unstable; urgency=low + + * New upstream release. + * Add evolution-data-server dependency. + + -- Ross Burton Tue, 5 Dec 2006 11:19:31 +0000 + +dates (0.1-1) unstable; urgency=low + + * Initial release. + + -- Ross Burton Mon, 17 Jul 2006 16:34:37 +0100 + --- dates-0.4.8.orig/debian/rules +++ dates-0.4.8/debian/rules @@ -0,0 +1,46 @@ +#!/usr/bin/make -f + +# build each flavor in a different dir +BUILDBASEDIR := $(CURDIR)/debian/build +DEB_BUILDDIR := $(BUILDBASEDIR)/standard +DEB_BUILDDIR_dates-hildon := $(BUILDBASEDIR)/hildon + +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/class/gnome.mk + +# Optimise the linking and only depend on directly required libraries +DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed" + +# install each build flavor into a different dir +INSTALLBASEDIR := $(CURDIR)/debian/tmp +DEB_DESTDIR := $(INSTALLBASEDIR)/standard +DEB_DESTDIR_dates-hildon := $(INSTALLBASEDIR)/hildon +# and teach dh_install about it +DEB_DH_INSTALL_ARGS = --sourcedir=$(if $(findstring dates-hildon,$(cdbs_curpkg)),$(DEB_DESTDIR_dates-hildon),$(DEB_DESTDIR)) + +# Hildon flavor flags +DEB_CONFIGURE_HILDON_FLAGS += --enable-hildon + +configure/dates-hildon:: $(DEB_BUILDDIR_dates-hildon)/config.status +$(DEB_BUILDDIR_dates-hildon)/config.status: + cd $(DEB_BUILDDIR_dates-hildon) && \ + $(DEB_CONFIGURE_SCRIPT_ENV) \ + $(DEB_CONFIGURE_SCRIPT) \ + $(DEB_CONFIGURE_NORMAL_ARGS) \ + $(cdbs_configure_flags) \ + $(DEB_CONFIGURE_EXTRA_FLAGS) \ + $(DEB_CONFIGURE_USER_FLAGS) \ + $(DEB_CONFIGURE_HILDON_FLAGS) + +build/dates-hildon:: + make -C $(DEB_BUILDDIR_dates-hildon) + +install/dates-hildon:: + make -C $(DEB_BUILDDIR_dates-hildon) install DESTDIR=$(DEB_DESTDIR_dates-hildon) + +clean:: + rm -rf $(BUILDBASEDIR) + --- dates-0.4.8.orig/debian/compat +++ dates-0.4.8/debian/compat @@ -0,0 +1 @@ +4 --- dates-0.4.8.orig/debian/dates-hildon.install +++ dates-0.4.8/debian/dates-hildon.install @@ -0,0 +1,8 @@ +etc +usr/bin +usr/share/applications +usr/share/dates +usr/share/dbus-1/services +usr/share/icons +usr/share/locale +usr/share/man --- dates-0.4.8.orig/debian/control +++ dates-0.4.8/debian/control @@ -0,0 +1,32 @@ +Source: dates +Section: gnome +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ross Burton +Uploaders: Rob Bradford +Priority: optional +Build-Depends: debhelper (>= 4.0.0), cdbs, autotools-dev, intltool, libgtk2.0-dev, libgconf2-dev, libecal1.2-dev (>= 1.8), libhildon-1-dev (>= 0.12.0), libdbus-1-dev, libosso-dev +Standards-Version: 3.8.2 + +Package: dates +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, evolution-data-server +Conflicts: dates-hildon +Description: a calendar optimised for embedded devices + Dates is a small, lightweight calendar. Dates features an innovative, unified, + zooming view and is designed for use on hand-held devices, such as the Nokia + 770 or the Sharp Zaurus series of PDAs. + . + This flavour is suitable for desktop systems such as GNOME; for the Hildon + flavour of Dates, see the dates-hildon package. + +Package: dates-hildon +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, evolution-data-server +Conflicts: dates +Description: a calendar optimised for embedded devices - Hildon flavour + Dates is a small, lightweight calendar. Dates features an innovative, unified, + zooming view and is designed for use on hand-held devices, such as the Nokia + 770 or the Sharp Zaurus series of PDAs. + . + This flavour is suitable for the Hildon Desktop; for other desktop systems such + as GNOME, see the dates package. --- dates-0.4.8.orig/debian/copyright +++ dates-0.4.8/debian/copyright @@ -0,0 +1,54 @@ +This package was debianized by Ross Burton on +Mon, 17 Jul 2006 16:33:58 +0100. + +It was downloaded from http://projects.o-hand.com/dates/ + +Copyright (C) 2005-2008 OpenedHand Ltd + +Upstream Author: Chris Lord + +Copyright: + +Portions of the software are licensed under the GPL: + + This package is free software; you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free Software + Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + details. + + You should have received a copy of the GNU General Public License along with + this package; if not, write to the Free Software Foundation, Inc., 51 + Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian GNU/Linux systems, the complete text of the GNU General Public License +can be found in `/usr/share/common-licenses/GPL-2'. + + +Other portions are licensed under the LGPL: + + This library is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your option) any + later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + details. + + You should have received a copy of the GNU Lesser General Public License + along with this library; if not, write to the Free Software Foundation, Inc., + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + +On Debian GNU/Linux systems, the complete text of the GNU General Public License +can be found in `/usr/share/common-licenses/LGPL'. + + +Executive Summary: + + The GtkDatesView library (/usr/lib/libgtkdatesview.so.*) is LGPL. The Dates + executable itself is GPL. --- dates-0.4.8.orig/debian/dates.install +++ dates-0.4.8/debian/dates.install @@ -0,0 +1,6 @@ +usr/bin +usr/share/applications +usr/share/dates +usr/share/icons +usr/share/locale +usr/share/man --- dates-0.4.8.orig/debian/patches/02_ubuntu_desktop_file_location.patch +++ dates-0.4.8/debian/patches/02_ubuntu_desktop_file_location.patch @@ -0,0 +1,28 @@ +diff -Nur dates-0.4.6/data/Makefile.am dates-0.4.6.new/data/Makefile.am +--- dates-0.4.6/data/Makefile.am 2008-02-27 21:13:02.000000000 +1100 ++++ dates-0.4.6.new/data/Makefile.am 2008-05-07 15:22:04.000000000 +1000 +@@ -3,11 +3,7 @@ + uidir = $(pkgdatadir) + ui_DATA = oh-about-logo.png + +-if WITH_HILDON +-desktopdir = $(datadir)/applications/hildon +-else + desktopdir = $(datadir)/applications +-endif + + desktop_in_files = dates.desktop.in + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +diff -Nur dates-0.4.6/data/Makefile.in dates-0.4.6.new/data/Makefile.in +--- dates-0.4.6/data/Makefile.in 2008-02-27 22:36:46.000000000 +1100 ++++ dates-0.4.6.new/data/Makefile.in 2008-05-07 15:23:47.000000000 +1000 +@@ -228,8 +225,7 @@ + man1_MANS = dates.1 + uidir = $(pkgdatadir) + ui_DATA = oh-about-logo.png +-@WITH_HILDON_FALSE@desktopdir = $(datadir)/applications +-@WITH_HILDON_TRUE@desktopdir = $(datadir)/applications/hildon ++desktopdir = $(datadir)/applications + desktop_in_files = dates.desktop.in + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + @WITH_HILDON_TRUE@servicedir = $(datadir)/dbus-1/services --- dates-0.4.8.orig/debian/patches/05_timezone_of_today.patch +++ dates-0.4.8/debian/patches/05_timezone_of_today.patch @@ -0,0 +1,69 @@ +Description: "today" was not compensating for the current timezone. +Author: Israel Cepeda +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=646035 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/dates/+bug/696658 + +diff -Nur -x '*.orig' -x '*~' dates-0.4.8//src/dates_callbacks.c dates-0.4.8.new//src/dates_callbacks.c +--- dates-0.4.8//src/dates_callbacks.c 2011-04-08 11:26:47.493228477 -0700 ++++ dates-0.4.8.new//src/dates_callbacks.c 2011-04-08 11:27:20.213669703 -0700 +@@ -94,7 +94,9 @@ + void + dates_today_cb (GtkButton *button, DatesData *data) + { +- icaltimetype today = icaltime_today (); ++ icaltimezone* zone = dates_view_get_zone (data->view); ++ icaltimetype today = icaltime_current_time_with_zone (zone); ++ icaltime_adjust (&today, 0, today.hour * -1, today.minute * -1, today.second * -1); + dates_view_set_date (data->view, &today); + } + +diff -Nur -x '*.orig' -x '*~' dates-0.4.8//src/dates_view.c dates-0.4.8.new//src/dates_view.c +--- dates-0.4.8//src/dates_view.c 2011-04-08 11:26:47.613230095 -0700 ++++ dates-0.4.8.new//src/dates_view.c 2011-04-08 11:27:20.213669703 -0700 +@@ -1428,7 +1428,8 @@ + gtk_widget_modify_bg (priv->top, GTK_STATE_NORMAL, &colour); + //priv->adjust = GTK_ADJUSTMENT (gtk_adjustment_new (8, 0, 13, 1, 1, 1)); + priv->date = g_new (icaltimetype, 1); +- *priv->date = icaltime_today (); ++ *priv->date = icaltime_current_time_with_zone (priv->zone); ++ icaltime_adjust (priv->date, 0, (*priv->date).hour * -1, (*priv->date).minute * -1, (*priv->date).second * -1); + dates_view_get_visible_span (view, &priv->start, &priv->end); + dates_view_get_visible_cspan (view, &priv->cstart, &priv->cend); + +@@ -5446,6 +5447,25 @@ + return priv->date; + } + ++/** dates_view_get_zone: ++ * @view: The #DatesView widget to get the selected zone of ++ * ++ * Retrieves the current active zone of @view ++ * ++ * Return value: @view's active zone ++ **/ ++const icaltimezone * ++dates_view_get_zone (DatesView *view) ++{ ++ DatesViewPrivate *priv; ++ ++ g_return_val_if_fail (DATES_IS_VIEW (view), NULL); ++ ++ priv = DATES_VIEW_GET_PRIVATE (view); ++ ++ return priv->zone; ++} ++ + /** dates_view_get_use_list: + * @view: The #DatesView widget to get the view preference of + * +diff -Nur -x '*.orig' -x '*~' dates-0.4.8//src/dates_view.h dates-0.4.8.new//src/dates_view.h +--- dates-0.4.8//src/dates_view.h 2009-07-14 00:43:12.000000000 -0700 ++++ dates-0.4.8.new//src/dates_view.h 2011-04-08 11:27:20.213669703 -0700 +@@ -103,6 +103,7 @@ + guint dates_view_get_visible_days (DatesView *view); + guint dates_view_get_visible_hours (DatesView *view); + const icaltimetype *dates_view_get_date (DatesView *view); ++const icaltimezone *dates_view_get_zone (DatesView *view); + gboolean dates_view_get_use_list (DatesView *view); + gboolean dates_view_get_use_24h (DatesView *view); + void dates_view_get_visible_span (DatesView *view, --- dates-0.4.8.orig/debian/patches/04_eds-api-usage-fix.patch +++ dates-0.4.8/debian/patches/04_eds-api-usage-fix.patch @@ -0,0 +1,155 @@ +From: Lucas Hermann Negri +Date: Wed, 13 Oct 2010 18:49:20 -0300 +Subject: [PATCH] Replaced the calls to the deprecated functions e_source_{set,get}_color + with the new API (e_source_{set,peek}_color_spec). +Origin: vendor, http://git.overlays.gentoo.org/gitweb/?p=dev/eva.git;a=blob;f=app-office/dates/files/dates-0.4.11-eds-api-usage-fix.patch;h=e7fce46f39ade95ef4d173fb2286c07a60f30953;hb=40ec7f5bb8a1338242048215587796c4618b4fb6 + +--- + src/dates_gtk.c | 40 ++++++++++++---------------------------- + src/dates_main.c | 2 +- + src/dates_view.c | 10 ++++------ + 3 files changed, 17 insertions(+), 35 deletions(-) + +diff --git a/src/dates_gtk.c b/src/dates_gtk.c +index 78e71bb..403bc25 100644 +--- a/src/dates_gtk.c ++++ b/src/dates_gtk.c +@@ -1016,7 +1016,6 @@ calendar_do_new_dialog (GtkWindow *parent, DatesData *d) + GtkTreeIter iter; + GError *error = NULL; + const gchar *relative_uri; +- guint32 new_colour; + + #ifdef WITH_HILDON + GdkColor *hildon_color; +@@ -1055,7 +1054,8 @@ calendar_do_new_dialog (GtkWindow *parent, DatesData *d) + source = e_source_new (name, relative_uri); + + #ifdef USE_OWL +- new_colour = owl_colour_button_get_colour (OWL_COLOUR_BUTTON (color_button)); ++ guint32 new_colour = owl_colour_button_get_colour (OWL_COLOUR_BUTTON (color_button)); ++ e_source_set_color (source, new_colour); + #else + + #ifdef WITH_HILDON +@@ -1063,17 +1063,11 @@ calendar_do_new_dialog (GtkWindow *parent, DatesData *d) + #else + gtk_color_button_get_color (GTK_COLOR_BUTTON(color_button), &colour); + #endif +- new_colour = (guint8)(colour.red >> 8); +- new_colour <<= 8; +- new_colour |= (guint8)(colour.green >> 8); +- new_colour <<= 8; +- new_colour |= (guint8)(colour.blue >> 8); +- new_colour <<= 8; ++ gchar *n_color = gdk_color_to_string (&colour); ++ e_source_set_color_spec (source, n_color); ++ g_free(n_color); + #endif + +- /* Set the colour */ +- e_source_set_color (source, new_colour); +- + /* Set the group for the source */ + e_source_set_group (source, group); + e_source_group_add_source (group, source, 0); +@@ -1169,7 +1163,6 @@ calendar_do_edit_dialog (GtkWindow *parent, ESource *source, DatesData *d) + ESourceGroup *group; + + GdkColor colour; +- guint32 raw_colour; + + const gchar *name = NULL; + const gchar *uri = NULL; +@@ -1335,12 +1328,8 @@ calendar_do_edit_dialog (GtkWindow *parent, ESource *source, DatesData *d) + gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + + /* Get the colour from the the source */ +- e_source_get_color (source, &raw_colour); +- +- /* Munge this into something usable */ +- colour.red = (guint16)(((raw_colour & 0xff0000) >> 16) << 8); +- colour.green = (guint16)(((raw_colour & 0xff00) >> 8) << 8); +- colour.blue = (guint16)(((raw_colour & 0xff) << 8)); ++ const gchar* spec = e_source_peek_color_spec(source); ++ gdk_color_parse(spec, &colour); + + /* Now we need to allocate the colour */ + gdk_colormap_alloc_color (gdk_colormap_get_system (), &colour, TRUE, TRUE); +@@ -1440,26 +1429,21 @@ calendar_do_edit_dialog (GtkWindow *parent, ESource *source, DatesData *d) + * Next we need to pack the GDK colour into guint32 + * for eds + */ +- guint32 new_colour = 0; + + GError *error = NULL; + #ifdef USE_OWL +- new_colour = owl_colour_button_get_colour (OWL_COLOUR_BUTTON (color_button)); ++ guint32 new_colour = owl_colour_button_get_colour (OWL_COLOUR_BUTTON (color_button)); ++ e_source_set_color (source, new_colour); + #else + #ifdef WITH_HILDON + hildon_color_button_get_color (HILDON_COLOR_BUTTON(color_button), &colour); + #else + gtk_color_button_get_color (GTK_COLOR_BUTTON(color_button), &colour); + #endif +- new_colour = (guint8)(colour.red >> 8); +- new_colour <<= 8; +- new_colour |= (guint8)(colour.green >> 8); +- new_colour <<= 8; +- new_colour |= (guint8)(colour.blue >> 8); +- new_colour <<= 8; ++ gchar *n_color = gdk_color_to_string (&colour); ++ e_source_set_color_spec (source, n_color); ++ g_free(n_color); + #endif +- /* Update the colour */ +- e_source_set_color (source, new_colour); + + /* And the name */ + e_source_set_name (source, (gtk_entry_get_text (GTK_ENTRY (name_entry)))); +diff --git a/src/dates_main.c b/src/dates_main.c +index ce05fe8..1f7770d 100644 +--- a/src/dates_main.c ++++ b/src/dates_main.c +@@ -112,7 +112,7 @@ dates_load_calendars (DatesData *d) + system_source = e_source_new (_("Personal"), "system"); + + /* Default Evolution colour */ +- e_source_set_color (system_source, 0xBECEDD); ++ e_source_set_color_spec (system_source, "#BECEDD"); + + /* Set the group for the source and put it in the group */ + e_source_set_group (system_source, local_group); +diff --git a/src/dates_view.c b/src/dates_view.c +index d65db2f..9d28a15 100644 +--- a/src/dates_view.c ++++ b/src/dates_view.c +@@ -4846,7 +4846,6 @@ dates_view_add_calendar (DatesView *view, ECal *ecal) + DatesViewPrivate *priv = DATES_VIEW_GET_PRIVATE (view); + DatesViewCalendar *cal; + ESource *source; +- guint32 colour; + /* GError *error = NULL;*/ + + g_return_if_fail (E_IS_CAL (ecal)); +@@ -4876,12 +4875,11 @@ dates_view_add_calendar (DatesView *view, ECal *ecal) + cal->text_gc = gdk_gc_new ( + GDK_DRAWABLE (priv->main->window)); + +- if (e_source_get_color (source, &colour)) { ++ const gchar* spec = e_source_peek_color_spec (source); ++ if (spec) { + GdkColor gcolour, dgcolour, tgcolour; +- gcolour.red = ((colour & 0xFF0000) >> 16) * 0x101; +- gcolour.green = ((colour & 0xFF00) >> 8) * 0x101; +- gcolour.blue = (colour & 0xFF) * 0x101; +- ++ gdk_color_parse(spec, &gcolour); ++ + /* This is simplified sRGB -> LAB conversion; we do not need it + * entirely precise, as we are only going to chose between + * black or white text based on the L value. +-- +1.7.3.1 + --- dates-0.4.8.orig/debian/patches/03_no-add-needed.patch +++ dates-0.4.8/debian/patches/03_no-add-needed.patch @@ -0,0 +1,38 @@ +Description: Fix FTBFS with --no-add-needed. Move library flags to LIBS + and add math library. +Author: Ilya Barygin + +diff -Nur -x '*.orig' -x '*~' dates-0.4.8//src/Makefile.am dates-0.4.8.new//src/Makefile.am +--- dates-0.4.8//src/Makefile.am 2011-01-09 14:01:47.000000000 +0300 ++++ dates-0.4.8.new//src/Makefile.am 2011-01-09 14:25:07.000000000 +0300 +@@ -35,7 +35,8 @@ + gconf-bridge.h \ + gconf-bridge.c + +-dates_LDADD = $(DATES_LIBS) libgtkdatesview.la ++dates_LDADD = libgtkdatesview.la ++LIBS = $(DATES_LIBS) -lm + + if USE_OWL + dates_LDADD += $(top_builddir)/libowl/libowl.la +diff -Nur -x '*.orig' -x '*~' dates-0.4.8//src/Makefile.in dates-0.4.8.new//src/Makefile.in +--- dates-0.4.8//src/Makefile.in 2011-01-09 14:02:00.000000000 +0300 ++++ dates-0.4.8.new//src/Makefile.in 2011-01-09 14:25:51.000000000 +0300 +@@ -135,7 +135,7 @@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ $(DATES_LIBS) -lm + LIBTOOL = @LIBTOOL@ + LIPO = @LIPO@ + LN_S = @LN_S@ +@@ -245,7 +245,7 @@ + gconf-bridge.h \ + gconf-bridge.c + +-dates_LDADD = $(DATES_LIBS) libgtkdatesview.la $(am__append_4) ++dates_LDADD = libgtkdatesview.la $(am__append_4) + MAINTAINERCLEANFILES = config.h.in Makefile.in + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-am --- dates-0.4.8.orig/debian/patches/01_hildon-includes.patch +++ dates-0.4.8/debian/patches/01_hildon-includes.patch @@ -0,0 +1,14 @@ +diff -urN orig/dates-0.4.6/src/dates_callbacks.c +dates-0.4.6/src/dates_callbacks.c +--- orig/dates-0.4.6/src/dates_callbacks.c 2008-02-27 +11:04:52.000000000 +0000 ++++ dates-0.4.6/src/dates_callbacks.c 2009-03-14 19:40:15.000000000 ++0000 +@@ -30,6 +30,7 @@ + + #ifdef WITH_HILDON + #include ++#include + #include + #include + #include