Merge lp:~cyphermox/evolution-data-server/3.1.3.1 into lp:~ubuntu-desktop/evolution-data-server/ubuntu

[Mathieu Trudel-Lapierre]

[lp:~cyphermox/evolution-data-server/3.1.3.1]

99. By Mathieu Trudel-Lapierre on 2011-07-11

releasing version 3.1.3.1-0ubuntu1

[Mathieu Trudel-Lapierre (cyphermox)]

merging...

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-24 16:45:02 +0000
+++ debian/changelog	2011-07-11 20:34:05 +0000
@@ -1,3 +1,20 @@
+evolution-data-server (3.1.3.1-0ubuntu1) oneiric; urgency=low
+
+  * New upstream version.
+    - bgo 653385 - ldaps fails with server using self-signed certificate
+      (LP: #801828)
+    - bgo 565961 - Crash with recurring all-day event (LP: #474208)
+  * debian/rules: build with --disable-goa for now since it's not ready.
+  * debian/control: rename libcamel, libedataserverui packages according to
+    soname bump.
+  * debian/control: update evolution-data-server depends to require
+    libcamel-1.2-28.
+  * debian/libedataserverui-3.0-1.install, debian/libcamel-1.2-28.install:
+    rename to follow upstream soname change.
+  * debian/rules: update shlibs generation rules. 
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 11 Jul 2011 16:09:20 -0400
+
 evolution-data-server (3.1.2-0ubuntu1) oneiric; urgency=low
 
   * New upstream version

=== modified file 'debian/control'
--- debian/control	2011-06-23 21:40:22 +0000
+++ debian/control	2011-07-11 20:34:05 +0000
@@ -56,7 +56,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          evolution-data-server-common (= ${source:Version}),
-         libcamel-1.2-26 (= ${binary:Version})
+         libcamel-1.2-28 (= ${binary:Version})
 Suggests: evolution (>= 2.6.1),
           evolution-data-server-dbg (= ${binary:Version})
 Replaces: evolution-data-server1.2
@@ -135,7 +135,7 @@
  library. It can be used by packages using the GIRepository format to 
  generate dynamic bindings.
 
-Package: libcamel-1.2-26
+Package: libcamel-1.2-28
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -152,7 +152,7 @@
 Package: libcamel1.2-dev
 Section: libdevel
 Architecture: any
-Depends: libcamel-1.2-26 (= ${binary:Version}),
+Depends: libcamel-1.2-28 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          libglib2.0-dev,
@@ -211,7 +211,7 @@
  can be used by packages using the GIRepository format to generate
  dynamic bindings.
 
-Package: libedataserverui-3.0-0
+Package: libedataserverui-3.0-1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -227,7 +227,7 @@
 Package: libedataserverui-3.0-dev
 Section: libdevel
 Architecture: any
-Depends: libedataserverui-3.0-0 (= ${binary:Version}),
+Depends: libedataserverui-3.0-1 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          libgtk-3-dev,

=== renamed file 'debian/libcamel-1.2-26.install' => 'debian/libcamel-1.2-28.install'
=== renamed file 'debian/libedataserverui-3.0-0.install' => 'debian/libedataserverui-3.0-1.install'
=== modified file 'debian/rules'
--- debian/rules	2011-06-23 21:41:41 +0000
+++ debian/rules	2011-07-11 20:34:05 +0000
@@ -15,7 +15,7 @@
 DEB_SHLIBDEPS_INCLUDE += debian/tmp/usr/lib
 
 DEB_DH_MAKESHLIBS_ARGS_ALL += -V
-DEB_DH_MAKESHLIBS_ARGS_libcamel-1.2-26 += -V'libcamel-1.2-26 (>= $(DEB_GNOME_VERSION)), libcamel-1.2-26 (<< $(DEB_GNOME_NEXTVERSION))'
+DEB_DH_MAKESHLIBS_ARGS_libcamel-1.2-28 += -V'libcamel-1.2-28 (>= $(DEB_GNOME_VERSION)), libcamel-1.2-28 (<< $(DEB_GNOME_NEXTVERSION))'
 
 LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
@@ -26,6 +26,7 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS += --sysconfdir=/etc \
 	--libexecdir=\$${prefix}/lib/evolution \
+	--disable-goa \
 	--enable-ipv6 \
 	--enable-ssl \
 	--enable-nntp \