diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 6d20dc23cbe..478a0e714a6 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -1,14 +1,14 @@
-# $OpenBSD: Makefile,v 1.3 2004/11/22 16:59:29 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2004/12/11 06:03:08 marcm Exp $
 
 COMMENT=		"data backends for the Evolution mail/PIM suite"
 
-DISTNAME=		evolution-data-server-0.0.94.1
+DISTNAME=		evolution-data-server-1.0.3
 CATEGORIES=		databases
 
 HOMEPAGE=		http://www.gnome.org
 MAINTAINER=		Marc Matteo <marcm@openbsd.org>
 
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evolution-data-server/0.0/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evolution-data-server/1.0/}
 EXTRACT_SUFX=           .tar.bz2
 
 # GPL
@@ -24,23 +24,21 @@ WANTLIB=		ORBit-2.0.0 ORBitCosNaming-2.0.0 \
 			gnomevfs-2.0.0 gobject-2.0.0.0 gthread-2.0.0.0 \
 			popt xml2
 
-
-
 MODULES=		devel/gettext
 
 BUILD_DEPENDS=		:bison-*:devel/bison \
-			:pkgconfig->=0.12.0p1:devel/pkgconfig \
+			:pkgconfig-*:devel/pkgconfig \
 			:p5-XML-Parser-*:textproc/p5-XML-Parser
 LIB_DEPENDS= 		gnome-2::x11/gnome/libgnome \
-			soup-2.2.3.1::devel/libsoup
+			lber.7,ldap.7::databases/openldap \
+			soup-2.2.7.0::devel/libsoup
 
 USE_GMAKE=		Yes
 YACC=			bison
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	--disable-gtk-doc
 CONFIGURE_ARGS+=	--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/evolution-data-server
-# Flavor?
-#CONFIGURE_ARGS+= 	--with-openldap=yes
+CONFIGURE_ARGS+= 	--with-openldap=${LOCALBASE}
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index e70b3bf66ff..4fd76896194 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (evolution-data-server-0.0.94.1.tar.bz2) = 90fc1c9a7fc3c1398ba1a76d3b3f6c45
-RMD160 (evolution-data-server-0.0.94.1.tar.bz2) = 39eef562acf8f988fd9e05f59fc33e43a8661f28
-SHA1 (evolution-data-server-0.0.94.1.tar.bz2) = 642a68eac956090ac4a3e4161e7c1b10358c6edd
+MD5 (evolution-data-server-1.0.3.tar.bz2) = 6fc9aa8178540828c0056e2b070b7546
+RMD160 (evolution-data-server-1.0.3.tar.bz2) = 4b8cdd331b17219a7ce57de4595423e26269def2
+SHA1 (evolution-data-server-1.0.3.tar.bz2) = 3d5c886786e2662016fd4cc4d9b0250a1861bdc8
diff --git a/databases/evolution-data-server/patches/patch-addressbook_backends_groupwise_e-book-backend-groupwise_c b/databases/evolution-data-server/patches/patch-addressbook_backends_groupwise_e-book-backend-groupwise_c
deleted file mode 100644
index 079c5a20910..00000000000
--- a/databases/evolution-data-server/patches/patch-addressbook_backends_groupwise_e-book-backend-groupwise_c
+++ /dev/null
@@ -1,36 +0,0 @@
-$OpenBSD: patch-addressbook_backends_groupwise_e-book-backend-groupwise_c,v 1.1.1.1 2004/06/25 16:21:32 marcm Exp $
---- addressbook/backends/groupwise/e-book-backend-groupwise.c.orig	Fri Jun 11 08:00:38 2004
-+++ addressbook/backends/groupwise/e-book-backend-groupwise.c	Thu Jun 24 23:53:16 2004
-@@ -456,9 +456,9 @@ populate_birth_date (EContact *contact, 
- {
- 	EGwItem *item;
-   
--	item = E_GW_ITEM (data);
- 	char *value ;
- 	EContactDate *date;
-+	item = E_GW_ITEM (data);
- 	value = e_gw_item_get_field_value (item, "birthday");
-  	if (value) {
- 		date =  e_contact_date_from_string (value);
-@@ -539,9 +539,9 @@ set_emails_in_gw_item (EGwItem *item, gp
- 	GList *email_list;
- 	EContact *contact;
- 	char *email;
--	contact = E_CONTACT (data);
- 	int i;
- 
-+	contact = E_CONTACT (data);
- 	email_list = NULL;
- 	for (i =0 ; i < 3; i++) {
- 		email = e_contact_get (contact, email_fields[i]);
-@@ -609,9 +609,9 @@ static void 
- populate_full_name (EContact *contact, gpointer data)
- {
- 	EGwItem *item;
--	item = E_GW_ITEM(data);
- 	FullName  *full_name ;
- 	char *full_name_string;
-+	item = E_GW_ITEM(data);
- 
- 	full_name = e_gw_item_get_full_name (item);
- 	if (full_name) {
diff --git a/databases/evolution-data-server/patches/patch-calendar_backends_groupwise_e-cal-backend-groupwise_c b/databases/evolution-data-server/patches/patch-calendar_backends_groupwise_e-cal-backend-groupwise_c
new file mode 100644
index 00000000000..fce96f29239
--- /dev/null
+++ b/databases/evolution-data-server/patches/patch-calendar_backends_groupwise_e-cal-backend-groupwise_c
@@ -0,0 +1,24 @@
+$OpenBSD: patch-calendar_backends_groupwise_e-cal-backend-groupwise_c,v 1.1 2004/12/11 06:03:08 marcm Exp $
+--- calendar/backends/groupwise/e-cal-backend-groupwise.c.orig	Mon Oct 11 15:47:09 2004
++++ calendar/backends/groupwise/e-cal-backend-groupwise.c	Mon Oct 11 15:48:22 2004
+@@ -512,13 +512,13 @@ e_cal_backend_groupwise_get_alarm_email_
+ static ECalBackendSyncStatus
+ e_cal_backend_groupwise_get_static_capabilities (ECalBackendSync *backend, EDataCal *cal, char **capabilities)
+ {
+-	*capabilities = g_strdup (CAL_STATIC_CAPABILITY_NO_EMAIL_ALARMS "," \
+-				  CAL_STATIC_CAPABILITY_ONE_ALARM_ONLY "," \
+-				  CAL_STATIC_CAPABILITY_REMOVE_ALARMS ","   \
+-	                          CAL_STATIC_CAPABILITY_NO_THISANDPRIOR "," \
+-				  CAL_STATIC_CAPABILITY_NO_THISANDFUTURE "," \
+-				  CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK "," \
+-				  CAL_STATIC_CAPABILITY_NO_CONV_TO_RECUR "," \ 
++	*capabilities = g_strdup (CAL_STATIC_CAPABILITY_NO_EMAIL_ALARMS "," 
++				  CAL_STATIC_CAPABILITY_ONE_ALARM_ONLY "," 
++				  CAL_STATIC_CAPABILITY_REMOVE_ALARMS "," 
++	                          CAL_STATIC_CAPABILITY_NO_THISANDPRIOR "," 
++				  CAL_STATIC_CAPABILITY_NO_THISANDFUTURE "," 
++				  CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK "," 
++				  CAL_STATIC_CAPABILITY_NO_CONV_TO_RECUR "," 
+ 				  CAL_STATIC_CAPABILITY_SAVE_SCHEDULES);
+ 
+ 	return GNOME_Evolution_Calendar_Success;
diff --git a/databases/evolution-data-server/patches/patch-libdb_dist_configure b/databases/evolution-data-server/patches/patch-libdb_dist_configure
index ccac113b6ea..45e23847af8 100644
--- a/databases/evolution-data-server/patches/patch-libdb_dist_configure
+++ b/databases/evolution-data-server/patches/patch-libdb_dist_configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-libdb_dist_configure,v 1.1.1.1 2004/06/25 16:21:32 marcm Exp $
---- libdb/dist/configure.orig	2004-02-13 12:09:05.000000000 -0800
-+++ libdb/dist/configure	2004-04-09 21:35:09.000000000 -0700
-@@ -7948,7 +7948,7 @@ _ACEOF
+$OpenBSD: patch-libdb_dist_configure,v 1.2 2004/12/11 06:03:08 marcm Exp $
+--- libdb/dist/configure.orig	Mon Oct 11 12:04:13 2004
++++ libdb/dist/configure	Wed Oct 13 21:17:46 2004
+@@ -7756,7 +7756,7 @@ _ACEOF
      hardcode_direct=yes
      hardcode_shlibpath_var=no
      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -10,7 +10,7 @@ $OpenBSD: patch-libdb_dist_configure,v 1.1.1.1 2004/06/25 16:21:32 marcm Exp $
        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
        export_dynamic_flag_spec='${wl}-E'
      else
-@@ -7958,7 +7958,7 @@ _ACEOF
+@@ -7766,7 +7766,7 @@ _ACEOF
  	hardcode_libdir_flag_spec='-R$libdir'
          ;;
        *)
diff --git a/databases/evolution-data-server/patches/patch-ltmain_sh b/databases/evolution-data-server/patches/patch-ltmain_sh
index 3ad81832867..896cbf47739 100644
--- a/databases/evolution-data-server/patches/patch-ltmain_sh
+++ b/databases/evolution-data-server/patches/patch-ltmain_sh
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2004/06/25 16:21:32 marcm Exp $
---- ltmain.sh.orig	2004-02-12 03:45:26.000000000 -0800
-+++ ltmain.sh	2004-05-02 10:11:56.000000000 -0700
-@@ -1847,9 +1847,12 @@ EOF
+$OpenBSD: patch-ltmain_sh,v 1.2 2004/12/11 06:03:08 marcm Exp $
+--- ltmain.sh.orig	Thu Aug 19 13:37:57 2004
++++ ltmain.sh	Sun Sep  5 20:41:54 2004
+@@ -1978,9 +1978,12 @@ EOF
  	  if test "$linkmode,$pass" = "prog,link"; then
  	    compile_deplibs="$deplib $compile_deplibs"
  	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -16,7 +16,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2004/06/25 16:21:32 marcm Exp $
  	  continue
  	  ;;
  	-l*)
-@@ -2262,10 +2265,6 @@ EOF
+@@ -2417,10 +2420,6 @@ EOF
  	link_static=no # Whether the deplib will be linked statically
  	if test -n "$library_names" &&
  	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
@@ -25,11 +25,11 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2004/06/25 16:21:32 marcm Exp $
 -	    need_relink=yes
 -	  fi
  	  # This is a shared library
- 	
-       # Warn about portability, can't link against -module's on some systems (darwin)
-@@ -5804,40 +5803,6 @@ relink_command=\"$relink_command\""
+ 
+ 	  # Warn about portability, can't link against -module's on
+@@ -5807,40 +5806,6 @@ relink_command=\"$relink_command\""
      # Exit here if they wanted silent mode.
-     test "$show" = : && exit 0
+     test "$show" = : && exit $EXIT_SUCCESS
  
 -    $echo "----------------------------------------------------------------------"
 -    $echo "Libraries have been installed in:"
@@ -65,6 +65,6 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2004/06/25 16:21:32 marcm Exp $
 -    $echo "See any operating system documentation about shared libraries for"
 -    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
 -    $echo "----------------------------------------------------------------------"
-     exit 0
+     exit $EXIT_SUCCESS
      ;;
  
diff --git a/databases/evolution-data-server/pkg/PFRAG.shared b/databases/evolution-data-server/pkg/PFRAG.shared
index bed73b8ef49..c279dfa310d 100644
--- a/databases/evolution-data-server/pkg/PFRAG.shared
+++ b/databases/evolution-data-server/pkg/PFRAG.shared
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2004/09/14 23:31:45 espie Exp $
-@lib lib/libebook.so.7.0
-@lib lib/libecal.so.7.0
-@lib lib/libedata-book.so.0.7
-@lib lib/libedata-cal.so.6.1
-@lib lib/libedataserver.so.4.0
-@lib lib/libegroupwise.so.1.1
+@comment $OpenBSD: PFRAG.shared,v 1.3 2004/12/11 06:03:08 marcm Exp $
+@lib lib/libebook.so.8.6
+@lib lib/libecal.so.9.0
+@lib lib/libedata-book.so.1.1
+@lib lib/libedata-cal.so.6.5
+@lib lib/libedataserver.so.5.2
+@lib lib/libegroupwise.so.6.0
diff --git a/databases/evolution-data-server/pkg/PLIST b/databases/evolution-data-server/pkg/PLIST
index 5da63cf7cf2..1d622663af3 100644
--- a/databases/evolution-data-server/pkg/PLIST
+++ b/databases/evolution-data-server/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/14 23:31:45 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2004/12/11 06:03:08 marcm Exp $
+%%SHARED%%
 include/evolution-data-server-1.0/
 include/evolution-data-server-1.0/groupwise/
 include/evolution-data-server-1.0/groupwise/e-gw-connection.h
@@ -9,7 +10,6 @@ include/evolution-data-server-1.0/groupwise/e-gw-message.h
 include/evolution-data-server-1.0/libebook/
 include/evolution-data-server-1.0/libebook/Evolution-DataServer-Addressbook.h
 include/evolution-data-server-1.0/libebook/e-address-western.h
-include/evolution-data-server-1.0/libebook/e-book-async.h
 include/evolution-data-server-1.0/libebook/e-book-listener.h
 include/evolution-data-server-1.0/libebook/e-book-query.h
 include/evolution-data-server-1.0/libebook/e-book-types.h
@@ -136,6 +136,7 @@ lib/pkgconfig/libedataserver-1.0.pc
 lib/pkgconfig/libegroupwise-1.0.pc
 libexec/evolution-data-server-1.0
 share/evolution-data-server-1.0/
+share/evolution-data-server-1.0/evolutionperson.schema
 share/evolution-data-server-1.0/zoneinfo/
 share/evolution-data-server-1.0/zoneinfo/Africa/
 share/evolution-data-server-1.0/zoneinfo/Africa/Abidjan.ics
@@ -550,24 +551,26 @@ share/gtk-doc/html/libebook/libebook-e-book-query.html
 share/gtk-doc/html/libebook/libebook-e-book-types.html
 share/gtk-doc/html/libebook/libebook.devhelp
 share/gtk-doc/html/libebook/right.png
+share/gtk-doc/html/libebook/style.css
 share/gtk-doc/html/libebook/up.png
 share/gtk-doc/html/libecal/
 share/gtk-doc/html/libecal/ECal.html
 share/gtk-doc/html/libecal/ECalComponent.html
-share/gtk-doc/html/libecal/ECalListener.html
-share/gtk-doc/html/libecal/ECalView.html
-share/gtk-doc/html/libecal/ECalViewListener.html
 share/gtk-doc/html/libecal/ch01.html
 share/gtk-doc/html/libecal/home.png
 share/gtk-doc/html/libecal/index.html
 share/gtk-doc/html/libecal/index.sgml
 share/gtk-doc/html/libecal/left.png
+share/gtk-doc/html/libecal/libecal-ECalListener.html
+share/gtk-doc/html/libecal/libecal-ECalView.html
+share/gtk-doc/html/libecal/libecal-ECalViewListener.html
 share/gtk-doc/html/libecal/libecal-e-cal-recur.html
 share/gtk-doc/html/libecal/libecal-e-cal-time-util.html
 share/gtk-doc/html/libecal/libecal-e-cal-types.html
 share/gtk-doc/html/libecal/libecal-e-cal-util.html
 share/gtk-doc/html/libecal/libecal.devhelp
 share/gtk-doc/html/libecal/right.png
+share/gtk-doc/html/libecal/style.css
 share/gtk-doc/html/libecal/up.png
 share/idl/
 share/idl/evolution-data-server-1.0/
@@ -576,81 +579,100 @@ share/idl/evolution-data-server-1.0/Evolution-DataServer-Calendar.idl
 share/idl/evolution-data-server-1.0/Evolution-DataServer.idl
 share/locale/am/
 share/locale/am/LC_MESSAGES/
-share/locale/am/LC_MESSAGES/evolution-data-server-1.5.mo
+share/locale/am/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/ar/
+share/locale/ar/LC_MESSAGES/
+share/locale/ar/LC_MESSAGES/evolution-data-server-1.0.mo
 share/locale/az/
 share/locale/az/LC_MESSAGES/
-share/locale/az/LC_MESSAGES/evolution-data-server-1.5.mo
+share/locale/az/LC_MESSAGES/evolution-data-server-1.0.mo
 share/locale/be/
 share/locale/be/LC_MESSAGES/
-share/locale/be/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/bg/LC_MESSAGES/evolution-data-server-1.5.mo
+share/locale/be/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/bg/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/bn/
+share/locale/bn/LC_MESSAGES/
+share/locale/bn/LC_MESSAGES/evolution-data-server-1.0.mo
 share/locale/ca/
 share/locale/ca/LC_MESSAGES/
-share/locale/ca/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/cs/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/da/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/de/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/el/LC_MESSAGES/evolution-data-server-1.5.mo
+share/locale/ca/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/cs/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/cy/
+share/locale/cy/LC_MESSAGES/
+share/locale/cy/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/da/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/de/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/el/LC_MESSAGES/evolution-data-server-1.0.mo
 share/locale/en_AU/
 share/locale/en_AU/LC_MESSAGES/
-share/locale/en_AU/LC_MESSAGES/evolution-data-server-1.5.mo
+share/locale/en_AU/LC_MESSAGES/evolution-data-server-1.0.mo
 share/locale/en_CA/
 share/locale/en_CA/LC_MESSAGES/
-share/locale/en_CA/LC_MESSAGES/evolution-data-server-1.5.mo
+share/locale/en_CA/LC_MESSAGES/evolution-data-server-1.0.mo
 share/locale/en_GB/
 share/locale/en_GB/LC_MESSAGES/
-share/locale/en_GB/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/es/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/et/LC_MESSAGES/evolution-data-server-1.5.mo
+share/locale/en_GB/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/es/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/et/LC_MESSAGES/evolution-data-server-1.0.mo
 share/locale/eu/
 share/locale/eu/LC_MESSAGES/
-share/locale/eu/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/fi/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/fr/LC_MESSAGES/evolution-data-server-1.5.mo
+share/locale/eu/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/fa/
+share/locale/fa/LC_MESSAGES/
+share/locale/fa/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/fi/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/fr/LC_MESSAGES/evolution-data-server-1.0.mo
 share/locale/ga/
 share/locale/ga/LC_MESSAGES/
-share/locale/ga/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/gl/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/hr/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/hu/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/it/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/ja/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/ko/LC_MESSAGES/evolution-data-server-1.5.mo
+share/locale/ga/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/gl/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/gu/
+share/locale/gu/LC_MESSAGES/
+share/locale/gu/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/hr/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/hu/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/id/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/it/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/ja/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/ko/LC_MESSAGES/evolution-data-server-1.0.mo
 share/locale/lt/
 share/locale/lt/LC_MESSAGES/
-share/locale/lt/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/lv/LC_MESSAGES/evolution-data-server-1.5.mo
+share/locale/lt/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/lv/LC_MESSAGES/evolution-data-server-1.0.mo
 share/locale/mn/
 share/locale/mn/LC_MESSAGES/
-share/locale/mn/LC_MESSAGES/evolution-data-server-1.5.mo
+share/locale/mn/LC_MESSAGES/evolution-data-server-1.0.mo
 share/locale/ms/
 share/locale/ms/LC_MESSAGES/
-share/locale/ms/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/nl/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/nn/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/no/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/pl/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/pt/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/pt_BR/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/ro/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/ru/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/sk/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/sl/LC_MESSAGES/evolution-data-server-1.5.mo
+share/locale/ms/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/nb/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/nl/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/nn/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/no/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/pa/
+share/locale/pa/LC_MESSAGES/
+share/locale/pa/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/pl/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/pt/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/pt_BR/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/ro/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/ru/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/sk/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/sl/LC_MESSAGES/evolution-data-server-1.0.mo
 share/locale/sq/
 share/locale/sq/LC_MESSAGES/
-share/locale/sq/LC_MESSAGES/evolution-data-server-1.5.mo
+share/locale/sq/LC_MESSAGES/evolution-data-server-1.0.mo
 share/locale/sr/
 share/locale/sr/LC_MESSAGES/
-share/locale/sr/LC_MESSAGES/evolution-data-server-1.5.mo
+share/locale/sr/LC_MESSAGES/evolution-data-server-1.0.mo
 share/locale/sr@Latn/
 share/locale/sr@Latn/LC_MESSAGES/
-share/locale/sr@Latn/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/sv/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/tr/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/uk/LC_MESSAGES/evolution-data-server-1.5.mo
+share/locale/sr@Latn/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/sv/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/tr/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/uk/LC_MESSAGES/evolution-data-server-1.0.mo
 share/locale/vi/
 share/locale/vi/LC_MESSAGES/
-share/locale/vi/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/zh_CN/LC_MESSAGES/evolution-data-server-1.5.mo
-share/locale/zh_TW/LC_MESSAGES/evolution-data-server-1.5.mo
-%%SHARED%%
+share/locale/vi/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/zh_CN/LC_MESSAGES/evolution-data-server-1.0.mo
+share/locale/zh_TW/LC_MESSAGES/evolution-data-server-1.0.mo