Index: debian/control
===================================================================
--- debian/control	(revision 2190)
+++ debian/control	(working copy)
@@ -61,10 +61,12 @@
                libytnef0-dev,
                libgdata-dev (>= 0.10),
                libical-dev,
+               libpst-dev,
                libsm-dev,
                libice-dev,
                libgstreamer0.10-dev,
                po-debconf,
+               python-dev,
                rarian-compat,
                gnome-pkg-tools,
                gsettings-desktop-schemas-dev (>= 2.91.92),
@@ -161,7 +163,7 @@
          libgnome-desktop-3-dev,
          libedataserverui-3.0-dev,
 # evolution-utils
-         libedataserver-1.2
+         libedataserver1.2-dev
 Description: development library files for Evolution
  Evolution is a groupware suite which integrates mail, calendar,
  address book, to-do list and memo tools.
@@ -202,6 +204,7 @@
   - mail-to-task
   - mailing-list-actions
   - prefer-plain
+  - pst-import
   - mail-notification
   - attachment-reminder
   - backup-restore
Index: debian/changelog
===================================================================
--- debian/changelog	(revision 2190)
+++ debian/changelog	(working copy)
@@ -1,5 +1,6 @@
 evolution (3.4.2-2) UNRELEASED; urgency=low
 
+  [ Jordi Mallach ]
   * Stop using braces in .install files, and unfold the compact lists
     into huge individual file lists. Using braces isn't supported by
     debhelper, and masked dh_install errors (if an expanded file didn't
@@ -8,6 +9,11 @@
   * Add missing dependencies on libedataserver1.2-dev and libebackend1.2-dev,
     as per pkgconfig files (BGO #677045).
 
+  [ Jeremy Bicha ]
+  * Enable python module and pst-import plugin (Closes: #491320)
+  * debian/evolution-common.gsettings-override: (Closes: #656678)
+    - Correct the path to spamd as /usr/sbin/spamd
+
  -- Jordi Mallach <jordi@debian.org>  Sat, 19 May 2012 13:33:39 +0200
 
 evolution (3.4.2-1) experimental; urgency=low
Index: debian/evolution.install
===================================================================
--- debian/evolution.install	(revision 2190)
+++ debian/evolution.install	(working copy)
@@ -26,8 +26,4 @@
 usr/lib/evolution/*/plugins/*-webdav.eplug
 usr/lib/evolution/*/plugins/*-calendar-weather.so
 usr/lib/evolution/*/plugins/*-calendar-weather.eplug
-usr/lib/evolution/*/plugins/*-sa-junk-plugin.so
-usr/lib/evolution/*/plugins/*-sa-junk-plugin.eplug
-usr/lib/evolution/*/plugins/*-bogo-junk-plugin.so
-usr/lib/evolution/*/plugins/*-bogo-junk-plugin.eplug
 usr/share/applications
Index: debian/rules
===================================================================
--- debian/rules	(revision 2190)
+++ debian/rules	(working copy)
@@ -29,7 +29,8 @@
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
 	--enable-plugins=experimental \
-	--disable-pst-import \
+	--enable-pst-import \
+	--enable-python \
 	--enable-contact-maps \
 	--disable-image-inline \
 	--enable-goa \
Index: debian/evolution-common.gsettings-override
===================================================================
--- debian/evolution-common.gsettings-override	(revision 2190)
+++ debian/evolution-common.gsettings-override	(working copy)
@@ -1,2 +1,5 @@
 [org.gnome.evolution.mail]
 prompt-check-if-default-mailer=false
+
+[org.gnome.evolution.spamassassin]
+spamd-binary='/usr/sbin/spamd'