Branch for experimental

git-svn-id: file:///svn/pkg-evolution/experimental/evolution@2279 ed03ce00-e4f4-0310-9448-ee38221cb277

debian/changelog

@@ -1,4 +1,12 @@
-evolution (3.4.2-2) UNRELEASED; urgency=low
+evolution (3.4.3-1) unstable; urgency=low
+
+  * Team upload.
+  * New upstream release.
+  * Upload to unstable.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 19 Jun 2012 20:39:39 +0200
+
+evolution (3.4.2-2) experimental; urgency=low
 
   [ Jordi Mallach ]
   * Stop using braces in .install files, and unfold the compact lists
@@ -11,10 +19,13 @@ evolution (3.4.2-2) UNRELEASED; urgency=low
   * Make evolution-dev depend on libevolution instead of evolution.
 
   [ Jeremy Bicha ]
-  * Enable python module
+  * 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
 
+  [ Michael Biebl ]
+  * Don't install image-inline plugin since we no longer build it.
+
  -- Jordi Mallach <jordi@debian.org>  Sat, 19 May 2012 13:33:39 +0200
 
 evolution (3.4.2-1) experimental; urgency=low

debian/control

@@ -61,6 +61,7 @@ Build-Depends: debhelper (>= 9),
                libytnef0-dev,
                libgdata-dev (>= 0.10),
                libical-dev,
+               libpst-dev,
                libsm-dev,
                libice-dev,
                libgstreamer0.10-dev,
@@ -203,6 +204,7 @@ Description: standard plugins for Evolution
   - mail-to-task
   - mailing-list-actions
   - prefer-plain
+  - pst-import
   - mail-notification
   - attachment-reminder
   - backup-restore

debian/evolution-plugins.install

@@ -26,7 +26,5 @@ usr/lib/evolution/*/plugins/*-dbx-import.so
 usr/lib/evolution/*/plugins/*-dbx-import.eplug
 usr/lib/evolution/*/plugins/*-audio-inline.so
 usr/lib/evolution/*/plugins/*-audio-inline.eplug
-usr/lib/evolution/*/plugins/*-image-inline.so
-usr/lib/evolution/*/plugins/*-image-inline.eplug
 usr/lib/evolution/*/plugins/*-pst-import.so
 usr/lib/evolution/*/plugins/*-pst-import.eplug

debian/evolution.install

@@ -26,8 +26,4 @@ usr/lib/evolution/*/plugins/*-webdav.so
 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

debian/rules

@@ -29,7 +29,7 @@ DEB_CONFIGURE_EXTRA_FLAGS += \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
 	--enable-plugins=experimental \
-	--disable-pst-import \
+	--enable-pst-import \
 	--enable-python \
 	--enable-contact-maps \
 	--disable-image-inline \