r2078 - in /unstable/evolution-data-server/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Dec 16 18:15:30 UTC 2011
Author: joss
Date: Fri Dec 16 18:15:29 2011
New Revision: 2078
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2078
Log:
* 01_timezones.patch, 02_deprecated.patch, 03_ports_translation.patch,
04_delay_vcard_parsing.patch, 05_contact_fields.patch,
06_revert_space_categories.patch, 07_http_crash.patch,
08_newfolder_imap.patch: bugfixes from upstream 3.2 git.
* 20_gettext_intltool.patch: don’t confuse autoreconf by using both
gettext and intltool.
* Call dh-autoreconf.
Added:
unstable/evolution-data-server/debian/patches/01_timezones.patch
unstable/evolution-data-server/debian/patches/02_deprecated.patch
unstable/evolution-data-server/debian/patches/03_ports_translation.patch
unstable/evolution-data-server/debian/patches/04_delay_vcard_parsing.patch
unstable/evolution-data-server/debian/patches/05_contact_fields.patch
unstable/evolution-data-server/debian/patches/06_revert_space_categories.patch
unstable/evolution-data-server/debian/patches/07_http_crash.patch
unstable/evolution-data-server/debian/patches/08_newfolder_imap.patch
unstable/evolution-data-server/debian/patches/20_gettext_intltool.patch
Modified:
unstable/evolution-data-server/debian/changelog
unstable/evolution-data-server/debian/control
unstable/evolution-data-server/debian/patches/series
unstable/evolution-data-server/debian/rules
Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=2078&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Fri Dec 16 18:15:29 2011
@@ -1,4 +1,4 @@
-evolution-data-server (3.2.2-1) UNRELEASED; urgency=low
+evolution-data-server (3.2.2-1) experimental; urgency=low
* Loosen dependency of libedataserverui on e-d-s-common to avoid
problems with the upcoming transition.
@@ -6,8 +6,15 @@
* Drop libicu-dev build-dependency.
* Tighten dependencies between -dev packages.
* New upstream release.
-
- -- Josselin Mouette <joss at debian.org> Fri, 11 Nov 2011 18:50:12 +0100
+ * 01_timezones.patch, 02_deprecated.patch, 03_ports_translation.patch,
+ 04_delay_vcard_parsing.patch, 05_contact_fields.patch,
+ 06_revert_space_categories.patch, 07_http_crash.patch,
+ 08_newfolder_imap.patch: bugfixes from upstream 3.2 git.
+ * 20_gettext_intltool.patch: don’t confuse autoreconf by using both
+ gettext and intltool.
+ * Call dh-autoreconf.
+
+ -- Josselin Mouette <joss at debian.org> Fri, 16 Dec 2011 19:15:23 +0100
evolution-data-server3 (3.2.1-1) experimental; urgency=low
Modified: unstable/evolution-data-server/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/control?rev=2078&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/control (original)
+++ unstable/evolution-data-server/debian/control Fri Dec 16 18:15:29 2011
@@ -19,6 +19,7 @@
Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server
Build-Depends: debhelper (>= 8),
cdbs (>= 0.4.37),
+ dh-autoreconf,
dpkg-dev (>= 1.16.1),
pkg-config (>= 0.16),
flex,
Added: unstable/evolution-data-server/debian/patches/01_timezones.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/01_timezones.patch?rev=2078&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/01_timezones.patch (added)
+++ unstable/evolution-data-server/debian/patches/01_timezones.patch Fri Dec 16 18:15:29 2011
@@ -1,0 +1,62 @@
+From af5d404e57f43e58cac037ad3370e31004347c6e Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Wed, 23 Nov 2011 08:31:01 +0000
+Subject: Pre-load all built-in timezones in libical on calendar factory start
+
+This is the same fix as was done in evolution within bug #628139
+---
+diff --git a/calendar/libedata-cal/e-data-cal-factory.c b/calendar/libedata-cal/e-data-cal-factory.c
+index 4413341..df3e136 100644
+--- a/calendar/libedata-cal/e-data-cal-factory.c
++++ b/calendar/libedata-cal/e-data-cal-factory.c
+@@ -52,9 +52,7 @@
+
+ #include "e-gdbus-cal-factory.h"
+
+-#ifdef HAVE_ICAL_UNKNOWN_TOKEN_HANDLING
+ #include <libical/ical.h>
+-#endif
+
+ #ifdef G_OS_WIN32
+ #include <windows.h>
+@@ -1007,6 +1005,8 @@ main (gint argc,
+ EDataCalFactory *factory;
+ guint owner_id;
+ GError *error = NULL;
++ icalarray *builtin_timezones;
++ gint ii;
+
+ #ifdef G_OS_WIN32
+ /* Reduce risks */
+@@ -1057,6 +1057,29 @@ main (gint argc,
+ ical_set_unknown_token_handling_setting (ICAL_DISCARD_TOKEN);
+ #endif
+
++ /* XXX Pre-load all built-in timezones in libical.
++ *
++ * Built-in time zones in libical 0.43 are loaded on demand,
++ * but not in a thread-safe manner, resulting in a race when
++ * multiple threads call icaltimezone_load_builtin_timezone()
++ * on the same time zone. Until built-in time zone loading
++ * in libical is made thread-safe, work around the issue by
++ * loading all built-in time zones now, so libical's internal
++ * time zone array will be fully populated before any threads
++ * are spawned.
++ */
++ builtin_timezones = icaltimezone_get_builtin_timezones ();
++ for (ii = 0; ii < builtin_timezones->num_elements; ii++) {
++ icaltimezone *zone;
++
++ zone = icalarray_element_at (builtin_timezones, ii);
++
++ /* We don't care about the component right now,
++ * we just need some function that will trigger
++ * icaltimezone_load_builtin_timezone(). */
++ icaltimezone_get_component (zone);
++ }
++
+ factory = g_object_new (E_TYPE_DATA_CAL_FACTORY, NULL);
+
+ loop = g_main_loop_new (NULL, FALSE);
+--
+cgit v0.9.0.2
Added: unstable/evolution-data-server/debian/patches/02_deprecated.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/02_deprecated.patch?rev=2078&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/02_deprecated.patch (added)
+++ unstable/evolution-data-server/debian/patches/02_deprecated.patch Fri Dec 16 18:15:29 2011
@@ -1,0 +1,27 @@
+From 3b4993403d04ae7fb85efcc8308c01b22a63861b Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes at redhat.com>
+Date: Thu, 24 Nov 2011 23:01:11 +0000
+Subject: Remove all *_DISABLE_DEPRECATED_FLAGS.
+
+I'll care about deprecated APIs again when a gtk4 release date is
+announced. Meanwhile it's just causing distros unnecessary pain.
+
+(cherry picked from commit a28a512c9f839f8ccefeaf4256eb897ce9d6b8f6)
+---
+diff --git a/configure.ac b/configure.ac
+index 4f1edcc..9bd97db 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -146,9 +146,7 @@ dnl ******************************
+ dnl Compiler Warning Flags
+ dnl ******************************
+ AS_COMPILER_FLAGS(WARNING_FLAGS,
+- "-DPANGO_DISABLE_DEPRECATED
+- -DGDK_PIXBUF_DISABLE_DEPRECATED
+- -DG_DISABLE_SINGLE_INCLUDES
++ "-DG_DISABLE_SINGLE_INCLUDES
+ -DGTK_DISABLE_SINGLE_INCLUDES
+ -DGSEAL_ENABLE
+ -Wall -Wextra
+--
+cgit v0.9.0.2
Added: unstable/evolution-data-server/debian/patches/03_ports_translation.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/03_ports_translation.patch?rev=2078&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/03_ports_translation.patch (added)
+++ unstable/evolution-data-server/debian/patches/03_ports_translation.patch Fri Dec 16 18:15:29 2011
@@ -1,0 +1,36 @@
+From 4d6c98ff5c610994ec5c495d6ba77f310e0daa4a Mon Sep 17 00:00:00 2001
+From: Gabor Kelemen <kelemeng at gnome.hu>
+Date: Fri, 02 Dec 2011 18:30:01 +0000
+Subject: Call gettext on the short descriptions of port numbers.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=665421
+---
+diff --git a/camel/camel-provider.c b/camel/camel-provider.c
+index 751cf02..4155be8 100644
+--- a/camel/camel-provider.c
++++ b/camel/camel-provider.c
+@@ -229,6 +229,7 @@ camel_provider_register (CamelProvider *provider)
+ {
+ gint i;
+ CamelProviderConfEntry *conf;
++ CamelProviderPortEntry *port;
+ GList *l;
+
+ g_return_if_fail (provider != NULL);
+@@ -265,8 +266,13 @@ camel_provider_register (CamelProvider *provider)
+ l = l->next;
+ }
+
+- if (provider->port_entries)
++ if (provider->port_entries) {
+ provider->url_flags |= CAMEL_URL_NEED_PORT;
++ port = provider->port_entries;
++ for (i = 0; port[i].port != 0; i++)
++ if (port[i].desc)
++ port[i].desc = P_(port[i].desc);
++ }
+ else
+ provider->url_flags &= ~CAMEL_URL_NEED_PORT;
+
+--
+cgit v0.9.0.2
Added: unstable/evolution-data-server/debian/patches/04_delay_vcard_parsing.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/04_delay_vcard_parsing.patch?rev=2078&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/04_delay_vcard_parsing.patch (added)
+++ unstable/evolution-data-server/debian/patches/04_delay_vcard_parsing.patch Fri Dec 16 18:15:29 2011
@@ -1,0 +1,38 @@
+From d072dd312f50e3d3444bc14977f0cd2b022f9667 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Tue, 13 Dec 2011 12:09:35 +0000
+Subject: Bug #652173 - EContact's file-as getter doesn't populate empty value
+
+---
+diff --git a/addressbook/libebook/e-contact.c b/addressbook/libebook/e-contact.c
+index b9fdf41..f938dd8 100644
+--- a/addressbook/libebook/e-contact.c
++++ b/addressbook/libebook/e-contact.c
+@@ -566,7 +566,15 @@ static gpointer
+ fileas_getter (EContact *contact,
+ EVCardAttribute *attr)
+ {
+- if (!attr) {
++ GList *p = NULL;
++
++ if (attr) {
++ p = e_vcard_attribute_get_values (attr);
++ if (!p || !p->data || !*((const gchar *) p->data))
++ p = NULL;
++ }
++
++ if (!p) {
+ /* Generate a FILE_AS field */
+ EContactName *name;
+ gchar *new_file_as = NULL;
+@@ -609,7 +617,7 @@ fileas_getter (EContact *contact,
+ }
+
+ if (attr) {
+- GList *p = e_vcard_attribute_get_values (attr);
++ p = e_vcard_attribute_get_values (attr);
+
+ return p && p->data ? p->data : (gpointer) "";
+ } else {
+--
+cgit v0.9.0.2
Added: unstable/evolution-data-server/debian/patches/05_contact_fields.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/05_contact_fields.patch?rev=2078&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/05_contact_fields.patch (added)
+++ unstable/evolution-data-server/debian/patches/05_contact_fields.patch Fri Dec 16 18:15:29 2011
@@ -1,0 +1,52 @@
+From 302e010735379c94c614c12d42a172848d621703 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Tue, 13 Dec 2011 12:25:10 +0000
+Subject: Contacts calendar - consider also other than only file-as field
+
+---
+diff --git a/calendar/backends/contacts/e-cal-backend-contacts.c b/calendar/backends/contacts/e-cal-backend-contacts.c
+index e3994f9..dca655b 100644
+--- a/calendar/backends/contacts/e-cal-backend-contacts.c
++++ b/calendar/backends/contacts/e-cal-backend-contacts.c
+@@ -132,7 +132,12 @@ book_record_new (ECalBackendContacts *cbc,
+ }
+
+ query = e_book_query_andv (
+- e_book_query_field_exists (E_CONTACT_FILE_AS),
++ e_book_query_orv (
++ e_book_query_field_exists (E_CONTACT_FILE_AS),
++ e_book_query_field_exists (E_CONTACT_FULL_NAME),
++ e_book_query_field_exists (E_CONTACT_GIVEN_NAME),
++ e_book_query_field_exists (E_CONTACT_NICKNAME),
++ NULL),
+ e_book_query_orv (
+ e_book_query_field_exists (E_CONTACT_BIRTH_DATE),
+ e_book_query_field_exists (E_CONTACT_ANNIVERSARY),
+@@ -791,6 +796,12 @@ create_birthday (ECalBackendContacts *cbc,
+
+ cdate = e_contact_get (contact, E_CONTACT_BIRTH_DATE);
+ name = e_contact_get_const (contact, E_CONTACT_FILE_AS);
++ if (!name || !*name)
++ name = e_contact_get_const (contact, E_CONTACT_FULL_NAME);
++ if (!name || !*name)
++ name = e_contact_get_const (contact, E_CONTACT_NICKNAME);
++ if (!name)
++ name = "";
+
+ uid = g_strdup_printf ("%s%s", (gchar *) e_contact_get_const (contact, E_CONTACT_UID), BIRTHDAY_UID_EXT);
+ summary = g_strdup_printf (_("Birthday: %s"), name);
+@@ -816,6 +827,12 @@ create_anniversary (ECalBackendContacts *cbc,
+
+ cdate = e_contact_get (contact, E_CONTACT_ANNIVERSARY);
+ name = e_contact_get_const (contact, E_CONTACT_FILE_AS);
++ if (!name || !*name)
++ name = e_contact_get_const (contact, E_CONTACT_FULL_NAME);
++ if (!name || !*name)
++ name = e_contact_get_const (contact, E_CONTACT_NICKNAME);
++ if (!name)
++ name = "";
+
+ uid = g_strdup_printf ("%s%s", (gchar *) e_contact_get_const (contact, E_CONTACT_UID), ANNIVERSARY_UID_EXT);
+ summary = g_strdup_printf (_("Anniversary: %s"), name);
+--
+cgit v0.9.0.2
Added: unstable/evolution-data-server/debian/patches/06_revert_space_categories.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/06_revert_space_categories.patch?rev=2078&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/06_revert_space_categories.patch (added)
+++ unstable/evolution-data-server/debian/patches/06_revert_space_categories.patch Fri Dec 16 18:15:29 2011
@@ -1,0 +1,23 @@
+From d15bdd08427b19398d17f2704cd5b5daf4ec6420 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Wed, 14 Dec 2011 09:19:56 +0000
+Subject: Revert patch for bug #514041
+
+See the bug for more information:
+https://bugzilla.gnome.org/show_bug.cgi?id=514041#c9
+---
+diff --git a/addressbook/libebook/e-contact.c b/addressbook/libebook/e-contact.c
+index f938dd8..cdd7ac0 100644
+--- a/addressbook/libebook/e-contact.c
++++ b/addressbook/libebook/e-contact.c
+@@ -1603,7 +1603,7 @@ e_contact_get (EContact *contact,
+ g_string_append (str, (gchar *) v->data);
+ v = v->next;
+ if (v)
+- g_string_append (str, ", ");
++ g_string_append_c (str, ',');
+ }
+
+ rv = g_string_free (str, FALSE);
+--
+cgit v0.9.0.2
Added: unstable/evolution-data-server/debian/patches/07_http_crash.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/07_http_crash.patch?rev=2078&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/07_http_crash.patch (added)
+++ unstable/evolution-data-server/debian/patches/07_http_crash.patch Fri Dec 16 18:15:29 2011
@@ -1,0 +1,107 @@
+From c1b00584c34b3d6b5784c54256398c4197b23078 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Wed, 14 Dec 2011 16:37:23 +0000
+Subject: Bug #662068 - Crash in e-cal-backend-http.c:retrieval_done
+
+---
+diff --git a/calendar/backends/http/e-cal-backend-http.c b/calendar/backends/http/e-cal-backend-http.c
+index d40bdd3..c053e3b 100644
+--- a/calendar/backends/http/e-cal-backend-http.c
++++ b/calendar/backends/http/e-cal-backend-http.c
+@@ -368,6 +368,12 @@ retrieval_done (SoupSession *session,
+ GHashTable *old_cache;
+ GSList *comps_in_cache;
+
++ if (!msg || msg->status_code == SOUP_STATUS_CANCELLED) {
++ /* the backend probably gone in this case, thus just return */
++ g_object_unref (cbhttp);
++ return;
++ }
++
+ priv = cbhttp->priv;
+
+ priv->is_loading = FALSE;
+@@ -376,12 +382,14 @@ retrieval_done (SoupSession *session,
+ if (!priv->uri) {
+ /* uri changed meanwhile, retrieve again */
+ begin_retrieval_cb (cbhttp);
++ g_object_unref (cbhttp);
+ return;
+ }
+
+ if (msg->status_code == SOUP_STATUS_NOT_MODIFIED) {
+ /* attempts with ETag can result in 304 status code */
+ priv->opened = TRUE;
++ g_object_unref (cbhttp);
+ return;
+ }
+
+@@ -399,7 +407,7 @@ retrieval_done (SoupSession *session,
+ uri_parsed = soup_uri_new (priv->uri);
+ soup_uri_set_path (uri_parsed, newuri);
+ soup_uri_set_query (uri_parsed, NULL);
+- // g_free (newuri);
++ /* g_free (newuri); */
+
+ newuri = soup_uri_to_string (uri_parsed, FALSE);
+ g_message ("Translated URI: %s\n", newuri);
+@@ -417,6 +425,7 @@ retrieval_done (SoupSession *session,
+ }
+ }
+
++ g_object_unref (cbhttp);
+ return;
+ }
+
+@@ -426,6 +435,7 @@ retrieval_done (SoupSession *session,
+ if (msg->status_code == 401 || msg->status_code == 403) {
+ priv->requires_auth = TRUE;
+ e_cal_backend_notify_auth_required (E_CAL_BACKEND (cbhttp), TRUE, priv->credentials);
++ g_object_unref (cbhttp);
+ return;
+ } else
+ e_cal_backend_notify_error (E_CAL_BACKEND (cbhttp),
+@@ -434,6 +444,7 @@ retrieval_done (SoupSession *session,
+ }
+
+ empty_cache (cbhttp);
++ g_object_unref (cbhttp);
+ return;
+ }
+
+@@ -453,6 +464,7 @@ retrieval_done (SoupSession *session,
+ if (!priv->opened)
+ e_cal_backend_notify_error (E_CAL_BACKEND (cbhttp), _("Bad file format."));
+ empty_cache (cbhttp);
++ g_object_unref (cbhttp);
+ return;
+ }
+
+@@ -461,6 +473,7 @@ retrieval_done (SoupSession *session,
+ e_cal_backend_notify_error (E_CAL_BACKEND (cbhttp), _("Not a calendar."));
+ icalcomponent_free (icalcomp);
+ empty_cache (cbhttp);
++ g_object_unref (cbhttp);
+ return;
+ }
+
+@@ -543,6 +556,8 @@ retrieval_done (SoupSession *session,
+
+ priv->opened = TRUE;
+
++ g_object_unref (cbhttp);
++
+ d(g_message ("Retrieval really done.\n"));
+ }
+
+@@ -648,7 +663,7 @@ begin_retrieval_cb (ECalBackendHttp *cbhttp)
+ }
+
+ soup_session_queue_message (priv->soup_session, soup_message,
+- (SoupSessionCallback) retrieval_done, cbhttp);
++ (SoupSessionCallback) retrieval_done, g_object_ref (cbhttp));
+
+ d(g_message ("Retrieval started.\n"));
+ return FALSE;
+--
+cgit v0.9.0.2
Added: unstable/evolution-data-server/debian/patches/08_newfolder_imap.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/08_newfolder_imap.patch?rev=2078&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/08_newfolder_imap.patch (added)
+++ unstable/evolution-data-server/debian/patches/08_newfolder_imap.patch Fri Dec 16 18:15:29 2011
@@ -1,0 +1,21 @@
+From 0e421dfb0d9fd1e36a28d8bb47c0ae46ca4925f5 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Fri, 16 Dec 2011 08:15:03 +0000
+Subject: Bug #665253 - "New folder" dialog does not show IMAP accounts
+
+---
+diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
+index c46e575..b5ddf93 100644
+--- a/camel/providers/imap/camel-imap-store.c
++++ b/camel/providers/imap/camel-imap-store.c
+@@ -1226,7 +1226,7 @@ imap_store_initable_init (GInitable *initable,
+ CAMEL_STORE (service)->flags &= ~CAMEL_STORE_VJUNK;
+ CAMEL_STORE (service)->flags |= CAMEL_STORE_REAL_JUNK_FOLDER;
+ } else {
+- CAMEL_STORE (service)->flags &= CAMEL_STORE_REAL_JUNK_FOLDER;
++ CAMEL_STORE (service)->flags &= ~CAMEL_STORE_REAL_JUNK_FOLDER;
+ CAMEL_STORE (service)->flags |= CAMEL_STORE_VJUNK;
+ }
+
+--
+cgit v0.9.0.2
Added: unstable/evolution-data-server/debian/patches/20_gettext_intltool.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/20_gettext_intltool.patch?rev=2078&op=file
==============================================================================
--- unstable/evolution-data-server/debian/patches/20_gettext_intltool.patch (added)
+++ unstable/evolution-data-server/debian/patches/20_gettext_intltool.patch Fri Dec 16 18:15:29 2011
@@ -1,0 +1,14 @@
+Index: evolution-data-server-3.2.2/configure.ac
+===================================================================
+--- evolution-data-server-3.2.2.orig/configure.ac 2011-12-16 19:13:22.103941922 +0100
++++ evolution-data-server-3.2.2/configure.ac 2011-12-16 19:13:45.732057437 +0100
+@@ -249,9 +249,6 @@ dnl I18N stuff
+ dnl ******************************
+ IT_PROG_INTLTOOL([0.35.5])
+
+-AM_GNU_GETTEXT_VERSION([0.17])
+-AM_GNU_GETTEXT([external])
+-
+ GETTEXT_PACKAGE=evolution-data-server-$BASE_VERSION
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
Modified: unstable/evolution-data-server/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/series?rev=2078&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/series (original)
+++ unstable/evolution-data-server/debian/patches/series Fri Dec 16 18:15:29 2011
@@ -1,0 +1,9 @@
+01_timezones.patch
+02_deprecated.patch
+03_ports_translation.patch
+04_delay_vcard_parsing.patch
+05_contact_fields.patch
+06_revert_space_categories.patch
+07_http_crash.patch
+08_newfolder_imap.patch
+20_gettext_intltool.patch
Modified: unstable/evolution-data-server/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/rules?rev=2078&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/rules (original)
+++ unstable/evolution-data-server/debian/rules Fri Dec 16 18:15:29 2011
@@ -5,7 +5,7 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/cdbs/1/rules/utils.mk
-#include /usr/share/cdbs/1/rules/autoreconf.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
More information about the pkg-evolution-commits
mailing list