r1658 - in /unstable/evolution-data-server/debian: ./ patches/
corsac at users.alioth.debian.org
corsac at users.alioth.debian.org
Sun Jun 20 22:24:37 UTC 2010
Author: corsac
Date: Sun Jun 20 22:24:36 2010
New Revision: 1658
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1658
Log:
* New upstream release.
* debian/patches:
- 01_unitialized_key, 02_fix-warning-in_source_get_uri,
03_bump-soname-libedataserver dropped, included upstream.
- 25_mute-debug-messages updated.
* debian/libcamel1.2-14.shlibs updated for 2.30.2.
* debian/control:
- bump debhelper build-dep to 7.2.3 for dh_bugfiles.
Removed:
unstable/evolution-data-server/debian/patches/01_unitialized_key.patch
unstable/evolution-data-server/debian/patches/02_fix-warning-in_source_get_uri.patch
unstable/evolution-data-server/debian/patches/03_bump-soname-libedataserver.patch
Modified:
unstable/evolution-data-server/debian/changelog
unstable/evolution-data-server/debian/control
unstable/evolution-data-server/debian/libcamel1.2-14.shlibs
unstable/evolution-data-server/debian/patches/25_mute-debug-messages.patch
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=1658&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Sun Jun 20 22:24:36 2010
@@ -1,12 +1,20 @@
-evolution-data-server (2.30.1-6) UNRELEASED; urgency=low
-
+evolution-data-server (2.30.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
* debian/watch:
- update rule to order hrefs correctly.
- install some information on bug reporting
* debian/bug-presubj: warn user that she should report upstream issues
directly to upstream bugzilla because of lack of time and manpower.
-
- -- Yves-Alexis Perez <corsac at debian.org> Thu, 17 Jun 2010 08:06:00 +0200
+ * debian/patches:
+ - 01_unitialized_key, 02_fix-warning-in_source_get_uri,
+ 03_bump-soname-libedataserver dropped, included upstream.
+ - 25_mute-debug-messages updated.
+ * debian/libcamel1.2-14.shlibs updated for 2.30.2.
+ * debian/control:
+ - bump debhelper build-dep to 7.2.3 for dh_bugfiles.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 21 Jun 2010 00:19:01 +0200
evolution-data-server (2.30.1-5) unstable; urgency=low
Modified: unstable/evolution-data-server/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/control?rev=1658&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/control (original)
+++ unstable/evolution-data-server/debian/control Sun Jun 20 22:24:36 2010
@@ -17,7 +17,7 @@
Homepage: http://www.gnome.org/projects/evolution/
Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/unstable/evolution-data-server
Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server
-Build-Depends: debhelper (>= 5.0.0),
+Build-Depends: debhelper (>= 7.2.3~),
cdbs (>= 0.4.37),
dh-autoreconf,
dpkg-dev (>= 1.14.16),
Modified: unstable/evolution-data-server/debian/libcamel1.2-14.shlibs
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libcamel1.2-14.shlibs?rev=1658&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libcamel1.2-14.shlibs (original)
+++ unstable/evolution-data-server/debian/libcamel1.2-14.shlibs Sun Jun 20 22:24:36 2010
@@ -1,2 +1,2 @@
-libcamel-1.2 14 libcamel1.2-14 (>= 2.30.1), libcamel1.2-14 (<< 2.31)
-libcamel-provider-1.2 14 libcamel1.2-14 (>= 2.30.1), libcamel1.2-14 (<< 2.31)
+libcamel-1.2 14 libcamel1.2-14 (>= 2.30.2), libcamel1.2-14 (<< 2.31)
+libcamel-provider-1.2 14 libcamel1.2-14 (>= 2.30.2), libcamel1.2-14 (<< 2.31)
Modified: unstable/evolution-data-server/debian/patches/25_mute-debug-messages.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/25_mute-debug-messages.patch?rev=1658&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/25_mute-debug-messages.patch (original)
+++ unstable/evolution-data-server/debian/patches/25_mute-debug-messages.patch Sun Jun 20 22:24:36 2010
@@ -1,26 +1,26 @@
diff --git a/libedataserver/e-categories.c b/libedataserver/e-categories.c
-index 24ee076..5ef17cd 100644
+index c581efd..277ca50 100644
--- a/libedataserver/e-categories.c
+++ b/libedataserver/e-categories.c
-@@ -30,6 +30,8 @@
+@@ -26,6 +26,8 @@
#include "libedataserver-private.h"
+#define d(x)
+
typedef struct {
- gchar *category;
- gchar *icon_file;
-@@ -202,7 +204,7 @@ idle_saver_cb (gpointer user_data)
+ gchar *display_name; /* localized category name */
+ gchar *clocale_name; /* only for default categories */
+@@ -204,7 +206,7 @@ idle_saver_cb (gpointer user_data)
filename = build_categories_filename ();
-
+
- g_debug ("Saving categories to \"%s\"", filename);
+ d (g_debug ("Saving categories to \"%s\"", filename));
- /* build the file contents */
+ /* Build the file contents. */
buffer = g_string_new ("<categories>\n");
-@@ -303,7 +305,7 @@ load_categories (void)
+@@ -348,7 +350,7 @@ load_categories (void)
if (!g_file_test (filename, G_FILE_TEST_EXISTS))
goto exit;
@@ -29,7 +29,7 @@
if (!g_file_get_contents (filename, &contents, &length, &error)) {
g_warning ("Unable to load categories: %s", error->message);
-@@ -359,7 +361,7 @@ migrate_old_categories (void)
+@@ -404,7 +406,7 @@ migrate_old_categories (void)
if (string == NULL || *string == '\0')
goto exit;
@@ -38,7 +38,7 @@
n_added = parse_categories (string, strlen (string));
if (n_added == 0)
-@@ -440,20 +442,20 @@ initialize_categories (void)
+@@ -489,20 +491,20 @@ initialize_categories (void)
n_added = load_categories ();
if (n_added > 0) {
Modified: unstable/evolution-data-server/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/rules?rev=1658&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/rules (original)
+++ unstable/evolution-data-server/debian/rules Sun Jun 20 22:24:36 2010
@@ -35,5 +35,5 @@
chrpath -d -k $(CURDIR)/debian/evolution-data-server/usr/lib/evolution-data-server-1.2/*/*.so \
$(CURDIR)/debian/evolution-data-server/usr/lib/evolution/camel*1.2
-install::
+binary-post-install::
dh_bugfiles -A
More information about the pkg-evolution-commits
mailing list