r2593 - in /experimental/evolution: ./ debian/changelog debian/control debian/patches/10_revert_libevolution_avoid-version.patch debian/rules

jeansch-guest at users.alioth.debian.org jeansch-guest at users.alioth.debian.org
Mon Sep 8 00:31:02 UTC 2014 

Author: jeansch-guest
Date: Mon Sep  8 00:31:01 2014
New Revision: 2593

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2593
Log:
* New upstream release.
* debian/control:
  - Bump e-d-s Build-Deps to >= 3.13.5.
  - Drop libgtkhtml-* Build-Dep.
  - Add libcryptui-dev Build-Dep.
  - Bump Standards-Version to 3.9.4 (no further changes).
* Refreshed debian/patches/10_revert_libevolution_avoid-version.patch.

Added:
    experimental/evolution/
      - copied from r2592, unstable/evolution/
Modified:
    experimental/evolution/debian/changelog
    experimental/evolution/debian/control
    experimental/evolution/debian/patches/10_revert_libevolution_avoid-version.patch
    experimental/evolution/debian/rules

Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=2593&op=diff
==============================================================================
--- experimental/evolution/debian/changelog	(original)
+++ experimental/evolution/debian/changelog	Mon Sep  8 00:31:01 2014
@@ -1,3 +1,15 @@
+evolution (3.13.5-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * debian/control:
+    - Bump e-d-s Build-Deps to >= 3.13.5.
+    - Drop libgtkhtml-* Build-Dep.
+    - Add libcryptui-dev Build-Dep.
+    - Bump Standards-Version to 3.9.4 (no further changes).
+  * Refreshed debian/patches/10_revert_libevolution_avoid-version.patch.
+
+ -- Jean Schurger <jean at schurger.org>  Sat, 06 Sep 2014 15:45:37 -0400
+
 evolution (3.12.5-1) unstable; urgency=medium
 
   * Team upload.

Modified: experimental/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/control?rev=2593&op=diff
==============================================================================
--- experimental/evolution/debian/control	(original)
+++ experimental/evolution/debian/control	Mon Sep  8 00:31:01 2014
@@ -10,7 +10,7 @@
            Pedro Fragoso <emberez at gmail.com>,
            Josselin Mouette <joss at debian.org>,
            Laurent Bigonville <bigon at debian.org>
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://projects.gnome.org/evolution/
 Vcs-Svn: svn://anonscm.debian.org/pkg-evolution/unstable/evolution
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-evolution/unstable/evolution
@@ -18,22 +18,20 @@
                cdbs (>= 0.4.90),
                dh-autoreconf,
                dpkg-dev (>= 1.16.1),
-               libcamel1.2-dev (>= 3.12.5),
+               libcamel1.2-dev (>= 3.13.5),
                libchamplain-gtk-0.12-dev,
                libgeoclue-dev (>= 0.12.0),
                libglib2.0-dev (>= 2.36),
                libgtk-3-dev (>= 3.8.0),
                libgail-3-dev (>= 3.0.2),
                libgdk-pixbuf2.0-dev (>= 2.24.0),
-               libebook1.2-dev (>= 3.12.5),
-               libecal1.2-dev (>= 3.12.5),
-               libedataserver1.2-dev (>= 3.12.5),
-               libebackend1.2-dev (>= 3.12.5),
-               libebook-contacts1.2-dev (>= 3.12.2),
-               evolution-data-server-dev (>= 3.12.2),
-               evolution-data-server-dev (<< 3.13),
-               libgtkhtml-4.0-dev (>= 4.5.2),
-               libgtkhtml-editor-4.0-dev,
+               libebook1.2-dev (>= 3.13.5),
+               libecal1.2-dev (>= 3.13.5),
+               libedataserver1.2-dev (>= 3.13.5),
+               libebackend1.2-dev (>= 3.13.5),
+               libebook-contacts1.2-dev (>= 3.13.5),
+               evolution-data-server-dev (>= 3.13.5),
+               evolution-data-server-dev (<< 3.14),
                libwebkitgtk-3.0-dev (>= 2.0.1),
                libgcr-3-dev (>= 3.4),
                libgtkspell3-3-dev,
@@ -75,15 +73,16 @@
                spamassassin,
                spamc,
                bogofilter,
-               highlight
+               highlight,
+               libcryptui-dev,
 
 Package: evolution
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          evolution-common (= ${source:Version}),
-         evolution-data-server (>= 3.12.2),
-         evolution-data-server (<< 3.13),
+         evolution-data-server (>= 3.13.2),
+         evolution-data-server (<< 3.14),
          gnome-icon-theme (>= 2.30.2.1),
          dbus,
          psmisc
@@ -153,8 +152,6 @@
 # evolution-plugin
          libxml2-dev,
          libcamel1.2-dev,
-         libgtkhtml-4.0-dev,
-         libgtkhtml-editor-4.0-dev,
 # evolution-shell
          libebackend1.2-dev,
          libgtk-3-dev,

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=2593&op=diff
==============================================================================
--- experimental/evolution/debian/patches/10_revert_libevolution_avoid-version.patch	(original)
+++ experimental/evolution/debian/patches/10_revert_libevolution_avoid-version.patch	Mon Sep  8 00:31:01 2014
@@ -6,178 +6,187 @@
 Forwarded: no
 
 ---
---- a/addressbook/gui/contact-editor/Makefile.am
-+++ b/addressbook/gui/contact-editor/Makefile.am
-@@ -23,7 +23,7 @@
- 	e-contact-quick-add.c			\
- 	e-contact-quick-add.h
+--- evolution-3.13.5.orig/addressbook/gui/contact-editor/Makefile.am
++++ evolution-3.13.5/addressbook/gui/contact-editor/Makefile.am
+@@ -26,7 +26,7 @@
+ 	e-contact-editor-dyntable.h \
+ 	e-contact-editor-dyntable.c
  
--libecontacteditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-+libecontacteditor_la_LDFLAGS =  $(NO_UNDEFINED)
+-libecontacteditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
++libecontacteditor_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
  
  libecontacteditor_la_LIBADD =						\
  	$(top_builddir)/e-util/libevolution-util.la			\
---- a/addressbook/gui/contact-list-editor/Makefile.am
-+++ b/addressbook/gui/contact-list-editor/Makefile.am
-@@ -19,7 +19,7 @@
+--- evolution-3.13.5.orig/addressbook/gui/contact-list-editor/Makefile.am
++++ evolution-3.13.5/addressbook/gui/contact-list-editor/Makefile.am
+@@ -20,7 +20,7 @@
  	e-contact-list-model.c			\
  	e-contact-list-model.h
  
--libecontactlisteditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-+libecontactlisteditor_la_LDFLAGS =  $(NO_UNDEFINED)
+-libecontactlisteditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
++libecontactlisteditor_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
  
  libecontactlisteditor_la_LIBADD =				\
  	$(top_builddir)/addressbook/util/libeabutil.la		\
---- a/addressbook/importers/Makefile.am
-+++ b/addressbook/importers/Makefile.am
-@@ -18,7 +18,7 @@
+--- evolution-3.13.5.orig/addressbook/importers/Makefile.am
++++ evolution-3.13.5/addressbook/importers/Makefile.am
+@@ -19,7 +19,7 @@
  	evolution-csv-importer.c	        \
  	evolution-addressbook-importers.h
  
--libevolution_addressbook_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-+libevolution_addressbook_importers_la_LDFLAGS =  $(NO_UNDEFINED)
+-libevolution_addressbook_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
++libevolution_addressbook_importers_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
  
  libevolution_addressbook_importers_la_LIBADD = \
  	$(top_builddir)/e-util/libevolution-util.la 			\
---- a/addressbook/util/Makefile.am
-+++ b/addressbook/util/Makefile.am
-@@ -19,7 +19,7 @@
+--- evolution-3.13.5.orig/addressbook/util/Makefile.am
++++ evolution-3.13.5/addressbook/util/Makefile.am
+@@ -20,7 +20,7 @@
  	eab-book-util.c					\
  	eab-book-util.h
  
--libeabutil_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-+libeabutil_la_LDFLAGS =  $(NO_UNDEFINED)
+-libeabutil_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
++libeabutil_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
  
  libeabutil_la_LIBADD =					\
  	$(top_builddir)/e-util/libevolution-util.la	\
---- a/calendar/gui/Makefile.am
-+++ b/calendar/gui/Makefile.am
-@@ -209,7 +209,7 @@
- 	$(GTKHTML_LIBS)							\
- 	$(LIBSOUP_LIBS)
+--- evolution-3.13.5.orig/calendar/gui/Makefile.am
++++ evolution-3.13.5/calendar/gui/Makefile.am
+@@ -210,7 +210,7 @@
+ 	$(LIBSOUP_LIBS)							\
+ 	$(NULL)
  
--libevolution_calendar_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-+libevolution_calendar_la_LDFLAGS =  $(NO_UNDEFINED)
+-libevolution_calendar_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
++libevolution_calendar_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
  
  EXTRA_DIST =	 			\
  	$(ui_DATA)			\
---- a/calendar/importers/Makefile.am
-+++ b/calendar/importers/Makefile.am
-@@ -15,7 +15,7 @@
+--- evolution-3.13.5.orig/calendar/importers/Makefile.am
++++ evolution-3.13.5/calendar/importers/Makefile.am
+@@ -16,7 +16,7 @@
  	evolution-calendar-importer.h	     \
  	icalendar-importer.c
  
--libevolution_calendar_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-+libevolution_calendar_importers_la_LDFLAGS =  $(NO_UNDEFINED)
+-libevolution_calendar_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
++libevolution_calendar_importers_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
  
  libevolution_calendar_importers_la_LIBADD =			\
  	$(top_builddir)/e-util/libevolution-util.la		\
---- a/composer/Makefile.am
-+++ b/composer/Makefile.am
-@@ -52,7 +52,7 @@
+--- evolution-3.13.5.orig/composer/Makefile.am
++++ evolution-3.13.5/composer/Makefile.am
+@@ -51,7 +51,7 @@
  	e-composer-text-header.c		\
  	e-msg-composer.c
  
--libevolution_mail_composer_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-+libevolution_mail_composer_la_LDFLAGS = $(NO_UNDEFINED)
+-libevolution_mail_composer_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
++libevolution_mail_composer_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
  
  libevolution_mail_composer_la_LIBADD =			\
  	$(top_builddir)/e-util/libevolution-util.la	\
---- a/e-util/Makefile.am
-+++ b/e-util/Makefile.am
-@@ -581,7 +581,7 @@
+--- evolution-3.13.5.orig/e-util/Makefile.am
++++ evolution-3.13.5/e-util/Makefile.am
+@@ -639,7 +639,7 @@
  	$(PLATFORM_SOURCES) \
  	$(NULL)
  
--libevolution_util_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-+libevolution_util_la_LDFLAGS = $(NO_UNDEFINED)
+-libevolution_util_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
++libevolution_util_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
  
  libevolution_util_la_LIBADD =  \
  	$(top_builddir)/libgnomecanvas/libgnomecanvas.la \
---- a/em-format/Makefile.am
-+++ b/em-format/Makefile.am
-@@ -124,7 +124,7 @@
+--- evolution-3.13.5.orig/em-format/Makefile.am
++++ evolution-3.13.5/em-format/Makefile.am
+@@ -98,7 +98,7 @@
+ 	e-mail-parser-image.c				\
+ 	e-mail-parser-inlinepgp-encrypted.c		\
+ 	e-mail-parser-inlinepgp-signed.c		\
+- 	e-mail-parser-message.c				\
++	e-mail-parser-message.c				\
+ 	e-mail-parser-message-deliverystatus.c		\
+ 	e-mail-parser-message-external.c		\
+ 	e-mail-parser-message-rfc822.c			\
+@@ -125,7 +125,7 @@
  	e-mail-stripsig-filter.c			\
  	$(SMIME_EXTENSIONS)
  
--libevolution_mail_formatter_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-+libevolution_mail_formatter_la_LDFLAGS = $(NO_UNDEFINED)
+-libevolution_mail_formatter_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
++libevolution_mail_formatter_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
  
  if ENABLE_SMIME
  SMIME_LIBS =						\
---- a/libemail-engine/Makefile.am
-+++ b/libemail-engine/Makefile.am
-@@ -83,7 +83,7 @@
- 	$(GTKHTML_LIBS) \
+--- evolution-3.13.5.orig/libemail-engine/Makefile.am
++++ evolution-3.13.5/libemail-engine/Makefile.am
+@@ -82,7 +82,7 @@
+ 	$(GNOME_PLATFORM_LIBS) \
  	$(NULL)
  
--libemail_engine_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-+libemail_engine_la_LDFLAGS =  $(NO_UNDEFINED)
+-libemail_engine_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
++libemail_engine_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = libemail-engine.pc
---- a/libgnomecanvas/Makefile.am
-+++ b/libgnomecanvas/Makefile.am
-@@ -53,7 +53,7 @@
+--- evolution-3.13.5.orig/libgnomecanvas/Makefile.am
++++ evolution-3.13.5/libgnomecanvas/Makefile.am
+@@ -54,7 +54,7 @@
  	$(GNOME_PLATFORM_LIBS) \
  	$(MATH_LIB)
  
--libgnomecanvas_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-+libgnomecanvas_la_LDFLAGS =  $(NO_UNDEFINED)
+-libgnomecanvas_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
++libgnomecanvas_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
  
  BUILT_SOURCES = $(MARSHAL_GENERATED)
  
---- a/mail/Makefile.am
-+++ b/mail/Makefile.am
-@@ -226,7 +226,7 @@
+--- evolution-3.13.5.orig/mail/Makefile.am
++++ evolution-3.13.5/mail/Makefile.am
+@@ -230,7 +230,7 @@
  	$(LIBSOUP_LIBS)					\
  	$(NULL)
  
--libevolution_mail_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-+libevolution_mail_la_LDFLAGS =  $(NO_UNDEFINED)
+-libevolution_mail_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
++libevolution_mail_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
  
- libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h
+ noinst_PROGRAMS = test-mail-autoconfig
  
---- a/mail/importers/Makefile.am
-+++ b/mail/importers/Makefile.am
-@@ -18,7 +18,7 @@
+--- evolution-3.13.5.orig/mail/importers/Makefile.am
++++ evolution-3.13.5/mail/importers/Makefile.am
+@@ -19,7 +19,7 @@
  	pine-importer.c				\
  	evolution-mbox-importer.c
  
--libevolution_mail_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-+libevolution_mail_importers_la_LDFLAGS =  $(NO_UNDEFINED)
+-libevolution_mail_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
++libevolution_mail_importers_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
  
  libevolution_mail_importers_la_LIBADD =				\
  	$(top_builddir)/e-util/libevolution-util.la		\
---- a/shell/Makefile.am
-+++ b/shell/Makefile.am
-@@ -85,7 +85,7 @@
+--- evolution-3.13.5.orig/shell/Makefile.am
++++ evolution-3.13.5/shell/Makefile.am
+@@ -86,7 +86,7 @@
  	evo-version.h				\
  	$(NULL)
  
--libevolution_shell_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-+libevolution_shell_la_LDFLAGS = $(NO_UNDEFINED)
+-libevolution_shell_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
++libevolution_shell_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
  
  libevolution_shell_la_LIBADD =				\
  	$(top_builddir)/e-util/libevolution-util.la	\
---- a/smime/gui/Makefile.am
-+++ b/smime/gui/Makefile.am
-@@ -42,7 +42,7 @@
- 	$(GTKHTML_LIBS)					\
- 	$(CERT_UI_LIBS)
+--- evolution-3.13.5.orig/smime/gui/Makefile.am
++++ evolution-3.13.5/smime/gui/Makefile.am
+@@ -43,7 +43,7 @@
+ 	$(CERT_UI_LIBS)					\
+ 	$(NULL)
  
--libevolution_smime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-+libevolution_smime_la_LDFLAGS =  $(NO_UNDEFINED)
+-libevolution_smime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
++libevolution_smime_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
  
  ui_DATA = smime-ui.ui
  
---- a/smime/lib/Makefile.am
-+++ b/smime/lib/Makefile.am
-@@ -34,6 +34,6 @@
- 	$(GTKHTML_LIBS)				\
- 	$(CERT_UI_LIBS)
+--- evolution-3.13.5.orig/smime/lib/Makefile.am
++++ evolution-3.13.5/smime/lib/Makefile.am
+@@ -35,6 +35,6 @@
+ 	$(CERT_UI_LIBS)				\
+ 	$(NULL)
  
--libessmime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-+libessmime_la_LDFLAGS =  $(NO_UNDEFINED)
+-libessmime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
++libessmime_la_LDFLAGS = $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
  
  -include $(top_srcdir)/git.mk

Modified: experimental/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/rules?rev=2593&op=diff
==============================================================================
--- experimental/evolution/debian/rules	(original)
+++ experimental/evolution/debian/rules	Mon Sep  8 00:31:01 2014
@@ -9,7 +9,7 @@
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 
-ELIBDIR := usr/lib/evolution/3.12
+ELIBDIR := usr/lib/evolution/3.14
 
 DEB_DH_AUTORECONF_ARGS := --as-needed
 DEB_SHLIBDEPS_INCLUDE := debian/evolution/$(ELIBDIR)

More information about the pkg-evolution-commits mailing list