tags 614086 + pending tags 629561 + patch tags 629561 + pending thanks Dear maintainer,
I've prepared an NMU for dates (versioned as 0.4.8-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - PGP/GPG key ID: 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Red Hot Chili Peppers: Savior
diff -u dates-0.4.8/debian/changelog dates-0.4.8/debian/changelog
--- dates-0.4.8/debian/changelog
+++ dates-0.4.8/debian/changelog
@@ -1,3 +1,15 @@
+dates (0.4.8-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "FTBFS: undefined reference to symbol 'pango_layout_set_indent'":
+ add 03_no-add-needed.patch from Ubuntu (closes: #614086).
+ * Add other Ubuntu patches too (02_ubuntu_desktop_file_location.patch,
+ 04_eds-api-usage-fix.patch, 05_timezone_of_today.patch).
+ * Fix "not installable in sid": the rebuild picks up the newer version of
+ libecal (closes: #629561).
+
+ -- gregor herrmann <gre...@debian.org> Sat, 20 Aug 2011 16:25:32 +0200
+
dates (0.4.8-1) unstable; urgency=low
* New upstream release, acknowlege NMUs
only in patch2:
unchanged:
--- 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 <lucashne...@gmail.com>
+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
+
only in patch2:
unchanged:
--- 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
only in patch2:
unchanged:
--- 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,
only in patch2:
unchanged:
--- 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 <bary...@gmail.com>
+
+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
signature.asc
Description: Digital signature
