--- evolution-exchange-2.9.91.orig/debian/patches/01_extra_ldap_define_fix_build.patch
+++ evolution-exchange-2.9.91/debian/patches/01_extra_ldap_define_fix_build.patch
@@ -0,0 +1,12 @@
+diff -Nur evolution-exchange-2.9.4/addressbook/e-book-backend-gal.c evolution-exchange-2.9.4.new/addressbook/e-book-backend-gal.c
+--- evolution-exchange-2.9.4/addressbook/e-book-backend-gal.c	2006-12-01 11:51:35.000000000 +0100
++++ evolution-exchange-2.9.4.new/addressbook/e-book-backend-gal.c	2006-12-19 19:53:38.000000000 +0100
+@@ -63,6 +63,8 @@
+ /* timeout for ldap_result */
+ #define LDAP_RESULT_TIMEOUT_MILLIS 10
+ 
++#define LDAP_CONTROL_PAGEDRESULTS        "1.2.840.113556.1.4.319"   /* RFC 2696 */
++
+ #define TV_TO_MILLIS(timeval) ((timeval).tv_sec * 1000 + (timeval).tv_usec / 1000)
+ 
+ static gchar *query_prop_to_ldap(gchar *query_prop);
--- evolution-exchange-2.9.91.orig/debian/patches/10_bonobo-component-alias.patch
+++ evolution-exchange-2.9.91/debian/patches/10_bonobo-component-alias.patch
@@ -0,0 +1,16 @@
+diff -urN evolution-exchange-2.6.1.orig/storage/GNOME_Evolution_Exchange_Storage.server.in.in evolution-exchange-2.6.1/storage/GNOME_Evolution_Exchange_Storage.server.in.in
+--- evolution-exchange-2.6.1.orig/storage/GNOME_Evolution_Exchange_Storage.server.in.in	2006-01-18 10:07:18.000000000 +0100
++++ evolution-exchange-2.6.1/storage/GNOME_Evolution_Exchange_Storage.server.in.in	2006-05-12 20:19:02.000000000 +0200
+@@ -20,11 +20,11 @@
+ 	<oaf_attribute name="repo_ids" type="stringv">
+ 		<item value="IDL:GNOME/Evolution/Component:@BASE_VERSION@"/>
+ 	</oaf_attribute>
+-<!--
+ 	<oaf_attribute name="evolution:component_alias" type="string"
+ 			   value="exchange"/>
+ 	<oaf_attribute name="name" type="string"
+ 		       _value="Evolution Exchange Component"/>
++<!--
+ 	<oaf_attribute name="evolution:menu_label" type="string"
+ 		       _value="_Exchange"/>
+ 	<oaf_attribute name="evolution:menu_accelerator" type="string"
--- evolution-exchange-2.9.91.orig/debian/control
+++ evolution-exchange-2.9.91/debian/control
@@ -0,0 +1,17 @@
+Source: evolution-exchange
+Section: gnome
+Priority: optional
+Maintainer: Debian Evolution Maintainers <pkg-evolution-maintainers@lists.alioth.debian.org>
+Uploaders: Heikki Henriksen <heikkih@gmail.com>, Lawrence Walton <lawrence@the-penguin.otak.com>, Loic Minier <lool@dooz.org>, Oystein Gisnas <oystein@gisnas.net>
+Build-Depends: debhelper (>= 5.0.0), cdbs, libtool, intltool, pkg-config, libglib2.0-dev, liborbit2-dev, libgconf2-dev, libexchange-storage1.2-dev (>= 1.9.5), evolution-dev (>= 2.9), libcamel1.2-dev (>= 1.9.5), libedata-book1.2-dev (>= 1.9.5), libedata-cal1.2-dev (>= 1.9.5), libecal1.2-dev (>= 1.9.5), libsoup2.2-dev, libedataserverui1.2-dev (>= 1.9.5), libglade2-dev, libgnomeui-dev, libgnomeprint2.2-dev (>= 2.2.0), libbonobo2-dev, libxml2-dev, libldap2-dev, libdb4.4-dev
+Standards-Version: 3.7.2
+
+Package: evolution-exchange
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: ximian-connector
+Provides: ximian-connector
+Replaces: ximian-connector
+Description: Exchange plugin for the Evolution groupware suite
+ The Ximian Connector adds support for Microsoft Exchange 2000 and 2003
+ to the Evolution groupware suite.
--- evolution-exchange-2.9.91.orig/debian/changelog
+++ evolution-exchange-2.9.91/debian/changelog
@@ -0,0 +1,331 @@
+evolution-exchange (2.9.91-0ubuntu1) feisty; urgency=low
+
+  * New upstream version
+
+ -- Sebastien Bacher <seb128@canonical.com>  Mon, 12 Feb 2007 19:28:59 +0100
+
+evolution-exchange (2.9.6-0ubuntu1) feisty; urgency=low
+
+  * New upstream version
+  * debian/control:
+    - Build-Depends on libdb4.4-dev
+
+ -- Sebastien Bacher <seb128@canonical.com>  Tue, 23 Jan 2007 12:43:45 +0100
+
+evolution-exchange (2.9.5-0ubuntu2) feisty; urgency=low
+
+  * debian/control:
+    - updated evolution-data-server requirement
+
+ -- Sebastien Bacher <seb128@canonical.com>  Mon,  8 Jan 2007 22:51:18 +0100
+
+evolution-exchange (2.9.5-0ubuntu1) feisty; urgency=low
+
+  * New upstream version
+
+ -- Sebastien Bacher <seb128@canonical.com>  Mon,  8 Jan 2007 21:38:08 +0100
+
+evolution-exchange (2.9.4-0ubuntu1) feisty; urgency=low
+
+  * New upstream version
+  * debian/control:
+    - require evolution-data-server 1.9.4
+  * debian/exchange-connector-setup-2.10.1, debian/manpages:
+    - updated version
+  * debian/patches/01_build_with_new_evolution_version.patch:
+    - dropped, fixed with the new version
+  * debian/patches/01_extra_ldap_define_fix_build.patch:
+    - define LDAP_CONTROL_PAGEDRESULTS to fix the build
+  * debian/rules:
+    - updated provider version
+
+ -- Sebastien Bacher <seb128@canonical.com>  Tue, 19 Dec 2006 19:19:08 +0100
+
+evolution-exchange (2.8.2-0ubuntu1) feisty; urgency=low
+
+  * Sync with Debian
+  * New upstream version:
+    Bug Fixes:
+    232077 and downstream fixes from SuSE
+  * debian/control:
+    - build with the new evolution and evolution-data-server
+  * debian/patches/01_build_with_new_evolution_version.patch:
+    - updated to build with the new evolution-data-server and evolution
+
+ -- Sebastien Bacher <seb128@canonical.com>  Thu, 30 Nov 2006 16:49:05 +0100
+
+evolution-exchange (2.8.1-1) experimental; urgency=low
+
+  * New upstream release (closes: #390684)
+  * Updated watch-file for 2.8-series
+  * Rename and update man-page [debian/exchange-connector-2.8,
+    debian/manpages]
+  * Update build-dep of evolution-dev (>= 2.8.0) [debian/control]
+  * Update build-dep of *eds-dev (>= 1.8.0) [debian/control]
+
+ -- Heikki Henriksen <heikkih@gmail.com>  Tue,  3 Oct 2006 15:18:56 +0200
+
+evolution-exchange (2.6.3-1) unstable; urgency=low
+
+  [ Oystein Gisnas ]
+  * New upstream release
+    - does not scan all folders on startup (closes: #378236)
+    - debian/patches/10_camel-stub-marshal.patch included
+  * Add build-deps libtool and pkg-config. [debian/control]
+  * Expand e-d-s-dev build-deps to individual libraries.
+    [debian/control]
+  * Include all GNOME build-deps. [debian/control]
+
+  [ Heikki Henriksen ]
+  * split bashism rm {,} in two (closes: #377159)
+  * check build-deps (closes: #384242)
+
+ -- Heikki Henriksen <heikkih@gmail.com>  Wed, 23 Aug 2006 20:31:00 +0200
+
+evolution-exchange (2.6.2-3) unstable; urgency=low
+
+  [ Oystein Gisnas ]
+  * debian/control: Strip build-deps to a minimum
+  * debian/patches/10_rpath.patch: Remove RPATH workaround for building
+    with evolution-dev >= 2.6.2-3
+  * debian/patches/10_camel-stub-marshal.patch: Bugfix from upstream CVS
+    (closes: #374604)
+
+  [ Heikki Henriksen ]
+  * Added Oystein Gisnas & Loic Minier to Uploaders
+
+ -- Heikki Henriksen <heikkih@gmail.com>  Thu, 22 Jun 2006 09:40:40 +0200
+
+evolution-exchange (2.6.2-2) unstable; urgency=low
+
+  [ Oystein Gisnas ]
+  * debian/patches/10_rpath.patch: Fix build against
+    .la free evolution
+  * debian/control: Added ${misc:Depends}
+  * debian/rules: Readd change to not install .la file
+
+  [ Heikki Henriksen ]
+  * Remove temporary build-dep on libnm-glib-dev [debian/control]
+
+ -- Oystein Gisnas <oystein@gisnas.net>  Sat, 17 Jun 2006 13:48:06 +0200
+
+evolution-exchange (2.6.2-1) unstable; urgency=low
+
+  [ Heikki Henriksen ]
+  * New upstream release
+  * Upstream fixes:
+    - fix fail/crash on calendar load (closes: #278236, #341305)
+  * Rename source package from the old deprecated ximian-connector to evolution-exchange
+  * Bump standards-version to 3.7.2, no other changes needed [debian/control]
+  * Set maintainer to pkg-evolution-maintainers [debian/control]
+  * Update handling of manpage [debian/rules & debian/manpages]
+  * Remove chrpath from build-deps [debian/control & debian/rules]
+  * Update compat: [debian/compat & debian/control]
+
+  [ Oystein Gisnas ]
+  * Update manpage from version 2.2 to 2.6
+  * debian/patches/10_bonobo-component-alias.patch: register bonobo
+    component properly to avoid e_component_registry_peek_info crash
+
+ -- Heikki Henriksen <heikkih@gmail.com>  Thu,  8 Jun 2006 16:44:58 +0200
+
+ximian-connector (2.6.1-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/watch: added
+  * debian/rules: update dirpaths with $LIBCAMEL_CURRENT
+  * debian/control: tighten build-deps
+  * debian/control: temporarily build-dep on libnm-glib-dev
+
+ -- Heikki Henriksen <heikkih@gmail.com>  Wed,  3 May 2006 13:52:09 +0200
+
+ximian-connector (2.4.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Fixed phantom references to old libraries (libcamel1.2-0 libebook1.2-3
+    libedataserverui1.2-4)
+  * Updated build depends to Evolution and Evolution-dev (>= 2.4.2.1-1)
+  * Updated depends to evolution-data-server-dev (>= 1.4.2.1-1)
+
+ -- Lawrence Walton <lawrence@the-penguin.otak.com>  Wed, 11 Jan 2006 10:14:20 -0800
+
+ximian-connector (2.4.1-1) experimental; urgency=low
+
+  * New upstream release
+  * Updated build dependancy to, e-d-s 1.4.1.1-1 and evolution 2.4.1-3.
+
+ -- Lawrence Walton <lawrence@the-penguin.otak.com>  Mon,  9 Jan 2006 16:07:47 -0800
+
+ximian-connector (2.4.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Unreleased package, non-functional upstream.
+  * Added build dependency, libgtkhtml3.8-dev and libexchange-storage1.2-dev.
+  
+ -- Lawrence Walton <lawrence@the-penguin.otak.com>  Thu, 22 Dec 2005 14:57:18 -0800
+
+ximian-connector (2.2.3-4) unstable; urgency=low
+
+  * Removed build depends libdb4.1
+  * Rebuild against libsoup2.2-8
+  * Updated depends to evolution-dev (>= 2.2.3-4.1)
+  * Updated depends to evolution (>= 2.2.3-4.1)
+  * Updated depends to evolution-data-server-dev(>= 1.2.3-4.2)
+  * 
+
+ -- Lawrence Walton <lawrence@the-penguin.otak.com>  Sat,  8 Oct 2005 11:34:18 -0700
+
+ximian-connector (2.2.3-3) unstable; urgency=low
+
+  * Updated to Standards-Version 3.6.2 
+  * Changed build depends from evolution-data-server1.2-dev to 
+    evolution-data-server-dev 
+  * Closes #326449
+
+ -- Lawrence Walton <lawrence@the-penguin.otak.com>  Sat,  3 Sep 2005 10:57:38 -0700
+
+ximian-connector (2.2.3-2) unstable; urgency=low
+
+  * Backed out the chrpath -delete for ximian-connector-setup
+  - Closes: #313394 
+ -- Lawrence Walton <lawrence@the-penguin.otak.com>  Wed, 29 Jun 2005 10:40:29 -0700
+
+ximian-connector (2.2.3-1) unstable; urgency=low
+
+  * New upstream release
+  * Removed two  Lintian binary-or-shlib-defines-rpath warnings.
+  * Updated config.guess config.sub from /usr/share/misc  
+
+ -- Lawrence Walton <lawrence@the-penguin.otak.com>  Wed,  8 Jun 2005 09:54:39 -0700
+
+ximian-connector (2.2.2-7) unstable; urgency=medium
+
+  * Changed Build-Depend to libdb4.1-dev. Resolves a conflict with
+  libedataserver1.2-dev, which conflicts with libdb3-dev. This should
+  fix the mips build.
+  *  Closes: #310606
+
+ -- Lawrence Walton <lawrence@the-penguin.otak.com>  Wed, 25 May 2005 10:59:05 -0700
+
+ximian-connector (2.2.2-6) unstable; urgency=low
+
+  * Fixed up man page with help from David! 
+
+ -- Lawrence Walton <lawrence@the-penguin.otak.com>  Fri, 22 Apr 2005 14:02:52 -0700
+
+ximian-connector (2.2.2-5) unstable; urgency=low
+
+  * Added a manpage for ximian-connector-setup-2.2
+  * Clean up .ex files
+  * Changed build depends, removed evolution bumped up versions.
+
+ -- Lawrence Walton <lawrence@the-penguin.otak.com>  Thu, 21 Apr 2005 14:34:25 -0700
+
+ximian-connector (2.2.2-4) unstable; urgency=low
+
+  * Bumping up a version 
+
+ -- Lawrence Walton <lawrence@the-penguin.otak.com>  Wed, 20 Apr 2005 12:08:51 -0700
+
+ximian-connector (2.2.2-1) unstable; urgency=low
+
+  * New upstream release. (Hopefully Closes: #303647)
+  * New maintainer.  Thanks, Jeff and David!
+  
+ -- Lawrence Walton <lawrence@the-penguin.otak.com>  Wed, 20 Apr 2005 12:03:25 -0700
+
+ximian-connector (2.0.2-2) unstable; urgency=low
+
+  * Upload to unstable.
+    (Closes #263634, #277307, #274152)
+
+  * New maintainer.  Thanks other Jeff! 
+
+ -- Jeff Bailey <jbailey@raspberryginger.com>  Wed, 20 Oct 2004 02:27:23 +0000
+
+ximian-connector (2.0.2-1) experimental; urgency=low
+
+  * New upstream release
+        - Closes: #270141
+
+  Changes below here for 2.0.1-1...
+
+  * New upstream release
+  	- Closes: #263634, #274152
+    - Build-Depend on libdb4.2-dev, which is no longer a build-dep of
+      heimdal-dev
+
+ -- Jeff Waugh <jdub@perkypants.org>  Mon, 18 Oct 2004 10:40:41 -0400
+
+ximian-connector (1.5.94.1-1) experimental; urgency=low
+
+  * New upstream release.
+    - Special thanks to Jeff Bailey for his loving care and attention in
+      our times of need.
+
+ -- Jeff Waugh <jdub@perkypants.org>  Sat,  4 Sep 2004 08:03:02 +1000
+
+ximian-connector (1.5.93-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Jeff Waugh <jdub@perkypants.org>  Tue,  3 Aug 2004 00:21:10 -0700
+
+ximian-connector (1.5.91-1) experimental; urgency=low
+
+  * New upstream release (Closes: #261533).
+
+ -- Jeff Waugh <jdub@perkypants.org>  Fri, 30 Jul 2004 23:13:32 -0700
+
+ximian-connector (1.5.90-2) experimental; urgency=low
+
+  * Build-Depend on intltool, evolution-data-server-dev and heimdal-dev,
+    with thanks to Michael Banck.
+
+ -- Jeff Waugh <jdub@perkypants.org>  Tue, 13 Jul 2004 09:51:50 +1000
+
+ximian-connector (1.5.90-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Jeff Waugh <jdub@perkypants.org>  Tue, 13 Jul 2004 08:55:38 +1000
+
+ximian-connector (1.4.7.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jeff Waugh <jdub@perkypants.org>  Fri,  9 Jul 2004 14:18:11 +1000
+
+ximian-connector (1.4.7.1-5) unstable; urgency=low
+
+  * Rebuild against new libsoup2.0.
+
+ -- Jeff Waugh <jdub@perkypants.org>  Tue,  8 Jun 2004 19:49:39 +1000
+
+ximian-connector (1.4.7.1-4) unstable; urgency=low
+
+  * Conflicts, Provides, Replaces: ximian-connector.
+
+ -- Jeff Waugh <jdub@perkypants.org>  Mon, 17 May 2004 10:03:07 +1000
+
+ximian-connector (1.4.7.1-3) unstable; urgency=low
+
+  * Don't delete ximian-connector-setup, it is actually useful for doing
+    auto-detection and funky stuff like that.
+
+ -- Jeff Waugh <jdub@perkypants.org>  Thu, 13 May 2004 00:53:45 +1000
+
+ximian-connector (1.4.7.1-2) unstable; urgency=low
+
+  * Build-Depend on evolution (for idl) and libxml-parser-perl (because for
+    some reason, intltool doesn't).
+
+ -- Jeff Waugh <jdub@perkypants.org>  Wed, 12 May 2004 16:40:17 +1000
+
+ximian-connector (1.4.7.1-1) unstable; urgency=low
+
+  * Initial Release (Closes: #248555).
+  * "Fix" configure to always use libldap dynamically.
+
+ -- Jeff Waugh <jdub@perkypants.org>  Wed, 12 May 2004 16:40:17 +1000
+
--- evolution-exchange-2.9.91.orig/debian/rules
+++ evolution-exchange-2.9.91/debian/rules
@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/gnome.mk
+
+CFLAGS += -fPIC
+
+binary-install/evolution-exchange::
+	rm debian/evolution-exchange/usr/lib/evolution-data-server-1.2/camel-providers-10/libcamelexchange.a
+	rm debian/evolution-exchange/usr/lib/evolution-data-server-1.2/camel-providers-10/libcamelexchange.la
--- evolution-exchange-2.9.91.orig/debian/manpages
+++ evolution-exchange-2.9.91/debian/manpages
@@ -0,0 +1 @@
+debian/exchange-connector-setup-2.10.1
--- evolution-exchange-2.9.91.orig/debian/dirs
+++ evolution-exchange-2.9.91/debian/dirs
@@ -0,0 +1 @@
+usr/bin
--- evolution-exchange-2.9.91.orig/debian/compat
+++ evolution-exchange-2.9.91/debian/compat
@@ -0,0 +1 @@
+5
--- evolution-exchange-2.9.91.orig/debian/watch
+++ evolution-exchange-2.9.91/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://ftp.gnome.org/pub/GNOME/sources/evolution-exchange/2.8/evolution-exchange-([\d\.]+)\.tar\.gz	debian	uupdate
--- evolution-exchange-2.9.91.orig/debian/copyright
+++ evolution-exchange-2.9.91/debian/copyright
@@ -0,0 +1,19 @@
+This package was debianized by Jeff Waugh <jdub@perkypants.org> on
+Wed, 12 May 2004 16:41:56 +1000.
+
+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.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
--- evolution-exchange-2.9.91.orig/debian/docs
+++ evolution-exchange-2.9.91/debian/docs
@@ -0,0 +1 @@
+NEWS
--- evolution-exchange-2.9.91.orig/debian/exchange-connector-setup-2.10.1
+++ evolution-exchange-2.9.91/debian/exchange-connector-setup-2.10.1
@@ -0,0 +1,36 @@
+.TH EXCHANGE-CONNECTOR-SETUP 1 "September 28, 2006"
+
+.SH NAME
+exchange-connector-setup-2.8 \- configure evolution to access an
+exchange server
+
+.SH SYNOPSIS
+.B exchange-connector-setup-2.8
+
+.SH DESCRIPTION
+\fBexchange-connector-setup-2.8\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
+exchange-connector was written by The Novell Corporation.
+
+This manual page was written by
+Lawrence Walton <\fIlawrence@the-penguin.otak.com\fP> 
+and updated by Heikki Henriksen <\fIheikkih@gmail.com\fP> 
+for the Debian project (but may be used by others).
+
+.SH COPYRIGHT
+Copyright \(co 2002-2006 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.