r1604 - in /unstable/evolution-data-server/debian: ./ lintian/ patches/
corsac at users.alioth.debian.org
corsac at users.alioth.debian.org
Sun May 16 21:19:49 UTC 2010
Author: corsac
Date: Sun May 16 21:19:48 2010
New Revision: 1604
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1604
Log:
merge eds experimental into unstable
Added:
unstable/evolution-data-server/debian/libedata-cal1.2-7.install
- copied unchanged from r1603, experimental/evolution-data-server/debian/libedata-cal1.2-7.install
unstable/evolution-data-server/debian/lintian/libedata-cal1.2-7
- copied unchanged from r1603, experimental/evolution-data-server/debian/lintian/libedata-cal1.2-7
unstable/evolution-data-server/debian/patches/01_unitialized_key.patch
- copied unchanged from r1603, experimental/evolution-data-server/debian/patches/01_unitialized_key.patch
Removed:
unstable/evolution-data-server/debian/libedata-cal1.2-6.install
unstable/evolution-data-server/debian/lintian/libedata-cal1.2-6
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=1604&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog (original)
+++ unstable/evolution-data-server/debian/changelog Sun May 16 21:19:48 2010
@@ -1,3 +1,104 @@
+evolution-data-server (2.30.1-2) UNRELEASED; urgency=low
+
+ * New upstream bugfix release.
+ * 01_unitialized_key.patch: stolen upsteam. Fix a crasher.
+
+ -- Josselin Mouette <joss at debian.org> Thu, 29 Apr 2010 12:06:23 +0200
+
+evolution-data-server (2.30.1-1) experimental; urgency=low
+
+ * New upstream bugfix release.
+ * debian/libcamel1.2-14.shlibs: bump shlibs dependencies to 2.30.1.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 26 Apr 2010 20:08:48 +0200
+
+evolution-data-server (2.30.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/watch updated to track stable releases.
+ * debian/control:
+ - bump required GTK+ version to 2.18.
+ * debian/patches/25_mute-debug-messages.patch updated.
+ * debian/libcamel1.2-14.shlibs: bump shlibs dependencies to 2.30, conflicts
+ against 2.31.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Fri, 23 Apr 2010 08:37:40 +0200
+
+evolution-data-server (2.29.92-1) experimental; urgency=low
+
+ * New upstream release candidate.
+ * debian/control:
+ - add build-dep on gperf for imapx backend.
+ * debian/libcamel1.2-14.shlibs: bump shlibs.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 08 Mar 2010 23:15:54 +0100
+
+evolution-data-server (2.29.91-1) experimental; urgency=low
+
+ * New upstream development release.
+ * debian/libcamel1.2-14.shlibs: bump shlibs.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 23 Feb 2010 21:38:26 +0100
+
+evolution-data-server (2.29.90-1) experimental; urgency=low
+
+ * New upstream release candidate.
+ * debian/libcamel1.2-14.shlibs: bump shlibs.
+ * debian/control:
+ - bump standards version to 3.8.4.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 08 Feb 2010 22:31:13 +0100
+
+evolution-data-server (2.29.6-1) experimental; urgency=low
+
+ * New upstream development release.
+ * debian/patches:
+ - 66_fix-gtkdoc-call dropped.
+ - build with --enable-largefile.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 26 Jan 2010 22:59:43 +0100
+
+evolution-data-server (2.29.5-1) experimental; urgency=low
+
+ * New upstream development release.
+ * debian/control:
+ - rename package to libedata-cal-1.2-7 to match SONAME bump.
+ * debian/patches
+ - 66_fix-gtkdoc-call added, fix FTBFS with gtk-doc 1.13.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 14 Jan 2010 21:40:40 +0100
+
+evolution-data-server (2.29.3-1) experimental; urgency=low
+
+ * New upstream development release.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 02 Dec 2009 22:36:30 +0100
+
+evolution-data-server (2.29.2-1) experimental; urgency=low
+
+ [2.29.1]
+ * New upstream development release.
+ * debian/watch:
+ - updated to track development releases.
+ * debian/*.install:
+ - update eds folder to 2.30Â ;
+ - drop bonobo install folders ;
+ - drop bonobo interface files (.idl).
+ * debian/evolution-data-server-common.install:
+ - ship dbus services in eds-common.
+ * debian/control:
+ - drop liborbit, libbonobo and libglade build-deps.
+ - add dbus-glib build-dep ;
+ - drop libexchange packages, exchange supports doesn't exist anymore.
+ - cleanup deps for -dev packages.
+ * debian/patches:
+ - correct typo in 45_libcamel_providers_version.patch.
+
+ [2.29.2]
+ * New upstream development release.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 16 Nov 2009 21:53:26 +0100
+
evolution-data-server (2.28.3.1-1) unstable; urgency=low
* New upstream bugfix release.
Modified: unstable/evolution-data-server/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/control?rev=1604&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/control (original)
+++ unstable/evolution-data-server/debian/control Sun May 16 21:19:48 2010
@@ -33,18 +33,6 @@
liborbit2-dev (>= 1:2.9.8),
libglade2-dev,
libgnomeui-dev,
- libxml2-dev,
- libgconf2-dev,
- libnss3-dev,
- libgtk2.0-dev (>= 2.10.0),
- libgnome2-dev,
- libsoup2.4-dev,
- libgnome-keyring-dev (>= 2.20.1),
- gtk-doc-tools,
- libsqlite3-dev (>= 3.6),
- chrpath,
- libgweather-dev (>= 2.24.5),
- libical-dev,
libicu-dev
Package: evolution-data-server
@@ -75,7 +63,6 @@
Architecture: any
Depends: ${misc:Depends},
libgnome2-dev,
- libbonobo2-dev (>= 2.20.3)
Description: Development files for evolution-data-server (metapackage)
This package contains header files and static library of evolution-data-server.
@@ -108,8 +95,6 @@
libxml2-dev,
libglib2.0-dev (>= 2.16.1),
libgconf2-dev,
- libbonobo2-dev (>= 2.20.3),
- liborbit2-dev (>= 1:2.9.8),
libsoup2.4-dev,
libnspr4-dev
Description: Utility library for evolution data servers (development files)
@@ -168,7 +153,6 @@
Depends: libebook1.2-9 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
- libbonobo2-dev (>= 2.20.3),
libgnome2-dev,
libedataserver1.2-dev
Description: Client library for evolution address books (development files)
@@ -227,7 +211,6 @@
Depends: libedata-book1.2-2 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
- libbonobo2-dev (>= 2.20.3),
libgnome2-dev,
libedataserver1.2-dev,
libebackend1.2-dev,
@@ -256,7 +239,6 @@
${misc:Depends},
${shlibs:Depends},
libgnome2-dev,
- libbonobo2-dev (>= 2.20.3),
libical-dev (>= 0.43),
libedataserver1.2-dev
Description: Client library for evolution calendars (development files)
@@ -265,7 +247,7 @@
.
This package contains header files and static library for libecal1.2-7.
-Package: libedata-cal1.2-6
+Package: libedata-cal1.2-7
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
@@ -279,11 +261,10 @@
Package: libedata-cal1.2-dev
Section: libdevel
Architecture: any
-Depends: libedata-cal1.2-6 (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends},
- libgnome2-dev,
- libbonobo2-dev (>= 2.20.3),
+Depends: libedata-cal1.2-7 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+ libgnome2-dev,
libedataserver1.2-dev,
libecal1.2-dev,
libebackend1.2-dev,
@@ -292,7 +273,7 @@
Evolution is the integrated mail, calendar, task and address book
distributed suite from Novell, Inc.
.
- This package contains header files and static library for libedata-cal1.2-6.
+ This package contains header files and static library for libedata-cal1.2-7.
Package: libegroupwise1.2-13
Section: libs
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=1604&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libcamel1.2-14.shlibs (original)
+++ unstable/evolution-data-server/debian/libcamel1.2-14.shlibs Sun May 16 21:19:48 2010
@@ -1,2 +1,2 @@
-libcamel-1.2 14 libcamel1.2-14 (>= 2.27), libcamel1.2-14 (<< 2.29)
-libcamel-provider-1.2 14 libcamel1.2-14 (>= 2.27), libcamel1.2-14 (<< 2.29)
+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)
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=1604&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 May 16 21:19:48 2010
@@ -1,6 +1,7 @@
-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
+diff --git a/libedataserver/e-categories.c b/libedataserver/e-categories.c
+index 24ee076..5ef17cd 100644
+--- a/libedataserver/e-categories.c
++++ b/libedataserver/e-categories.c
@@ -30,6 +30,8 @@
#include "libedataserver-private.h"
@@ -10,39 +11,39 @@
typedef struct {
gchar *category;
gchar *icon_file;
-@@ -201,7 +203,7 @@
+@@ -202,7 +204,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) );
++ d (g_debug ("Saving categories to \"%s\"", filename));
/* build the file contents */
buffer = g_string_new ("<categories>\n");
-@@ -311,7 +313,7 @@
+@@ -303,7 +305,7 @@ load_categories (void)
if (!g_file_test (filename, G_FILE_TEST_EXISTS))
goto exit;
- g_debug ("Loading categories from \"%s\"", filename);
-+ d ( g_debug ("Loading categories from \"%s\"", filename) );
++ d (g_debug ("Loading categories from \"%s\"", filename));
if (!g_file_get_contents (filename, &contents, &length, &error)) {
g_warning ("Unable to load categories: %s", error->message);
-@@ -367,7 +369,7 @@
+@@ -359,7 +361,7 @@ migrate_old_categories (void)
if (string == NULL || *string == '\0')
goto exit;
- g_debug ("Loading categories from GConf key \"%s\"", key);
-+ d (g_debug ("Loading categories from GConf key \"%s\"", key) );
++ d (g_debug ("Loading categories from GConf key \"%s\"", key));
n_added = parse_categories (string, strlen (string));
if (n_added == 0)
-@@ -448,20 +450,20 @@
+@@ -440,20 +442,20 @@ initialize_categories (void)
n_added = load_categories ();
if (n_added > 0) {
- g_debug ("Loaded %d categories", n_added);
-+ d ( g_debug ("Loaded %d categories", n_added) );
++ d (g_debug ("Loaded %d categories", n_added));
save_is_pending = FALSE;
return;
}
@@ -50,14 +51,14 @@
n_added = migrate_old_categories ();
if (n_added > 0) {
- g_debug ("Loaded %d categories", n_added);
-+ d ( g_debug ("Loaded %d categories", n_added) );
++ d (g_debug ("Loaded %d categories", n_added));
save_categories ();
return;
}
load_default_categories ();
- g_debug ("Loaded default categories");
-+ d ( g_debug ("Loaded default categories") );
++ d (g_debug ("Loaded default categories"));
save_categories ();
}
Modified: unstable/evolution-data-server/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/rules?rev=1604&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/rules (original)
+++ unstable/evolution-data-server/debian/rules Sun May 16 21:19:48 2010
@@ -23,7 +23,12 @@
--with-krb5=/usr \
--with-libdb=/usr \
--enable-gtk-doc \
- --enable-gnome-keyring=yes
+ --enable-gnome-keyring=yes \
+ --enable-largefile
+
+#post-patches::
+# dh_testdir
+# autoreconf -vfi
DEB_FIXPERMS_EXCLUDE += usr/lib/evolution/camel-lock-helper*
More information about the pkg-evolution-commits
mailing list