r2799 - in /experimental/evolution/debian: ./ patches/

ah at users.alioth.debian.org ah at users.alioth.debian.org
Thu Oct 1 15:28:48 UTC 2015


Author: ah
Date: Thu Oct  1 15:28:48 2015
New Revision: 2799

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2799
Log:
* New upstream release.
* Update build-dependencies according to configure.ac changes:
  - bump libgweather-3-dev to >= 3.10.0
  - drop libgdata-dev
  - bump libcamel1.2-dev to >= 3.18.0
  - bump libebook1.2-dev to >= 3.18.0
  - bump libecal1.2-dev to >= 3.18.0
  - bump libedataserver1.2-dev to >= 3.18.0
  - bump libedataserverui1.2-dev to >= 3.18.0
  - bump libebackend1.2-dev to >= 3.18.0
* Drop patches now included in upstream release:
  - 0001-Move-em_utils_prompt_user-to-e-util-to-remove-duplic.patch
  - 0002-EHTMLEditorView-Add-a-checkbox-to-remember-the-choic.patch
* Have quilt refresh remaining patches.
* evolution.install: stop trying to install itip-formatter plugin
  - this is now a module instead of plugin and shipped as such.
* Add myself to uploaders.

Removed:
    experimental/evolution/debian/patches/0001-Move-em_utils_prompt_user-to-e-util-to-remove-duplic.patch
    experimental/evolution/debian/patches/0002-EHTMLEditorView-Add-a-checkbox-to-remember-the-choic.patch
Modified:
    experimental/evolution/debian/changelog
    experimental/evolution/debian/control
    experimental/evolution/debian/evolution.install
    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=2799&op=diff
==============================================================================
--- experimental/evolution/debian/changelog	(original)
+++ experimental/evolution/debian/changelog	Thu Oct  1 15:28:48 2015
@@ -1,3 +1,25 @@
+evolution (3.18.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Update build-dependencies according to configure.ac changes:
+    - bump libgweather-3-dev to >= 3.10.0
+    - drop libgdata-dev
+    - bump libcamel1.2-dev to >= 3.18.0
+    - bump libebook1.2-dev to >= 3.18.0
+    - bump libecal1.2-dev to >= 3.18.0
+    - bump libedataserver1.2-dev to >= 3.18.0
+    - bump libedataserverui1.2-dev to >= 3.18.0
+    - bump libebackend1.2-dev to >= 3.18.0
+  * Drop patches now included in upstream release:
+    - 0001-Move-em_utils_prompt_user-to-e-util-to-remove-duplic.patch
+    - 0002-EHTMLEditorView-Add-a-checkbox-to-remember-the-choic.patch
+  * Have quilt refresh remaining patches.
+  * evolution.install: stop trying to install itip-formatter plugin
+    - this is now a module instead of plugin and shipped as such.
+  * Add myself to uploaders.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Thu, 01 Oct 2015 16:39:39 +0200
+
 evolution (3.16.5-1) unstable; urgency=medium
 
   [ Emilio Pozuelo Monfort ]

Modified: experimental/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/control?rev=2799&op=diff
==============================================================================
--- experimental/evolution/debian/control	(original)
+++ experimental/evolution/debian/control	Thu Oct  1 15:28:48 2015
@@ -9,7 +9,8 @@
            Oystein Gisnas <oystein at gisnas.net>,
            Pedro Fragoso <emberez at gmail.com>,
            Josselin Mouette <joss at debian.org>,
-           Laurent Bigonville <bigon at debian.org>
+           Laurent Bigonville <bigon at debian.org>,
+           Andreas Henriksson <andreas at fatal.se>
 Standards-Version: 3.9.6
 Homepage: http://projects.gnome.org/evolution/
 Vcs-Svn: svn://anonscm.debian.org/pkg-evolution/unstable/evolution
@@ -18,17 +19,17 @@
                cdbs (>= 0.4.90),
                dh-autoreconf,
                dpkg-dev (>= 1.16.1),
-               libcamel1.2-dev (>= 3.16.5),
+               libcamel1.2-dev (>= 3.18.0),
                libchamplain-gtk-0.12-dev,
                libglib2.0-dev (>= 2.40),
                libgtk-3-dev (>= 3.10.0),
                libgail-3-dev (>= 3.0.2),
                libgdk-pixbuf2.0-dev (>= 2.24.0),
-               libebook1.2-dev (>= 3.16.5),
-               libecal1.2-dev (>= 3.16.5),
-               libedataserver1.2-dev (>= 3.16.5),
-               libedataserverui1.2-dev (>= 3.16.5),
-               libebackend1.2-dev (>= 3.16.5),
+               libebook1.2-dev (>= 3.18.0),
+               libecal1.2-dev (>= 3.18.0),
+               libedataserver1.2-dev (>= 3.18.0),
+               libedataserverui1.2-dev (>= 3.18.0),
+               libebackend1.2-dev (>= 3.18.0),
                libebook-contacts1.2-dev (>= 3.16.5),
                evolution-data-server-dev (>= 3.16.5),
                evolution-data-server-dev (<< 3.17),
@@ -43,7 +44,7 @@
                shared-mime-info (>= 0.22),
                libnotify-dev (>= 0.7),
                libdbus-glib-1-dev (>= 0.6),
-               libgweather-3-dev (>= 3.8.0),
+               libgweather-3-dev (>= 3.10.0),
                libcanberra-gtk3-dev (>= 0.25),
                network-manager-dev (>= 0.7) [linux-any],
                intltool (>= 0.40.0),
@@ -59,7 +60,6 @@
                libnss3-dev,
                psmisc,
                libytnef0-dev,
-               libgdata-dev (>= 0.10),
                libical-dev,
                libpst-dev (>= 0.6.54),
                libsm-dev,

Modified: experimental/evolution/debian/evolution.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution.install?rev=2799&op=diff
==============================================================================
--- experimental/evolution/debian/evolution.install	(original)
+++ experimental/evolution/debian/evolution.install	Thu Oct  1 15:28:48 2015
@@ -1,8 +1,6 @@
 debian/evolution.xpm usr/share/pixmaps/
 etc/xdg
 usr/bin
-usr/lib/evolution/plugins/*-itip-formatter.so
-usr/lib/evolution/plugins/*-itip-formatter.eplug
 usr/lib/evolution/plugins/*-publish-calendar.so
 usr/lib/evolution/plugins/*-publish-calendar.eplug
 usr/share/applications

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=2799&op=diff
==============================================================================
--- experimental/evolution/debian/patches/02_nss_paths.patch	(original)
+++ experimental/evolution/debian/patches/02_nss_paths.patch	Thu Oct  1 15:28:48 2015
@@ -4,11 +4,9 @@
  built-in certificate store of NSS) lives, and it's actually under libdir/nss
  rather than directly under libdir.
 
-Index: evolution-3.10.1/configure.ac
-===================================================================
---- evolution-3.10.1.orig/configure.ac	2013-10-20 09:18:43.441618478 +0200
-+++ evolution-3.10.1/configure.ac	2013-10-20 09:18:43.441618478 +0200
-@@ -676,7 +676,7 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -745,7 +745,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=2799&op=diff
==============================================================================
--- experimental/evolution/debian/patches/10_revert_libevolution_avoid-version.patch	(original)
+++ experimental/evolution/debian/patches/10_revert_libevolution_avoid-version.patch	Thu Oct  1 15:28:48 2015
@@ -6,8 +6,8 @@
 Forwarded: no
 
 ---
---- evolution-3.13.5.orig/addressbook/gui/contact-editor/Makefile.am
-+++ evolution-3.13.5/addressbook/gui/contact-editor/Makefile.am
+--- a/addressbook/gui/contact-editor/Makefile.am
++++ b/addressbook/gui/contact-editor/Makefile.am
 @@ -26,7 +26,7 @@
  	e-contact-editor-dyntable.h \
  	e-contact-editor-dyntable.c
@@ -17,8 +17,8 @@
  
  libecontacteditor_la_LIBADD =						\
  	$(top_builddir)/e-util/libevolution-util.la			\
---- evolution-3.13.5.orig/addressbook/gui/contact-list-editor/Makefile.am
-+++ evolution-3.13.5/addressbook/gui/contact-list-editor/Makefile.am
+--- a/addressbook/gui/contact-list-editor/Makefile.am
++++ b/addressbook/gui/contact-list-editor/Makefile.am
 @@ -20,7 +20,7 @@
  	e-contact-list-model.c			\
  	e-contact-list-model.h
@@ -28,8 +28,8 @@
  
  libecontactlisteditor_la_LIBADD =				\
  	$(top_builddir)/addressbook/util/libeabutil.la		\
---- evolution-3.13.5.orig/addressbook/importers/Makefile.am
-+++ evolution-3.13.5/addressbook/importers/Makefile.am
+--- a/addressbook/importers/Makefile.am
++++ b/addressbook/importers/Makefile.am
 @@ -19,7 +19,7 @@
  	evolution-csv-importer.c	        \
  	evolution-addressbook-importers.h
@@ -39,8 +39,8 @@
  
  libevolution_addressbook_importers_la_LIBADD = \
  	$(top_builddir)/e-util/libevolution-util.la 			\
---- evolution-3.13.5.orig/addressbook/util/Makefile.am
-+++ evolution-3.13.5/addressbook/util/Makefile.am
+--- a/addressbook/util/Makefile.am
++++ b/addressbook/util/Makefile.am
 @@ -20,7 +20,7 @@
  	eab-book-util.c					\
  	eab-book-util.h
@@ -50,9 +50,9 @@
  
  libeabutil_la_LIBADD =					\
  	$(top_builddir)/e-util/libevolution-util.la	\
---- evolution-3.13.5.orig/calendar/gui/Makefile.am
-+++ evolution-3.13.5/calendar/gui/Makefile.am
-@@ -210,7 +210,7 @@
+--- a/calendar/gui/Makefile.am
++++ b/calendar/gui/Makefile.am
+@@ -207,7 +207,7 @@
  	$(LIBSOUP_LIBS)							\
  	$(NULL)
  
@@ -61,8 +61,8 @@
  
  EXTRA_DIST =	 			\
  	$(ui_DATA)			\
---- evolution-3.13.5.orig/calendar/importers/Makefile.am
-+++ evolution-3.13.5/calendar/importers/Makefile.am
+--- a/calendar/importers/Makefile.am
++++ b/calendar/importers/Makefile.am
 @@ -16,7 +16,7 @@
  	evolution-calendar-importer.h	     \
  	icalendar-importer.c
@@ -72,8 +72,8 @@
  
  libevolution_calendar_importers_la_LIBADD =			\
  	$(top_builddir)/e-util/libevolution-util.la		\
---- evolution-3.13.5.orig/composer/Makefile.am
-+++ evolution-3.13.5/composer/Makefile.am
+--- a/composer/Makefile.am
++++ b/composer/Makefile.am
 @@ -51,7 +51,7 @@
  	e-composer-text-header.c		\
  	e-msg-composer.c
@@ -83,9 +83,9 @@
  
  libevolution_mail_composer_la_LIBADD =			\
  	$(top_builddir)/e-util/libevolution-util.la	\
---- evolution-3.13.5.orig/e-util/Makefile.am
-+++ evolution-3.13.5/e-util/Makefile.am
-@@ -639,7 +639,7 @@
+--- a/e-util/Makefile.am
++++ b/e-util/Makefile.am
+@@ -646,7 +646,7 @@
  	$(PLATFORM_SOURCES) \
  	$(NULL)
  
@@ -94,8 +94,8 @@
  
  libevolution_util_la_LIBADD =  \
  	$(top_builddir)/libgnomecanvas/libgnomecanvas.la \
---- evolution-3.13.5.orig/em-format/Makefile.am
-+++ evolution-3.13.5/em-format/Makefile.am
+--- a/em-format/Makefile.am
++++ b/em-format/Makefile.am
 @@ -98,7 +98,7 @@
  	e-mail-parser-image.c				\
  	e-mail-parser-inlinepgp-encrypted.c		\
@@ -114,9 +114,9 @@
  
  if ENABLE_SMIME
  SMIME_LIBS =						\
---- evolution-3.13.5.orig/libemail-engine/Makefile.am
-+++ evolution-3.13.5/libemail-engine/Makefile.am
-@@ -82,7 +82,7 @@
+--- a/libemail-engine/Makefile.am
++++ b/libemail-engine/Makefile.am
+@@ -80,7 +80,7 @@
  	$(GNOME_PLATFORM_LIBS) \
  	$(NULL)
  
@@ -125,8 +125,8 @@
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = libemail-engine.pc
---- evolution-3.13.5.orig/libgnomecanvas/Makefile.am
-+++ evolution-3.13.5/libgnomecanvas/Makefile.am
+--- a/libgnomecanvas/Makefile.am
++++ b/libgnomecanvas/Makefile.am
 @@ -54,7 +54,7 @@
  	$(GNOME_PLATFORM_LIBS) \
  	$(MATH_LIB)
@@ -136,9 +136,9 @@
  
  BUILT_SOURCES = $(MARSHAL_GENERATED)
  
---- evolution-3.13.5.orig/mail/Makefile.am
-+++ evolution-3.13.5/mail/Makefile.am
-@@ -230,7 +230,7 @@
+--- a/mail/Makefile.am
++++ b/mail/Makefile.am
+@@ -236,7 +236,7 @@
  	$(LIBSOUP_LIBS)					\
  	$(NULL)
  
@@ -147,9 +147,9 @@
  
  noinst_PROGRAMS = test-mail-autoconfig
  
---- evolution-3.13.5.orig/mail/importers/Makefile.am
-+++ evolution-3.13.5/mail/importers/Makefile.am
-@@ -19,7 +19,7 @@
+--- a/mail/importers/Makefile.am
++++ b/mail/importers/Makefile.am
+@@ -22,7 +22,7 @@
  	pine-importer.c				\
  	evolution-mbox-importer.c
  
@@ -158,8 +158,8 @@
  
  libevolution_mail_importers_la_LIBADD =				\
  	$(top_builddir)/e-util/libevolution-util.la		\
---- evolution-3.13.5.orig/shell/Makefile.am
-+++ evolution-3.13.5/shell/Makefile.am
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
 @@ -86,7 +86,7 @@
  	evo-version.h				\
  	$(NULL)
@@ -169,8 +169,8 @@
  
  libevolution_shell_la_LIBADD =				\
  	$(top_builddir)/e-util/libevolution-util.la	\
---- evolution-3.13.5.orig/smime/gui/Makefile.am
-+++ evolution-3.13.5/smime/gui/Makefile.am
+--- a/smime/gui/Makefile.am
++++ b/smime/gui/Makefile.am
 @@ -43,7 +43,7 @@
  	$(CERT_UI_LIBS)					\
  	$(NULL)
@@ -180,8 +180,8 @@
  
  ui_DATA = smime-ui.ui
  
---- evolution-3.13.5.orig/smime/lib/Makefile.am
-+++ evolution-3.13.5/smime/lib/Makefile.am
+--- a/smime/lib/Makefile.am
++++ b/smime/lib/Makefile.am
 @@ -35,6 +35,6 @@
  	$(CERT_UI_LIBS)				\
  	$(NULL)

Modified: experimental/evolution/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/series?rev=2799&op=diff
==============================================================================
--- experimental/evolution/debian/patches/series	(original)
+++ experimental/evolution/debian/patches/series	Thu Oct  1 15:28:48 2015
@@ -1,4 +1,2 @@
-0001-Move-em_utils_prompt_user-to-e-util-to-remove-duplic.patch
-0002-EHTMLEditorView-Add-a-checkbox-to-remember-the-choic.patch
 02_nss_paths.patch
 10_revert_libevolution_avoid-version.patch




More information about the pkg-evolution-commits mailing list