You have been requested to review the proposed merge of lp:~mathieu-tl/evolution-exchange/3.0.2-0ubuntu1 into lp:~ubuntu-desktop/evolution-exchange/ubuntu.
For more details, see: https://code.launchpad.net/~mathieu-tl/evolution-exchange/3.0.2-0ubuntu1/+merge/63032 -- https://code.launchpad.net/~mathieu-tl/evolution-exchange/3.0.2-0ubuntu1/+merge/63032 Your team Ubuntu Desktop is requested to review the proposed merge of lp:~mathieu-tl/evolution-exchange/3.0.2-0ubuntu1 into lp:~ubuntu-desktop/evolution-exchange/ubuntu.
=== modified file 'debian/changelog' --- debian/changelog 2011-05-24 03:02:09 +0000 +++ debian/changelog 2011-06-03 14:57:27 +0000 @@ -1,3 +1,35 @@ +evolution-exchange (3.0.2-0ubuntu1) UNRELEASED; urgency=low + + * New upstream release. + * Merge with Debian; remaining changes: + - debian/rules: run autoreconf, due to patches. + - debian/patches/10_fix_libexch_linking.patch: link with libexchange and + libexchange-storage where required. + - debian/patches/11_libical_linking.patch: explicitly link against libical. + - debian/patches/92_lresolv_detection.patch: make sure -lresolv is detected + and used in LDAP_LIBS. + - debian/exchange-connector-setup-3.0.1: renamed from + exchange-connector-setup-2.26.1; to install a manpage with the right + name. + - debian/evolution-exchange.manpages: install a the manpage for the + connector setup binary. + - debian/control: keep dh-autoreconf in Build-Depends. + * debian/control: update evolution-data-server libs Build-Depends to 3.0.2. + * debian/exchange-connector-setup-3.0.1: update to correct version numbers. + * debian/patches/11_libical_linking.patch: refreshed. + * debian/patches/92_lresolv_detection.patch: refreshed, to match what was + committed in upstream Git. + * debian/patches/10_fix_libexch_linking.patch: updated with DEP-3 tags. + + -- Mathieu Trudel-Lapierre <[email protected]> Fri, 03 Jun 2011 10:28:13 -0400 + +evolution-exchange (3.0.0-1) experimental; urgency=low + + * New upstream stable release. + * Bump build-dependencies on evolution and e-d-s. + + -- Josselin Mouette <[email protected]> Sun, 10 Apr 2011 11:43:24 +0200 + evolution-exchange (3.0.0-0ubuntu1) oneiric; urgency=low * New upstream release. @@ -30,6 +62,29 @@ -- Mathieu Trudel-Lapierre <[email protected]> Mon, 23 May 2011 23:01:23 -0400 +evolution-exchange (2.91.91-1) experimental; urgency=low + + * New upstream pre-release. + * 01_link_libresolv.patch: dropped, fixed upstream. + * Drop dh-autoreconf accordingly. + * copyright: + + Add author list. + + Fix licensing, it is GPL v2 only. + * Update build-dependencies and dependencies. + * Update list of installed files. + + -- Josselin Mouette <[email protected]> Mon, 21 Mar 2011 11:32:00 +0100 + +evolution-exchange (2.32.2-1) unstable; urgency=low + + * New upstream release. + * Bump build-dependencies and dependencies. + * Fix camel providers installation path. + * 01_link_libresolv.patch: add missing libresolv in link arguments. + * Use dh_autoreconf on top of that. + + -- Josselin Mouette <[email protected]> Thu, 17 Feb 2011 21:56:23 +0100 + evolution-exchange (2.32.2-0ubuntu3) natty; urgency=low * debian/evolution-exchange.install: Install extra libexchange-storage.so and @@ -111,6 +166,16 @@ -- Mathieu Trudel-Lapierre <[email protected]> Wed, 03 Nov 2010 16:17:46 -0400 +evolution-exchange (2.30.3-1) unstable; urgency=low + + [ Yves-Alexis Perez ] + * New upstream release. + * debian/control: + - bump evo/eds build-deps. + - update standards version to 3.9.1. + + -- Josselin Mouette <[email protected]> Sun, 05 Sep 2010 20:44:13 +0200 + evolution-exchange (2.30.3-0ubuntu2) maverick-proposed; urgency=low * debian/rules: @@ -128,6 +193,18 @@ -- Didier Roche <[email protected]> Wed, 01 Sep 2010 18:50:58 +0200 +evolution-exchange (2.30.2-1) unstable; urgency=low + + * New upstream release. + * Switch to 3.0 (quilt) source format. + * debian/rules: + - add gnome-get-source cdbs rules file. + * debian/control: + - update standards version to 3.9.0. + - add build-dep on gnome-pkg-tools. + + -- Yves-Alexis Perez <[email protected]> Sat, 03 Jul 2010 20:22:25 +0200 + evolution-exchange (2.30.2-0ubuntu3) maverick; urgency=low * debian/control: === modified file 'debian/control' --- debian/control 2011-05-24 02:10:06 +0000 +++ debian/control 2011-06-03 14:57:27 +0000 @@ -10,39 +10,38 @@ Josselin Mouette <[email protected]>, Yves-Alexis Perez <[email protected]>, David Weinehall <[email protected]> -Standards-Version: 3.9.2 +Standards-Version: 3.9.1 Dm-Upload-Allowed: yes Homepage: http://www.gnome.org/projects/evolution/ Build-Depends: debhelper (>= 5.0.0), dpkg-dev (>= 1.14.16), cdbs (>= 0.4.37), - pkg-config, dh-autoreconf, gnome-pkg-tools, - libglib2.0-dev (>= 2.28.0), + pkg-config, + libglib2.0-dev (>= 2.28), libgtk-3-dev (>= 3.0), libgconf2-dev (>= 2.0.0), libxml2-dev (>= 2.0.0), libsoup2.4-dev (>= 2.3.0), - libebook1.2-dev (>= 3.0.0), - libecal1.2-dev (>= 3.0.0), + libebook1.2-dev (>= 3.0.2), + libecal1.2-dev (>= 3.0.2), libical-dev, - libedataserver1.2-dev (>= 3.0.0), - libedataserverui-3.0-dev (>= 3.0.0), - libedata-book1.2-dev (>= 3.0.0), - libedata-cal1.2-dev (>= 3.0.0), - libegroupwise1.2-dev (>= 3.0.0), - libebackend1.2-dev (>= 3.0.0), - evolution-dev (>= 3.0.0), - evolution-data-server-dev (>= 3.0.0), + libedataserver1.2-dev (>= 3.0.2), + libedataserverui-3.0-dev (>= 3.0.2), + libedata-book1.2-dev (>= 3.0.2), + libedata-cal1.2-dev (>= 3.0.2), + libegroupwise1.2-dev (>= 3.0.2), + libebackend1.2-dev (>= 3.0.2), + evolution-dev (>= 3.0.2), + evolution-data-server-dev (>= 3.0.2), intltool (>= 0.35.5), liborbit2-dev, - libcamel1.2-dev (>= 3.0.0), + libcamel1.2-dev (>= 3.0.2), libldap2-dev, gtk-doc-tools (>= 1.9), libdb-dev, - libkrb5-dev, - libdbus-glib-1-dev + libkrb5-dev Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/evolution-exchange/ubuntu Package: evolution-exchange === modified file 'debian/copyright' --- debian/copyright 2009-12-17 01:15:51 +0000 +++ debian/copyright 2011-06-03 14:57:27 +0000 @@ -3,17 +3,30 @@ Downloaded from <http://ftp.gnome.org/pub/GNOME/sources/evolution-exchange/> -Copyright (C) 2002-2005 Novell, Inc. - -This program is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. +Upstream authors: + Arunprakash <[email protected]> + Praveen Kumar <[email protected]> + Sarfraaz Ahmed <[email protected]> + Shakti Prasad <[email protected]> + Dan Winship <[email protected]> + Sushma Rai <[email protected]> + Nicel KM <[email protected]> + Larry Ewing <[email protected] + Rodrigo Moya <[email protected]> + Chris Toshok <[email protected]> + JP Rosevear <[email protected]> + +Copyright © 1999-2008 Novell, Inc. + +License: + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the Free + Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. +Public License can be found in `/usr/share/common-licenses/GPL-2'. === modified file 'debian/evolution-exchange.install' --- debian/evolution-exchange.install 2011-05-24 01:54:21 +0000 +++ debian/evolution-exchange.install 2011-06-03 14:57:27 +0000 @@ -1,13 +1,12 @@ debian/tmp/etc/gconf/schemas debian/tmp/usr/bin -debian/tmp/usr/lib/evolution-exchange/*/*.so* +debian/tmp/usr/lib/evolution-data-server/*-backends/*.so +debian/tmp/usr/lib/evolution-data-server/camel-providers/*.urls +debian/tmp/usr/lib/evolution-data-server/camel-providers/*.so debian/tmp/usr/lib/evolution/*/plugins/*.eplug debian/tmp/usr/lib/evolution/*/plugins/*.so -debian/tmp/usr/lib/evolution-data-server/camel-providers/*.urls -debian/tmp/usr/lib/evolution-data-server/camel-providers/*.so -debian/tmp/usr/lib/evolution-data-server/addressbook-backends/*.so -debian/tmp/usr/lib/evolution-data-server/calendar-backends/*.so +debian/tmp/usr/lib/evolution-exchange/*/*.so* debian/tmp/usr/share/evolution +debian/tmp/usr/share/gtk-doc debian/tmp/usr/share/evolution-exchange -debian/tmp/usr/share/gtk-doc debian/tmp/usr/share/locale === modified file 'debian/exchange-connector-setup-3.0.1' --- debian/exchange-connector-setup-3.0.1 2011-05-24 02:03:05 +0000 +++ debian/exchange-connector-setup-3.0.1 2011-06-03 14:57:27 +0000 @@ -1,14 +1,14 @@ -.TH EXCHANGE-CONNECTOR-SETUP-2.30 1 "March 14, 2009" +.TH EXCHANGE-CONNECTOR-SETUP-3.0 1 "March 14, 2009" .SH NAME -exchange-connector-setup-2.30 \- configure evolution to access an +exchange-connector-setup-3.0 \- configure evolution to access an exchange server .SH SYNOPSIS -.B exchange-connector-setup-2.30 +.B exchange-connector-setup-3.0 .SH DESCRIPTION -\fBexchange-connector-setup-2.30\fP is a program that is called +\fBexchange-connector-setup-3.0\fP is a program that is called from within .BR evolution (1) to help guide users through setting up a connection to an === modified file 'debian/patches/10_fix_libexch_linking.patch' --- debian/patches/10_fix_libexch_linking.patch 2011-05-24 01:38:15 +0000 +++ debian/patches/10_fix_libexch_linking.patch 2011-06-03 14:57:27 +0000 @@ -1,3 +1,7 @@ +From: Mathieu Trudel-Lapierre <[email protected]> +Subject: Fix linking against libexchange and libexchange-storage. +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=651786 + Index: evolution-exchange-3.0.0/tools/Makefile.am =================================================================== --- evolution-exchange-3.0.0.orig/tools/Makefile.am 2011-04-03 19:05:02.000000000 -0400 === modified file 'debian/patches/11_libical_linking.patch' --- debian/patches/11_libical_linking.patch 2011-05-24 01:39:13 +0000 +++ debian/patches/11_libical_linking.patch 2011-06-03 14:57:27 +0000 @@ -1,7 +1,15 @@ -Index: evolution-exchange-3.0.0/camel/Makefile.am +From: Mathieu Trudel-Lapierre <[email protected]> +Subject: Link libcamelexchange against ical explicitly. +Forwarded: yes +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=651785 + +ical appears to be required by libcamelexchange during build, yet is not +tested for in configure nor added to LIBADD; fix this so the build completes. + +Index: evolution-exchange-3.0.2/camel/Makefile.am =================================================================== ---- evolution-exchange-3.0.0.orig/camel/Makefile.am 2011-05-23 20:51:35.329609611 -0400 -+++ evolution-exchange-3.0.0/camel/Makefile.am 2011-05-23 20:57:31.429609584 -0400 +--- evolution-exchange-3.0.2.orig/camel/Makefile.am 2011-06-03 10:31:36.553389653 -0400 ++++ evolution-exchange-3.0.2/camel/Makefile.am 2011-06-03 10:31:40.173389653 -0400 @@ -43,6 +43,7 @@ $(top_builddir)/server/lib/libexchange.la \ $(top_builddir)/server/storage/libexchange-storage.la \ @@ -10,10 +18,10 @@ $(EVOLUTION_PLUGIN_LIBS) \ $(LDAP_LIBS) \ $(SOCKET_LIBS) \ -Index: evolution-exchange-3.0.0/configure.ac +Index: evolution-exchange-3.0.2/configure.ac =================================================================== ---- evolution-exchange-3.0.0.orig/configure.ac 2011-05-23 20:50:43.249609617 -0400 -+++ evolution-exchange-3.0.0/configure.ac 2011-05-23 20:56:34.419609589 -0400 +--- evolution-exchange-3.0.2.orig/configure.ac 2011-04-25 03:03:03.000000000 -0400 ++++ evolution-exchange-3.0.2/configure.ac 2011-06-03 10:31:40.173389653 -0400 @@ -266,6 +266,13 @@ AC_SUBST(EVOLUTION_SHELL_CFLAGS) AC_SUBST(EVOLUTION_SHELL_LIBS) === modified file 'debian/patches/92_lresolv_detection.patch' --- debian/patches/92_lresolv_detection.patch 2010-11-03 20:19:00 +0000 +++ debian/patches/92_lresolv_detection.patch 2011-06-03 14:57:27 +0000 @@ -1,28 +1,35 @@ +Origin: http://git.gnome.org/browse/evolution-exchange/commit/?id=1c35459eb425890f62f92d89ae41377ee247f76c From: Mathieu Trudel-Lapierre <[email protected]> -Subject: Try harder to use -lresolv -Last-Update: 2010-11-03 +Date: Fri, 03 Jun 2011 13:13:24 +0000 +Subject: Bug #633948 - Try harder to use -lresolv in LDAP_LIBS +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=633948 -diff -Nur -x '*.orig' -x '*~' evolution-exchange-2.32.0//m4/evo_ldap_check.m4 evolution-exchange-2.32.0.new//m4/evo_ldap_check.m4 ---- evolution-exchange-2.32.0//m4/evo_ldap_check.m4 2010-09-13 08:19:41.000000000 -0400 -+++ evolution-exchange-2.32.0.new//m4/evo_ldap_check.m4 2010-11-03 16:06:18.205064001 -0400 -@@ -55,7 +55,7 @@ +--- +diff --git a/m4/evo_ldap_check.m4 b/m4/evo_ldap_check.m4 +index a029ac7..bc02511 100644 +--- a/m4/evo_ldap_check.m4 ++++ b/m4/evo_ldap_check.m4 +@@ -55,7 +55,7 @@ AC_DEFUN([EVO_LDAP_CHECK],[ AC_MSG_ERROR([evolution requires OpenLDAP version >= 2]) fi - AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"]) -+ AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"], AC_CHECK_LIB(resolv, __res_query)) ++ AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"], [AC_CHECK_LIB(resolv, __res_query, [LDAP_LIBS="-lresolv"])]) AC_CHECK_LIB(socket, bind, [LDAP_LIBS="$LDAP_LIBS -lsocket"]) AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"]) AC_CHECK_LIB(lber, ber_get_tag, [ -diff -Nur -x '*.orig' -x '*~' evolution-exchange-2.32.0//m4/evo_sunldap_check.m4 evolution-exchange-2.32.0.new//m4/evo_sunldap_check.m4 ---- evolution-exchange-2.32.0//m4/evo_sunldap_check.m4 2010-09-13 08:19:41.000000000 -0400 -+++ evolution-exchange-2.32.0.new//m4/evo_sunldap_check.m4 2010-11-03 16:06:37.815064001 -0400 -@@ -57,7 +57,7 @@ +diff --git a/m4/evo_sunldap_check.m4 b/m4/evo_sunldap_check.m4 +index bd85534..b52aac3 100644 +--- a/m4/evo_sunldap_check.m4 ++++ b/m4/evo_sunldap_check.m4 +@@ -57,7 +57,7 @@ AC_DEFUN([EVO_SUNLDAP_CHECK], [ AC_MSG_ERROR([evolution requires SunLDAP version >= 2]) fi - AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"]) -+ AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"], AC_CHECK_LIB(resolv, __res_query)) ++ AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"], [AC_CHECK_LIB(resolv, __res_query, [LDAP_LIBS="-lresolv"])]) AC_CHECK_LIB(socket, bind, [LDAP_LIBS="$LDAP_LIBS -lsocket"]) AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"]) AC_CHECK_LIB(ldap, ldap_open, [ +-- +cgit v0.9 === modified file 'debian/rules' --- debian/rules 2011-02-07 04:13:18 +0000 +++ debian/rules 2011-06-03 14:57:27 +0000 @@ -1,6 +1,5 @@ #!/usr/bin/make -f -#LDFLAGS=$(shell echo $$LDFLAGS | sed -e 's/-Wl,-Bsymbolic-functions//') include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk @@ -8,6 +7,6 @@ CFLAGS += -fPIC -DEB_DH_MAKESHLIBS_ARGS_ALL += --no-act --with-ek2-debug +DEB_DH_MAKESHLIBS_ARGS_ALL += --no-act DEB_CONFIGURE_EXTRA_FLAGS += --with-krb5=/usr
-- ubuntu-desktop mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
