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

[Mathieu Trudel-Lapierre]

[Ken VanDine (ken-vandine)]

Looks good!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-23 19:38:02 +0000
+++ debian/changelog	2011-06-24 16:06:45 +0000
@@ -1,12 +1,28 @@
 evolution-data-server (3.1.2-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream version
+    - bgo 589495 - Search folder by Size (KB) counts bytes, not KB (LP: #385859)
+    - bgo 649757 - Filtering on a source account always succeeded (LP: #781391)
+    - bgo 418954 - Add a separate entry combo for port numbers (LP: #160304)
+
+  [ Ken VanDine ]
   * debian/libebook1.2-dev.install
     - Include EBook-1.2.gir
   * debian/control
     - Added gir1.2-ebook-1.2 binary
 
- -- Ken VanDine <[e-mail]>  Thu, 23 Jun 2011 14:57:50 -0400
+  [ Mathieu Trudel-Lapierre ]
+  * debian/control: drop libegroupwise1.2-13, libegroupwise-dev, they are now
+    an independent module.
+  * debian/libegroupwise1.2-13.install,
+    debian/libegroupwise1.2-dev.install,
+    debian/lintian/libegroupwise1.2-13: dropped, see above.
+  * debian/control, debian/libe*.install, debian/lintian/libe*: rename and
+    update files where needed to follow upstream soname changes.
+  * debian/control: bump evolution-data-server's Depends to libcamel-1.2-26.
+  * debian/rules: update to use makeshlibs with the new libcamel soname.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 23 Jun 2011 17:40:41 -0400
 
 evolution-data-server (3.0.2.1-0ubuntu1) oneiric; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2011-06-23 19:18:16 +0000
+++ debian/control	2011-06-24 16:06:45 +0000
@@ -56,7 +56,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          evolution-data-server-common (= ${source:Version}),
-         libcamel-1.2-23 (= ${binary:Version})
+         libcamel-1.2-26 (= ${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-23
+Package: libcamel-1.2-26
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -152,7 +152,7 @@
 Package: libcamel1.2-dev
 Section: libdevel
 Architecture: any
-Depends: libcamel-1.2-23 (= ${binary:Version}),
+Depends: libcamel-1.2-26 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          libglib2.0-dev,
@@ -170,7 +170,7 @@
  Evolution is the integrated mail, calendar, task and address book
  distributed suite from Novell, Inc.
 
-Package: libebook1.2-10
+Package: libebook1.2-11
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -184,7 +184,7 @@
 Package: libebook1.2-dev
 Section: libdevel
 Architecture: any
-Depends: libebook1.2-10 (= ${binary:Version}),
+Depends: libebook1.2-11 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          libedataserver1.2-dev,
@@ -240,7 +240,7 @@
  This package contains header files and static library for
  libedataserverui.
 
-Package: libedata-book-1.2-9
+Package: libedata-book-1.2-10
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -254,7 +254,7 @@
 Package: libedata-book1.2-dev
 Section: libdevel
 Architecture: any
-Depends: libedata-book-1.2-9 (= ${binary:Version}),
+Depends: libedata-book-1.2-10 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          libedataserver1.2-dev,
@@ -266,7 +266,7 @@
  .
  This package contains header files and static library for libedata-book.
 
-Package: libecal1.2-8
+Package: libecal1.2-9
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -280,7 +280,7 @@
 Package: libecal1.2-dev
 Section: libdevel
 Architecture: any
-Depends: libecal1.2-8 (= ${binary:Version}),
+Depends: libecal1.2-9 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          libical-dev (>= 0.43),
@@ -306,7 +306,7 @@
  can be used by packages using the GIRepository format to generate 
  dynamic bindings.
 
-Package: libedata-cal-1.2-11
+Package: libedata-cal-1.2-12
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -320,7 +320,7 @@
 Package: libedata-cal1.2-dev
 Section: libdevel
 Architecture: any
-Depends: libedata-cal-1.2-11 (= ${binary:Version}),
+Depends: libedata-cal-1.2-12 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          libical-dev (>= 0.43),
@@ -333,34 +333,6 @@
  .
  This package contains header files and static library for libedata-cal.
 
-Package: libegroupwise1.2-13
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: Client library for accessing groupwise POA through SOAP interface
- This package is a client library for accessing groupwise POA through SOAP
- interface of Evolution.
- .
- Evolution is the integrated mail, calendar, task and address book
- distributed suite from Novell, Inc.
-
-Package: libegroupwise1.2-dev
-Section: libdevel
-Architecture: any
-Depends: libegroupwise1.2-13 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-         libsoup2.4-dev
-Description: Development files for libegroupwise
- This package contains header files and static library for libegroupwise.
- .
- libegroupwise is client library for accessing groupwise POA through SOAP
- interface of Evolution.
- .
- Evolution is the integrated mail, calendar, task and address book
- distributed suite from Novell, Inc.
-
 Package: libebackend-1.2-1
 Section: libs
 Architecture: any

=== renamed file 'debian/libcamel-1.2-23.install' => 'debian/libcamel-1.2-26.install'
=== renamed file 'debian/libebook1.2-10.install' => 'debian/libebook1.2-11.install'
--- debian/libebook1.2-10.install	2010-11-02 00:26:19 +0000
+++ debian/libebook1.2-11.install	2011-06-24 16:06:45 +0000
@@ -1,2 +1,2 @@
 debian/tmp/usr/lib/libebook-1.2.so.*
-debian/lintian/libebook1.2-10 usr/share/lintian/overrides/
+debian/lintian/libebook1.2-11 usr/share/lintian/overrides/

=== renamed file 'debian/libecal1.2-8.install' => 'debian/libecal1.2-9.install'
--- debian/libecal1.2-8.install	2010-11-02 00:26:19 +0000
+++ debian/libecal1.2-9.install	2011-06-24 16:06:45 +0000
@@ -1,2 +1,2 @@
 debian/tmp/usr/lib/libecal-1.2.so.*
-debian/lintian/libecal1.2-8 usr/share/lintian/overrides/
+debian/lintian/libecal1.2-9 usr/share/lintian/overrides/

=== renamed file 'debian/libedata-book-1.2-9.install' => 'debian/libedata-book-1.2-10.install'
=== renamed file 'debian/libedata-cal-1.2-11.install' => 'debian/libedata-cal-1.2-12.install'
=== removed file 'debian/libegroupwise1.2-13.install'
--- debian/libegroupwise1.2-13.install	2009-07-27 15:18:44 +0000
+++ debian/libegroupwise1.2-13.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/libegroupwise-1.2.so.*
-debian/lintian/libegroupwise1.2-13 usr/share/lintian/overrides/

=== removed file 'debian/libegroupwise1.2-dev.install'
--- debian/libegroupwise1.2-dev.install	2011-05-18 15:16:46 +0000
+++ debian/libegroupwise1.2-dev.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/pkgconfig/libegroupwise-1.2.pc
-debian/tmp/usr/lib/libegroupwise-1.2.so
-debian/tmp/usr/include/evolution-data-server-*/groupwise

=== renamed file 'debian/lintian/libebook1.2-10' => 'debian/lintian/libebook1.2-11'
--- debian/lintian/libebook1.2-10	2010-11-02 00:26:19 +0000
+++ debian/lintian/libebook1.2-11	2011-06-24 16:06:45 +0000
@@ -1,1 +1,1 @@
-libebook1.2-10: package-name-doesnt-match-sonames libebook-1.2-10
+libebook1.2-11: package-name-doesnt-match-sonames libebook-1.2-11

=== renamed file 'debian/lintian/libecal1.2-8' => 'debian/lintian/libecal1.2-9'
--- debian/lintian/libecal1.2-8	2010-11-02 00:26:19 +0000
+++ debian/lintian/libecal1.2-9	2011-06-24 16:06:45 +0000
@@ -1,1 +1,1 @@
-libecal1.2-8: package-name-doesnt-match-sonames libecal-1.2-8
+libecal1.2-9: package-name-doesnt-match-sonames libecal-1.2-9

=== removed file 'debian/lintian/libegroupwise1.2-13'
--- debian/lintian/libegroupwise1.2-13	2009-07-27 15:18:44 +0000
+++ debian/lintian/libegroupwise1.2-13	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-libegroupwise1.2-13: package-name-doesnt-match-sonames libegroupwise-1.2-13

=== modified file 'debian/rules'
--- debian/rules	2011-05-18 15:16:46 +0000
+++ debian/rules	2011-06-24 16:06:45 +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-23 += -V'libcamel-1.2-23 (>= $(DEB_GNOME_VERSION)), libcamel-1.2-23 (<< $(DEB_GNOME_NEXTVERSION))'
+DEB_DH_MAKESHLIBS_ARGS_libcamel-1.2-26 += -V'libcamel-1.2-26 (>= $(DEB_GNOME_VERSION)), libcamel-1.2-26 (<< $(DEB_GNOME_NEXTVERSION))'
 
 LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 CFLAGS=$(shell dpkg-buildflags --get CFLAGS)