summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnome-extra/evolution-data-server/ChangeLog13
-rw-r--r--gnome-extra/evolution-data-server/evolution-data-server-1.10.1-r2.ebuild (renamed from gnome-extra/evolution-data-server/evolution-data-server-1.10.1-r1.ebuild)2
-rw-r--r--gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r4.ebuild (renamed from gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r3.ebuild)2
-rw-r--r--gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.1-r2 (renamed from gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.1-r1)0
-rw-r--r--gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r4 (renamed from gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r3)0
-rw-r--r--gnome-extra/evolution-data-server/files/evolution-data-server-APOP-auth-fix.patch7
6 files changed, 18 insertions, 6 deletions
diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index abb655663ace..a8f364f4b45d 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,17 @@
# ChangeLog for gnome-extra/evolution-data-server
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.115 2007/05/01 16:44:48 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.116 2007/05/03 12:06:33 pva Exp $
+
+*evolution-data-server-1.10.1-r2 (03 May 2007)
+*evolution-data-server-1.8.3-r4 (03 May 2007)
+
+ 03 May 2007; <pva@gentoo.org>
+ files/evolution-data-server-APOP-auth-fix.patch,
+ -evolution-data-server-1.8.3-r3.ebuild,
+ +evolution-data-server-1.8.3-r4.ebuild,
+ -evolution-data-server-1.10.1-r1.ebuild,
+ +evolution-data-server-1.10.1-r2.ebuild:
+ Respect String Freeze in the stable branch in ${PN}-APOP-auth-fix.patch.
*evolution-data-server-1.10.1-r1 (01 May 2007)
*evolution-data-server-1.8.3-r3 (01 May 2007)
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.10.1-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.10.1-r2.ebuild
index a28ca95cef39..5cfef77c35da 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.10.1-r1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.10.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.10.1-r1.ebuild,v 1.1 2007/05/01 16:44:48 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.10.1-r2.ebuild,v 1.1 2007/05/03 12:06:33 pva Exp $
inherit db-use eutils flag-o-matic gnome2 autotools
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r4.ebuild
index f015b08f7107..9efd73db59d6 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r3.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r3.ebuild,v 1.1 2007/05/01 16:44:48 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r4.ebuild,v 1.1 2007/05/03 12:06:33 pva Exp $
WANT_AUTOMAKE="1.9"
WANT_AUTOCONF="latest"
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.1-r1 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.1-r2
index 031700144864..031700144864 100644
--- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.1-r1
+++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.1-r2
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r3 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r4
index 0defb70b07af..0defb70b07af 100644
--- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r3
+++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r4
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-APOP-auth-fix.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-APOP-auth-fix.patch
index e1a814e008d9..301bfe3b4399 100644
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-APOP-auth-fix.patch
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-APOP-auth-fix.patch
@@ -1,5 +1,6 @@
---- branches/gnome-2-18/camel/providers/pop3/camel-pop3-store.c 2007/03/16 05:39:41 7656
-+++ branches/gnome-2-18/camel/providers/pop3/camel-pop3-store.c 2007/04/30 11:04:28 7723
+diff -Naur evolution-data-server-1.8.3.orig/camel/providers/pop3/camel-pop3-store.c evolution-data-server-1.8.3/camel/providers/pop3/camel-pop3-store.c
+--- evolution-data-server-1.8.3.orig/camel/providers/pop3/camel-pop3-store.c 2007-05-03 15:43:23.000000000 +0400
++++ evolution-data-server-1.8.3/camel/providers/pop3/camel-pop3-store.c 2007-05-03 15:49:15.000000000 +0400
@@ -34,6 +34,7 @@
#include <string.h>
#include <unistd.h>
@@ -20,7 +21,7 @@
+ if (!isascii((int)*d)) {
+
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-+ _("Unable to connect to POP server %s: "),
++ _("Could not connect to POP server %s"),
+ CAMEL_SERVICE (store)->url->host);
+
+ return FALSE;