diff -Nru evolution-exchange-3.2.1/debian/changelog evolution-exchange-3.2.1/debian/changelog --- evolution-exchange-3.2.1/debian/changelog 2012-01-03 19:38:50.000000000 +0000 +++ evolution-exchange-3.2.1/debian/changelog 2012-01-13 13:33:12.000000000 +0000 @@ -1,3 +1,36 @@ +evolution-exchange (3.2.1-2ubuntu1) precise; urgency=low + + * Merge with Debian; remaining changes: + - debian/patches/remove_g_thread_init.patch: remove calls to g_thread_init. + - debian/exchange-connector-setup-3.0.1: renamed from + exchange-connector-setup-2.26.1; to install a manpage with the right + name, with fixes for the correct version numbers. + - debian/evolution-exchange.manpages: install a the manpage for the + connector setup binary. + - debian/control: update Vcs-* fields. + * debian/exchange-connector-setup-3.2.1: renamed to account for upstream + version. + + -- Mathieu Trudel-Lapierre Fri, 13 Jan 2012 14:33:05 +0100 + +evolution-exchange (3.2.1-2) unstable; urgency=low + + * Use dh-autoreconf. + * 01_deprecated.patch: new patch. Remove _DISABLE_DEPRECATED flags. + Closes: #650051. + * 03_link_libical.patch: new patch. Correctly link with libical to use + its functions. + + -- Josselin Mouette Fri, 16 Dec 2011 20:53:00 +0100 + +evolution-exchange (3.2.1-1) experimental; urgency=low + + * New upstream release. + * Drop libegroupwise requirement. + * Update build-dependencies on evolution and e-d-s as usual. + + -- Josselin Mouette Fri, 11 Nov 2011 15:18:56 +0100 + evolution-exchange (3.2.1-0ubuntu3) precise; urgency=low * debian/patches/remove_g_thread_init.patch: remove calls to g_thread_init() @@ -82,6 +115,13 @@ -- Martin Pitt Mon, 27 Jun 2011 07:26:57 +0100 +evolution-exchange (3.0.2-1) unstable; urgency=low + + * New upstream release. + * Update build-dependencies on evolution and e-d-s as usual. + + -- Josselin Mouette Fri, 19 Aug 2011 22:49:29 +0200 + evolution-exchange (3.0.2-0ubuntu1) oneiric; urgency=low * New upstream release. diff -Nru evolution-exchange-3.2.1/debian/control evolution-exchange-3.2.1/debian/control --- evolution-exchange-3.2.1/debian/control 2012-01-03 19:38:50.000000000 +0000 +++ evolution-exchange-3.2.1/debian/control 2012-01-13 13:33:12.000000000 +0000 @@ -47,7 +47,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - evolution (>= 3.2.1), + evolution (>= 3.2), evolution (<< 3.3) Conflicts: ximian-connector Provides: ximian-connector diff -Nru evolution-exchange-3.2.1/debian/evolution-exchange.manpages evolution-exchange-3.2.1/debian/evolution-exchange.manpages --- evolution-exchange-3.2.1/debian/evolution-exchange.manpages 2012-01-03 19:38:50.000000000 +0000 +++ evolution-exchange-3.2.1/debian/evolution-exchange.manpages 2012-01-13 13:33:12.000000000 +0000 @@ -1 +1 @@ -debian/exchange-connector-setup-3.0.1 +debian/exchange-connector-setup-3.2.1 diff -Nru evolution-exchange-3.2.1/debian/exchange-connector-setup-3.0.1 evolution-exchange-3.2.1/debian/exchange-connector-setup-3.0.1 --- evolution-exchange-3.2.1/debian/exchange-connector-setup-3.0.1 2012-01-03 19:38:50.000000000 +0000 +++ evolution-exchange-3.2.1/debian/exchange-connector-setup-3.0.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -.TH EXCHANGE-CONNECTOR-SETUP-3.0 1 "March 14, 2009" - -.SH NAME -exchange-connector-setup-3.0 \- configure evolution to access an -exchange server - -.SH SYNOPSIS -.B exchange-connector-setup-3.0 - -.SH DESCRIPTION -\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 -Microsoft Exchange server. - -.SH OPTIONS -There are no documented options. - -.SH SEE ALSO -.BR evolution (1) - -.SH AUTHORS -evolution-exchange was written by The Novell Corporation. - -This manual page was written by -Lawrence Walton <\fIlawrence@the-penguin.otak.com\fP>, -for the Debian project (but may be used by others). - -.SH COPYRIGHT -Copyright \(co 2002-2008 Novell, Inc. -.br -This is free software; see the source for copying conditions. -There is NO warranty; not even for MERCHANTABILITY or FITNESS -FOR A PARTICULAR PURPOSE. diff -Nru evolution-exchange-3.2.1/debian/exchange-connector-setup-3.2.1 evolution-exchange-3.2.1/debian/exchange-connector-setup-3.2.1 --- evolution-exchange-3.2.1/debian/exchange-connector-setup-3.2.1 1970-01-01 00:00:00.000000000 +0000 +++ evolution-exchange-3.2.1/debian/exchange-connector-setup-3.2.1 2012-01-13 13:33:12.000000000 +0000 @@ -0,0 +1,35 @@ +.TH EXCHANGE-CONNECTOR-SETUP-3.0 1 "March 14, 2009" + +.SH NAME +exchange-connector-setup-3.0 \- configure evolution to access an +exchange server + +.SH SYNOPSIS +.B exchange-connector-setup-3.0 + +.SH DESCRIPTION +\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 +Microsoft Exchange server. + +.SH OPTIONS +There are no documented options. + +.SH SEE ALSO +.BR evolution (1) + +.SH AUTHORS +evolution-exchange was written by The Novell Corporation. + +This manual page was written by +Lawrence Walton <\fIlawrence@the-penguin.otak.com\fP>, +for the Debian project (but may be used by others). + +.SH COPYRIGHT +Copyright \(co 2002-2008 Novell, Inc. +.br +This is free software; see the source for copying conditions. +There is NO warranty; not even for MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. diff -Nru evolution-exchange-3.2.1/debian/patches/01_deprecated.patch evolution-exchange-3.2.1/debian/patches/01_deprecated.patch --- evolution-exchange-3.2.1/debian/patches/01_deprecated.patch 1970-01-01 00:00:00.000000000 +0000 +++ evolution-exchange-3.2.1/debian/patches/01_deprecated.patch 2012-01-13 13:33:12.000000000 +0000 @@ -0,0 +1,16 @@ +Index: evolution-exchange-3.2.1/configure.ac +=================================================================== +--- evolution-exchange-3.2.1.orig/configure.ac 2011-09-28 00:04:28.000000000 +0200 ++++ evolution-exchange-3.2.1/configure.ac 2011-12-01 21:54:55.939596322 +0100 +@@ -34,10 +34,7 @@ dnl ********************** + dnl Compiler Warning Flags + dnl ********************** + AS_COMPILER_FLAGS(WARNING_FLAGS, +- "-DPANGO_DISABLE_DEPRECATED +- -DGDK_DISABLE_DEPRECATED +- -DGDK_PIXBUF_DISABLE_DEPRECATED +- -DG_DISABLE_SINGLE_INCLUDES ++ "-DG_DISABLE_SINGLE_INCLUDES + -DGTK_DISABLE_SINGLE_INCLUDES + -DGSEAL_ENABLE + -DE_BOOK_DISABLE_DEPRECATED diff -Nru evolution-exchange-3.2.1/debian/patches/03_link_libical.patch evolution-exchange-3.2.1/debian/patches/03_link_libical.patch --- evolution-exchange-3.2.1/debian/patches/03_link_libical.patch 1970-01-01 00:00:00.000000000 +0000 +++ evolution-exchange-3.2.1/debian/patches/03_link_libical.patch 2012-01-13 13:33:12.000000000 +0000 @@ -0,0 +1,57 @@ +Index: evolution-exchange-3.2.1/calendar/Makefile.am +=================================================================== +--- evolution-exchange-3.2.1.orig/calendar/Makefile.am 2011-09-28 00:04:28.000000000 +0200 ++++ evolution-exchange-3.2.1/calendar/Makefile.am 2011-12-01 22:23:57.212108977 +0100 +@@ -9,6 +9,7 @@ libecalbackendexchange_la_CPPFLAGS = \ + -DG_LOG_DOMAIN=\"e-cal-backend-exchange\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(EVOLUTION_PLUGIN_CFLAGS) \ ++ $(LIBICAL_CFLAGS) \ + $(LDAP_CFLAGS) + + libecalbackendexchange_la_SOURCES = \ +@@ -34,6 +35,7 @@ libecalbackendexchange_la_LIBADD = \ + $(top_builddir)/tools/libevolution-exchange-shared.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(EVOLUTION_PLUGIN_LIBS) \ ++ $(LIBICAL_LIBS) \ + $(LDAP_LIBS) \ + $(DNS_LIBS) + +Index: evolution-exchange-3.2.1/camel/Makefile.am +=================================================================== +--- evolution-exchange-3.2.1.orig/camel/Makefile.am 2011-09-28 00:04:28.000000000 +0200 ++++ evolution-exchange-3.2.1/camel/Makefile.am 2011-12-01 22:24:19.628218558 +0100 +@@ -6,6 +6,7 @@ CAMEL_provider_DATA = libcamelexchange.u + libcamelexchange_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + $(EVOLUTION_PLUGIN_CFLAGS) \ ++ $(LIBICAL_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/tools \ + -I$(top_srcdir)/server/lib \ +@@ -50,6 +51,7 @@ libcamelexchange_la_LIBADD = \ + $(top_builddir)/tools/libevolution-exchange-shared.la \ + $(EVOLUTION_PLUGIN_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ ++ $(LIBICAL_LIBS) \ + $(LDAP_LIBS) \ + $(SOCKET_LIBS) \ + $(DNS_LIBS) +Index: evolution-exchange-3.2.1/configure.ac +=================================================================== +--- evolution-exchange-3.2.1.orig/configure.ac 2011-12-01 22:23:44.000000000 +0100 ++++ evolution-exchange-3.2.1/configure.ac 2011-12-01 22:23:57.212108977 +0100 +@@ -288,6 +288,12 @@ case $abt in + esac + AC_DEFINE_UNQUOTED([E2K_APPROX_BUILD_TIME],[$abt],[Used to prevent clock-setting attacks against pilot licenses]) + ++dnl ***************** ++dnl Check for libical ++dnl ***************** ++PKG_CHECK_MODULES(LIBICAL, libical >= 0.43) ++AC_SUBST(LIBICAL_CFLAGS) ++AC_SUBST(LIBICAL_LIBS) + AC_DEFINE([HANDLE_LIBICAL_MEMORY],[1],[Define it once memory returned by libical is free'ed properly]) + + dnl ************** diff -Nru evolution-exchange-3.2.1/debian/patches/series evolution-exchange-3.2.1/debian/patches/series --- evolution-exchange-3.2.1/debian/patches/series 2012-01-03 19:38:50.000000000 +0000 +++ evolution-exchange-3.2.1/debian/patches/series 2012-01-13 13:33:12.000000000 +0000 @@ -1 +1,3 @@ +01_deprecated.patch +03_link_libical.patch remove_g_thread_init.patch diff -Nru evolution-exchange-3.2.1/debian/rules evolution-exchange-3.2.1/debian/rules --- evolution-exchange-3.2.1/debian/rules 2012-01-03 19:38:50.000000000 +0000 +++ evolution-exchange-3.2.1/debian/rules 2012-01-13 13:33:12.000000000 +0000 @@ -1,9 +1,9 @@ #!/usr/bin/make -f +include /usr/share/cdbs/1/rules/autoreconf.mk 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 -include /usr/share/cdbs/1/rules/autoreconf.mk CFLAGS += -fPIC