Merge lp:~cyphermox/evolution/3.1.2-0ubuntu1 into lp:~ubuntu-desktop/evolution/ubuntu

[Mathieu Trudel-Lapierre]

[Ken VanDine (ken-vandine)]

Looks good!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-31 10:08:40 +0000
+++ debian/changelog	2011-06-24 16:06:46 +0000
@@ -1,3 +1,17 @@
+evolution (3.1.2-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release 3.1.2.
+  * debian/control: adjust Build-Depends to match new upstream requirements for
+    the new release.
+  * debian/control: update evolution and evolution-dev Depends to require the
+    right versions of e-d-s (>= 3.1, << 3.2), and drop libunique-3.0-dev.
+  * debian/control,
+    debian/evolution.install: remove groupwise-features from the plugin list,
+    it's now split out into a separate module.
+  * debian/patches/03_lpi.patch: refreshed.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Fri, 24 Jun 2011 00:27:53 -0400
+
 evolution (3.0.2-0ubuntu2) oneiric; urgency=low
 
   * debian/control:

=== modified file 'debian/control'
--- debian/control	2011-05-31 10:08:38 +0000
+++ debian/control	2011-06-24 16:06:46 +0000
@@ -23,25 +23,24 @@
                libglib2.0-dev (>= 2.28),
                libgtk-3-dev (>= 3.0.2),
                libgail-3-dev (>= 3.0.2),
-               libebook1.2-dev (>= 3.0.2),
-               libecal1.2-dev (>= 3.0.2),
-               libedataserver1.2-dev (>= 3.0.2),
-               libedataserverui-3.0-dev (>= 3.0.2),
-               libegroupwise1.2-dev (>= 3.0.2),
-               libebackend1.2-dev (>= 3.0.2),
-               libcamel1.2-dev (>= 3.0.0),
-               evolution-data-server-dev (>= 3.0.0),
-               evolution-data-server-dev (<< 3.1),
-               libgtkhtml-4.0-dev (>= 3.91.3),
+               libebook1.2-dev (>= 3.1.2),
+               libecal1.2-dev (>= 3.1.2),
+               libedataserver1.2-dev (>= 3.1.2),
+               libedataserverui-3.0-dev (>= 3.1.2),
+               libebackend1.2-dev (>= 3.1.2),
+               libcamel1.2-dev (>= 3.1.2),
+               evolution-data-server-dev (>= 3.1.2),
+               evolution-data-server-dev (<< 3.2),
+               libgtkhtml-4.0-dev (>= 4.1.2),
                libgtkhtml-editor-4.0-dev,
                libgnome-desktop-3-dev (>= 2.91.3),
+               gsettings-desktop-schemas (>= 2.91.92),
                gnome-icon-theme (>= 2.30.2.1),
                libgconf2-dev,
                libsoup-gnome2.4-dev (>= 2.31.2),
                libxml2-dev (>= 2.7.3),
                shared-mime-info (>= 0.22),
                libnotify-dev (>= 0.7),
-               libunique-3.0-dev (>= 2.90.4),
                libgweather-3-dev (>= 2.90.0),
                libcanberra-gtk3-dev (>= 0.25),
                network-manager-dev (>= 0.7) [linux-any],
@@ -75,8 +74,8 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          evolution-common (= ${source:Version}),
-         evolution-data-server (>= 3.0),
-         evolution-data-server (<< 3.1),
+         evolution-data-server (>= 3.1),
+         evolution-data-server (<< 3.2),
          gnome-icon-theme (>= 2.30.2.1),
          dbus,
          psmisc
@@ -116,7 +115,6 @@
   - default-source
   - addressbook-file
   - mark-all-read
-  - groupwise-features
   - publish-calendar
   - caldav
   - imap-features
@@ -154,7 +152,6 @@
 # evolution-plugin
          libxml2-dev,
          libcamel1.2-dev,
-         libunique-3.0-dev,
          libgtkhtml-4.0-dev,
          libgtkhtml-editor-4.0-dev,
 # evolution-shell

=== modified file 'debian/evolution.install'
--- debian/evolution.install	2011-05-19 16:42:29 +0000
+++ debian/evolution.install	2011-06-24 16:06:46 +0000
@@ -1,6 +1,6 @@
 debian/tmp/etc/gconf
 debian/tmp/etc/xdg
 debian/tmp/usr/bin
-debian/tmp/usr/lib/evolution/*/plugins/*-{calendar-file,calendar-http,itip-formatter,default-source,addressbook-file,mark-all-read,groupwise-features,publish-calendar,caldav,imap-features,google,webdav,calendar-weather,sa-junk-plugin,bogo-junk-plugin,python}.{so,eplug,xml}
+debian/tmp/usr/lib/evolution/*/plugins/*-{calendar-file,calendar-http,itip-formatter,default-source,addressbook-file,mark-all-read,publish-calendar,caldav,imap-features,google,webdav,calendar-weather,sa-junk-plugin,bogo-junk-plugin,python}.{so,eplug,xml}
 debian/tmp/usr/share/applications
 debian/evolution.xpm usr/share/pixmaps/

=== modified file 'debian/patches/03_lpi.patch'
--- debian/patches/03_lpi.patch	2011-05-16 23:38:29 +0000
+++ debian/patches/03_lpi.patch	2011-06-24 16:06:46 +0000
@@ -1,29 +1,29 @@
-Index: evolution-3.0.0/configure.ac
+Index: evolution-3.1.2/configure.ac
 ===================================================================
---- evolution-3.0.0.orig/configure.ac	2011-04-01 10:17:20.000000000 -0400
-+++ evolution-3.0.0/configure.ac	2011-05-16 16:26:17.374175311 -0400
-@@ -238,6 +238,7 @@
+--- evolution-3.1.2.orig/configure.ac	2011-06-08 13:12:25.000000000 -0400
++++ evolution-3.1.2/configure.ac	2011-06-23 22:15:26.858941282 -0400
+@@ -235,6 +235,7 @@
+ PKG_CHECK_MODULES([GNOME_PLATFORM],
+ 	[gio-2.0 >= glib_minimum_version
+ 	 cairo-gobject
++         launchpad-integration-3.0
  	 gtk+-3.0 >= gtk_minimum_version
  	 gail-3.0 >= gtk_minimum_version
- 	 unique-3.0 >= unique_minimum_version
-+         launchpad-integration-3.0
  	 gconf-2.0 >= gconf_minimum_version
- 	 libxml-2.0 >= libxml_minimum_version
- 	 shared-mime-info >= shared_mime_info_minimum_version
-Index: evolution-3.0.0/shell/e-shell-window-actions.c
+Index: evolution-3.1.2/shell/e-shell-window-actions.c
 ===================================================================
---- evolution-3.0.0.orig/shell/e-shell-window-actions.c	2011-04-01 10:17:30.000000000 -0400
-+++ evolution-3.0.0/shell/e-shell-window-actions.c	2011-05-16 16:25:51.354175313 -0400
-@@ -28,6 +28,8 @@
- 
+--- evolution-3.1.2.orig/shell/e-shell-window-actions.c	2011-06-13 10:25:10.000000000 -0400
++++ evolution-3.1.2/shell/e-shell-window-actions.c	2011-06-23 22:13:55.328941933 -0400
+@@ -33,6 +33,8 @@
  #include <libedataserverui/e-passwords.h>
+ #include <libedataserverui/e-categories-editor.h>
  
 +#include <launchpad-integration.h>
 +
  #define EVOLUTION_COPYRIGHT \
  	"Copyright \xC2\xA9 1999 - 2008 Novell, Inc. and Others"
  
-@@ -1850,6 +1852,9 @@
+@@ -1898,6 +1900,9 @@
  	e_ui_manager_add_ui_from_file (
  		E_UI_MANAGER (ui_manager), "evolution-shell.ui");
  
@@ -33,10 +33,10 @@
  	/* Shell Actions */
  	action_group = ACTION_GROUP (SHELL);
  	gtk_action_group_add_actions (
-Index: evolution-3.0.0/ui/evolution-shell.ui
+Index: evolution-3.1.2/ui/evolution-shell.ui
 ===================================================================
---- evolution-3.0.0.orig/ui/evolution-shell.ui	2011-04-01 10:17:31.000000000 -0400
-+++ evolution-3.0.0/ui/evolution-shell.ui	2011-05-16 16:25:51.354175313 -0400
+--- evolution-3.1.2.orig/ui/evolution-shell.ui	2010-11-07 19:47:14.000000000 -0500
++++ evolution-3.1.2/ui/evolution-shell.ui	2011-06-23 22:13:55.328941933 -0400
 @@ -86,6 +86,8 @@
        <menuitem action='faq'/>
        <menuitem action='submit-bug'/>