r1543 - in /unstable/evolution-data-server/debian: changelog control patches/25_mute-debug-messages.patch patches/45_libcamel_providers_version.patch patches/65_evolution-color.patch
tao at users.alioth.debian.org
tao at users.alioth.debian.org
Wed Mar 3 03:07:19 UTC 2010
Author: tao
Date: Wed Mar 3 03:07:02 2010
New Revision: 1543
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1543
Log:
* New upstream bugfix release.
* debian/control:
- Add myself to uploaders.
* debian/patches:
- 25_mute-debug-messages: Regenerated.
- 45_libcamel_providers_version: Regenerated.
- 65_evolution-color: Regenerated.
Modified:
unstable/evolution-data-server/debian/changelog
unstable/evolution-data-server/debian/control
unstable/evolution-data-server/debian/patches/25_mute-debug-messages.patch
unstable/evolution-data-server/debian/patches/45_libcamel_providers_version.patch
unstable/evolution-data-server/debian/patches/65_evolution-color.patch
Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=1543&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Wed Mar 3 03:07:02 2010
@@ -1,3 +1,15 @@
+evolution-data-server (2.28.3.1-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+ * debian/control:
+ - Add myself to uploaders.
+ * debian/patches:
+ - 25_mute-debug-messages: Regenerated.
+ - 45_libcamel_providers_version: Regenerated.
+ - 65_evolution-color: Regenerated.
+
+ -- David Weinehall <tao at debian.org> Wed, 03 Mar 2010 04:37:24 +0200
+
evolution-data-server (2.28.3-1) unstable; urgency=low
* New upstream bugfix release. closes: #572112
Modified: unstable/evolution-data-server/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/control?rev=1543&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/control (original)
+++ unstable/evolution-data-server/debian/control Wed Mar 3 03:07:02 2010
@@ -10,7 +10,8 @@
Riccardo Setti <giskard at debian.org>,
Yves-Alexis Perez <corsac at debian.org>,
Pedro Fragoso <ember at ubuntu.com>,
- Josselin Mouette <joss at debian.org>
+ Josselin Mouette <joss at debian.org>,
+ David Weinehall <tao at debian.org>
Standards-Version: 3.8.4
Dm-Upload-Allowed: yes
Homepage: http://www.gnome.org/projects/evolution/
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=1543&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 Wed Mar 3 03:07:02 2010
@@ -1,6 +1,6 @@
-diff -ruN evolution-data-server-2.22.0.orig/libedataserver/e-categories.c evolution-data-server-2.22.0/libedataserver/e-categories.c
---- evolution-data-server-2.22.0.orig/libedataserver/e-categories.c 2007-11-29 13:53:48.000000000 +0100
-+++ evolution-data-server-2.22.0/libedataserver/e-categories.c 2008-03-11 21:01:54.000000000 +0100
+diff -urN evolution-data-server-2.28.3.1/libedataserver/e-categories.c evolution-data-server-2.28.3.1-patch/libedataserver/e-categories.c
+--- evolution-data-server-2.28.3.1/libedataserver/e-categories.c 2009-08-07 16:20:30.000000000 +0300
++++ evolution-data-server-2.28.3.1-patch/libedataserver/e-categories.c 2010-03-03 03:21:14.258395634 +0200
@@ -30,6 +30,8 @@
#include "libedataserver-private.h"
@@ -8,9 +8,9 @@
+#define d(x)
+
typedef struct {
- char *category;
- char *icon_file;
-@@ -162,7 +164,7 @@
+ gchar *category;
+ gchar *icon_file;
+@@ -201,7 +203,7 @@
filename = build_categories_filename ();
@@ -19,7 +19,7 @@
/* build the file contents */
buffer = g_string_new ("<categories>\n");
-@@ -268,7 +270,7 @@
+@@ -311,7 +313,7 @@
if (!g_file_test (filename, G_FILE_TEST_EXISTS))
goto exit;
@@ -28,7 +28,7 @@
if (!g_file_get_contents (filename, &contents, &length, &error)) {
g_warning ("Unable to load categories: %s", error->message);
-@@ -324,7 +326,7 @@
+@@ -367,7 +369,7 @@
if (string == NULL || *string == '\0')
goto exit;
@@ -37,7 +37,7 @@
n_added = parse_categories (string, strlen (string));
if (n_added == 0)
-@@ -401,20 +403,20 @@
+@@ -448,20 +450,20 @@
n_added = load_categories ();
if (n_added > 0) {
Modified: unstable/evolution-data-server/debian/patches/45_libcamel_providers_version.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/45_libcamel_providers_version.patch?rev=1543&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/45_libcamel_providers_version.patch (original)
+++ unstable/evolution-data-server/debian/patches/45_libcamel_providers_version.patch Wed Mar 3 03:07:02 2010
@@ -1,8 +1,7 @@
-diff --git a/evolution-data-server-2.27.91/configure b/evolution-data-server-2.27.91/configure
-index c2668d6..299e2ff 100755
---- a/evolution-data-server-2.27.91/configure
-+++ b/evolution-data-server-2.27.91/configure
-@@ -24791,7 +24791,7 @@ if test $use_gweather = yes; then
+diff -urN evolution-data-server-2.28.3.1/configure evolution-data-server-2.28.3.1-patch/configure
+--- evolution-data-server-2.28.3.1/configure 2010-03-02 08:36:33.000000000 +0200
++++ evolution-data-server-2.28.3.1-patch/configure 2010-03-03 03:23:31.930394594 +0200
+@@ -24800,7 +24800,7 @@
fi
@@ -11,16 +10,16 @@
INTERFACE_VERSION="$BASE_VERSION"
-diff --git a/evolution-data-server-2.27.91/configure.ac b/evolution-data-server-2.27.91/configure.ac
-index c89caff..a9f324d 100644
---- a/evolution-data-server-2.27.91/configure.ac
-+++ b/evolution-data-server-2.27.91/configure.ac
-@@ -1586,7 +1586,7 @@ if test $use_gweather = yes; then
+diff -urN evolution-data-server-2.28.3.1/configure.ac evolution-data-server-2.28.3.1-patch/configure.ac
+--- evolution-data-server-2.28.3.1/configure.ac 2010-03-02 08:29:38.000000000 +0200
++++ evolution-data-server-2.28.3.1-patch/configure.ac 2010-03-03 03:23:53.653903722 +0200
+@@ -1586,8 +1586,7 @@
fi
dnl separate camel from e-d-s? or should it be under the same spot? same for now.
-camel_providerdir='${libdir}'/evolution-data-server-$API_VERSION/camel-providers
+-AC_SUBST(camel_providerdir)
+camel_providerdir='${libdir}'/evolution-data-server-$API_VERSION/camel-providers-`expr ${LIBCANEL_CURRENT} - ${LIBCAMEL_AGE}`
- AC_SUBST(camel_providerdir)
dnl IDL/Component Versioning
+ INTERFACE_VERSION="$BASE_VERSION"
Modified: unstable/evolution-data-server/debian/patches/65_evolution-color.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/65_evolution-color.patch?rev=1543&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/65_evolution-color.patch (original)
+++ unstable/evolution-data-server/debian/patches/65_evolution-color.patch Wed Mar 3 03:07:02 2010
@@ -1,6 +1,7 @@
---- evolution-data-server-2.22.1.orig/libedataserver/e-source.c
-+++ evolution-data-server-2.22.1/libedataserver/e-source.c
-@@ -689,7 +689,7 @@
+diff -urN evolution-data-server-2.28.3.1/libedataserver/e-source.c evolution-data-server-2.28.3.1-patch/libedataserver/e-source.c
+--- evolution-data-server-2.28.3.1/libedataserver/e-source.c 2009-08-07 16:20:30.000000000 +0300
++++ evolution-data-server-2.28.3.1-patch/libedataserver/e-source.c 2010-03-03 03:17:43.901896131 +0200
+@@ -690,7 +690,7 @@
guint32 *color_return)
{
const gchar *color_spec;
@@ -9,7 +10,7 @@
g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
-@@ -698,9 +698,23 @@
+@@ -699,9 +699,23 @@
if (color_spec == NULL)
return FALSE;
More information about the pkg-evolution-commits
mailing list