r3032 - in /experimental/evolution/debian: changelog patches/02_nss_paths.patch patches/10_revert_libevolution_avoid-version.patch patches/Fix-archives-support-in-attachments.patch patches/lower-webkit-dependency.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Sep 21 21:50:14 2016
New Revision: 3032

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=3032
Log:
* New upstream release.
* Update patches:
  - Drop Fix-archives-support-in-attachments.patch, merged upstream.
  - Drop lower-webkit-dependency.patch, no longer necessary.
  - Refresh remaining patches.

Removed:
    experimental/evolution/debian/patches/Fix-archives-support-in-attachments.patch
    experimental/evolution/debian/patches/lower-webkit-dependency.patch
Modified:
    experimental/evolution/debian/changelog
    experimental/evolution/debian/patches/02_nss_paths.patch
    experimental/evolution/debian/patches/10_revert_libevolution_avoid-version.patch
    experimental/evolution/debian/patches/series

Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=3032&op=diff
==============================================================================
--- experimental/evolution/debian/changelog	(original)
+++ experimental/evolution/debian/changelog	Wed Sep 21 21:50:14 2016
@@ -1,3 +1,13 @@
+evolution (3.22.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Update patches:
+    - Drop Fix-archives-support-in-attachments.patch, merged upstream.
+    - Drop lower-webkit-dependency.patch, no longer necessary.
+    - Refresh remaining patches.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 21 Sep 2016 23:47:02 +0200
+
 evolution (3.21.91-1) experimental; urgency=medium
 
   [ Jeremy Bicha ]

Modified: experimental/evolution/debian/patches/02_nss_paths.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/02_nss_paths.patch?rev=3032&op=diff
==============================================================================
--- experimental/evolution/debian/patches/02_nss_paths.patch	(original)
+++ experimental/evolution/debian/patches/02_nss_paths.patch	Wed Sep 21 21:50:14 2016
@@ -4,9 +4,11 @@
  built-in certificate store of NSS) lives, and it's actually under libdir/nss
  rather than directly under libdir.
 
+Index: b/configure.ac
+===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -745,7 +745,7 @@
+@@ -751,7 +751,7 @@
  			fi
  			AC_DEFINE(HAVE_NSS,1,[Define if you have NSS])
  			AC_DEFINE(HAVE_SSL,1,[Define if you have a supported SSL library])

Modified: experimental/evolution/debian/patches/10_revert_libevolution_avoid-version.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/10_revert_libevolution_avoid-version.patch?rev=3032&op=diff
==============================================================================
--- experimental/evolution/debian/patches/10_revert_libevolution_avoid-version.patch	(original)
+++ experimental/evolution/debian/patches/10_revert_libevolution_avoid-version.patch	Wed Sep 21 21:50:14 2016
@@ -101,7 +101,7 @@
 ===================================================================
 --- a/e-util/Makefile.am
 +++ b/e-util/Makefile.am
-@@ -646,7 +646,7 @@
+@@ -675,7 +675,7 @@
  	$(PLATFORM_SOURCES) \
  	$(NULL)
  
@@ -114,7 +114,7 @@
 ===================================================================
 --- a/em-format/Makefile.am
 +++ b/em-format/Makefile.am
-@@ -98,7 +98,7 @@
+@@ -95,7 +95,7 @@
  	e-mail-parser-image.c				\
  	e-mail-parser-inlinepgp-encrypted.c		\
  	e-mail-parser-inlinepgp-signed.c		\
@@ -123,7 +123,7 @@
  	e-mail-parser-message-deliverystatus.c		\
  	e-mail-parser-message-external.c		\
  	e-mail-parser-message-rfc822.c			\
-@@ -125,7 +125,7 @@
+@@ -122,7 +122,7 @@
  	e-mail-stripsig-filter.c			\
  	$(SMIME_EXTENSIONS)
  
@@ -162,7 +162,7 @@
 ===================================================================
 --- a/mail/Makefile.am
 +++ b/mail/Makefile.am
-@@ -238,7 +238,7 @@
+@@ -240,7 +240,7 @@
  	$(LIBSOUP_LIBS)					\
  	$(NULL)
  

Modified: experimental/evolution/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/series?rev=3032&op=diff
==============================================================================
--- experimental/evolution/debian/patches/series	(original)
+++ experimental/evolution/debian/patches/series	Wed Sep 21 21:50:14 2016
@@ -1,4 +1,2 @@
 02_nss_paths.patch
 10_revert_libevolution_avoid-version.patch
-lower-webkit-dependency.patch
-Fix-archives-support-in-attachments.patch