r2485 - in /experimental/evolution/debian: changelog evolution-common.install patches/02_nss_paths.patch patches/10_revert_libevolution_avoid-version.patch
jordi at users.alioth.debian.org
jordi at users.alioth.debian.org
Sun Oct 20 08:41:24 UTC 2013
Author: jordi
Date: Sun Oct 20 08:41:23 2013
New Revision: 2485
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2485
Log:
* Refresh patches.
* Install appdata files in -common.
Modified:
experimental/evolution/debian/changelog
experimental/evolution/debian/evolution-common.install
experimental/evolution/debian/patches/02_nss_paths.patch
experimental/evolution/debian/patches/10_revert_libevolution_avoid-version.patch
Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=2485&op=diff
==============================================================================
--- experimental/evolution/debian/changelog (original)
+++ experimental/evolution/debian/changelog Sun Oct 20 08:41:23 2013
@@ -1,8 +1,10 @@
evolution (3.10.1-1) UNRELEASED; urgency=low
* New upstream release.
+ * Refresh patches.
* Update build dependencies as per configure.ac.
* Drop --enable-goa. This has been moved entirely to EDS.
+ * Install appdata files in -common.
-- Jordi Mallach <jordi at debian.org> Fri, 18 Oct 2013 00:42:24 +0200
Modified: experimental/evolution/debian/evolution-common.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution-common.install?rev=2485&op=diff
==============================================================================
--- experimental/evolution/debian/evolution-common.install (original)
+++ experimental/evolution/debian/evolution-common.install Sun Oct 20 08:41:23 2013
@@ -4,3 +4,4 @@
usr/share/locale
usr/share/glib-2.0
usr/share/help
+usr/share/appdata
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=2485&op=diff
==============================================================================
--- experimental/evolution/debian/patches/02_nss_paths.patch (original)
+++ experimental/evolution/debian/patches/02_nss_paths.patch Sun Oct 20 08:41:23 2013
@@ -4,11 +4,11 @@
built-in certificate store of NSS) lives, and it's actually under libdir/nss
rather than directly under libdir.
-Index: evolution-3.8.5/configure.ac
+Index: evolution-3.10.1/configure.ac
===================================================================
---- evolution-3.8.5.orig/configure.ac 2013-09-03 00:31:16.308360481 +0200
-+++ evolution-3.8.5/configure.ac 2013-09-03 00:31:16.304360418 +0200
-@@ -667,7 +667,7 @@
+--- 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 @@
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=2485&op=diff
==============================================================================
--- experimental/evolution/debian/patches/10_revert_libevolution_avoid-version.patch (original)
+++ experimental/evolution/debian/patches/10_revert_libevolution_avoid-version.patch Sun Oct 20 08:41:23 2013
@@ -6,10 +6,10 @@
Forwarded: no
---
-Index: evolution-3.8.4/addressbook/gui/contact-editor/Makefile.am
-===================================================================
---- evolution-3.8.4.orig/addressbook/gui/contact-editor/Makefile.am 2013-07-25 13:37:06.313874054 -0400
-+++ evolution-3.8.4/addressbook/gui/contact-editor/Makefile.am 2013-07-25 13:37:06.305874054 -0400
+Index: evolution-3.10.1/addressbook/gui/contact-editor/Makefile.am
+===================================================================
+--- evolution-3.10.1.orig/addressbook/gui/contact-editor/Makefile.am 2013-10-20 10:16:38.677853456 +0200
++++ evolution-3.10.1/addressbook/gui/contact-editor/Makefile.am 2013-10-20 10:16:38.673853437 +0200
@@ -23,7 +23,7 @@
e-contact-quick-add.c \
e-contact-quick-add.h
@@ -18,11 +18,11 @@
+libecontacteditor_la_LDFLAGS = $(NO_UNDEFINED)
libecontacteditor_la_LIBADD = \
- $(top_builddir)/e-util/libeutil.la \
-Index: evolution-3.8.4/addressbook/gui/contact-list-editor/Makefile.am
-===================================================================
---- evolution-3.8.4.orig/addressbook/gui/contact-list-editor/Makefile.am 2013-07-25 13:37:06.313874054 -0400
-+++ evolution-3.8.4/addressbook/gui/contact-list-editor/Makefile.am 2013-07-25 13:37:06.309874054 -0400
+ $(top_builddir)/e-util/libevolution-util.la \
+Index: evolution-3.10.1/addressbook/gui/contact-list-editor/Makefile.am
+===================================================================
+--- evolution-3.10.1.orig/addressbook/gui/contact-list-editor/Makefile.am 2013-10-20 10:16:38.677853456 +0200
++++ evolution-3.10.1/addressbook/gui/contact-list-editor/Makefile.am 2013-10-20 10:16:38.673853437 +0200
@@ -19,7 +19,7 @@
e-contact-list-model.c \
e-contact-list-model.h
@@ -32,10 +32,10 @@
libecontactlisteditor_la_LIBADD = \
$(top_builddir)/addressbook/util/libeabutil.la \
-Index: evolution-3.8.4/addressbook/importers/Makefile.am
-===================================================================
---- evolution-3.8.4.orig/addressbook/importers/Makefile.am 2013-07-25 13:37:06.313874054 -0400
-+++ evolution-3.8.4/addressbook/importers/Makefile.am 2013-07-25 13:37:06.309874054 -0400
+Index: evolution-3.10.1/addressbook/importers/Makefile.am
+===================================================================
+--- evolution-3.10.1.orig/addressbook/importers/Makefile.am 2013-10-20 10:16:38.677853456 +0200
++++ evolution-3.10.1/addressbook/importers/Makefile.am 2013-10-20 10:16:38.673853437 +0200
@@ -18,7 +18,7 @@
evolution-csv-importer.c \
evolution-addressbook-importers.h
@@ -44,11 +44,11 @@
+libevolution_addressbook_importers_la_LDFLAGS = $(NO_UNDEFINED)
libevolution_addressbook_importers_la_LIBADD = \
- $(top_builddir)/e-util/libeutil.la \
-Index: evolution-3.8.4/addressbook/util/Makefile.am
-===================================================================
---- evolution-3.8.4.orig/addressbook/util/Makefile.am 2013-07-25 13:37:06.313874054 -0400
-+++ evolution-3.8.4/addressbook/util/Makefile.am 2013-07-25 13:37:06.309874054 -0400
+ $(top_builddir)/e-util/libevolution-util.la \
+Index: evolution-3.10.1/addressbook/util/Makefile.am
+===================================================================
+--- evolution-3.10.1.orig/addressbook/util/Makefile.am 2013-10-20 10:16:38.677853456 +0200
++++ evolution-3.10.1/addressbook/util/Makefile.am 2013-10-20 10:16:38.673853437 +0200
@@ -19,7 +19,7 @@
eab-book-util.c \
eab-book-util.h
@@ -57,12 +57,12 @@
+libeabutil_la_LDFLAGS = $(NO_UNDEFINED)
libeabutil_la_LIBADD = \
- $(top_builddir)/e-util/libeutil.la \
-Index: evolution-3.8.4/calendar/gui/Makefile.am
-===================================================================
---- evolution-3.8.4.orig/calendar/gui/Makefile.am 2013-07-25 13:37:06.313874054 -0400
-+++ evolution-3.8.4/calendar/gui/Makefile.am 2013-07-25 13:37:06.309874054 -0400
-@@ -212,7 +212,7 @@
+ $(top_builddir)/e-util/libevolution-util.la \
+Index: evolution-3.10.1/calendar/gui/Makefile.am
+===================================================================
+--- evolution-3.10.1.orig/calendar/gui/Makefile.am 2013-10-20 10:16:38.677853456 +0200
++++ evolution-3.10.1/calendar/gui/Makefile.am 2013-10-20 10:16:38.673853437 +0200
+@@ -209,7 +209,7 @@
$(GTKHTML_LIBS) \
$(LIBSOUP_LIBS)
@@ -71,10 +71,10 @@
EXTRA_DIST = \
$(ui_DATA) \
-Index: evolution-3.8.4/calendar/importers/Makefile.am
-===================================================================
---- evolution-3.8.4.orig/calendar/importers/Makefile.am 2013-07-25 13:37:06.313874054 -0400
-+++ evolution-3.8.4/calendar/importers/Makefile.am 2013-07-25 13:37:06.309874054 -0400
+Index: evolution-3.10.1/calendar/importers/Makefile.am
+===================================================================
+--- evolution-3.10.1.orig/calendar/importers/Makefile.am 2013-10-20 10:16:38.677853456 +0200
++++ evolution-3.10.1/calendar/importers/Makefile.am 2013-10-20 10:16:38.673853437 +0200
@@ -15,7 +15,7 @@
evolution-calendar-importer.h \
icalendar-importer.c
@@ -83,50 +83,50 @@
+libevolution_calendar_importers_la_LDFLAGS = $(NO_UNDEFINED)
libevolution_calendar_importers_la_LIBADD = \
- $(top_builddir)/e-util/libeutil.la \
-Index: evolution-3.8.4/composer/Makefile.am
-===================================================================
---- evolution-3.8.4.orig/composer/Makefile.am 2013-07-25 13:37:06.313874054 -0400
-+++ evolution-3.8.4/composer/Makefile.am 2013-07-25 13:37:06.309874054 -0400
+ $(top_builddir)/e-util/libevolution-util.la \
+Index: evolution-3.10.1/composer/Makefile.am
+===================================================================
+--- evolution-3.10.1.orig/composer/Makefile.am 2013-10-20 10:16:38.677853456 +0200
++++ evolution-3.10.1/composer/Makefile.am 2013-10-20 10:18:01.594260146 +0200
@@ -52,7 +52,7 @@
e-composer-text-header.c \
e-msg-composer.c
--libcomposer_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-+libcomposer_la_LDFLAGS = $(NO_UNDEFINED)
-
- libcomposer_la_LIBADD = \
- $(top_builddir)/e-util/libeutil.la \
-Index: evolution-3.8.4/e-util/Makefile.am
-===================================================================
---- evolution-3.8.4.orig/e-util/Makefile.am 2013-07-25 13:37:06.313874054 -0400
-+++ evolution-3.8.4/e-util/Makefile.am 2013-07-25 13:37:06.309874054 -0400
-@@ -588,7 +588,7 @@
+-libevolution_mail_composer_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
++libevolution_mail_composer_la_LDFLAGS = $(NO_UNDEFINED)
+
+ libevolution_mail_composer_la_LIBADD = \
+ $(top_builddir)/e-util/libevolution-util.la \
+Index: evolution-3.10.1/e-util/Makefile.am
+===================================================================
+--- evolution-3.10.1.orig/e-util/Makefile.am 2013-10-20 10:16:38.677853456 +0200
++++ evolution-3.10.1/e-util/Makefile.am 2013-10-20 10:18:29.186395482 +0200
+@@ -565,7 +565,7 @@
$(PLATFORM_SOURCES) \
$(NULL)
--libeutil_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-+libeutil_la_LDFLAGS = $(NO_UNDEFINED)
-
- libeutil_la_LIBADD = \
+-libevolution_util_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
++libevolution_util_la_LDFLAGS = $(NO_UNDEFINED)
+
+ libevolution_util_la_LIBADD = \
$(top_builddir)/libgnomecanvas/libgnomecanvas.la \
-Index: evolution-3.8.4/em-format/Makefile.am
-===================================================================
---- evolution-3.8.4.orig/em-format/Makefile.am 2013-07-25 13:37:06.313874054 -0400
-+++ evolution-3.8.4/em-format/Makefile.am 2013-07-25 13:37:06.309874054 -0400
-@@ -115,7 +115,7 @@
+Index: evolution-3.10.1/em-format/Makefile.am
+===================================================================
+--- evolution-3.10.1.orig/em-format/Makefile.am 2013-10-20 10:16:38.677853456 +0200
++++ evolution-3.10.1/em-format/Makefile.am 2013-10-20 10:23:16.963806978 +0200
+@@ -120,7 +120,7 @@
e-mail-stripsig-filter.c \
$(SMIME_EXTENSIONS)
--libemformat_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-+libemformat_la_LDFLAGS = $(NO_UNDEFINED)
+-libevolution_mail_formatter_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
++libevolution_mail_formatter_la_LDFLAGS = $(NO_UNDEFINED)
if ENABLE_SMIME
SMIME_LIBS = \
-Index: evolution-3.8.4/libemail-engine/Makefile.am
-===================================================================
---- evolution-3.8.4.orig/libemail-engine/Makefile.am 2013-07-25 13:37:06.313874054 -0400
-+++ evolution-3.8.4/libemail-engine/Makefile.am 2013-07-25 13:37:06.309874054 -0400
+Index: evolution-3.10.1/libemail-engine/Makefile.am
+===================================================================
+--- evolution-3.10.1.orig/libemail-engine/Makefile.am 2013-10-20 10:16:38.677853456 +0200
++++ evolution-3.10.1/libemail-engine/Makefile.am 2013-10-20 10:16:38.673853437 +0200
@@ -81,7 +81,7 @@
$(GTKHTML_LIBS) \
$(NULL)
@@ -136,10 +136,10 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libemail-engine.pc
-Index: evolution-3.8.4/libgnomecanvas/Makefile.am
-===================================================================
---- evolution-3.8.4.orig/libgnomecanvas/Makefile.am 2013-07-25 13:37:06.313874054 -0400
-+++ evolution-3.8.4/libgnomecanvas/Makefile.am 2013-07-25 13:37:06.309874054 -0400
+Index: evolution-3.10.1/libgnomecanvas/Makefile.am
+===================================================================
+--- evolution-3.10.1.orig/libgnomecanvas/Makefile.am 2013-10-20 10:16:38.677853456 +0200
++++ evolution-3.10.1/libgnomecanvas/Makefile.am 2013-10-20 10:16:38.673853437 +0200
@@ -53,7 +53,7 @@
$(GNOME_PLATFORM_LIBS) \
$(MATH_LIB)
@@ -149,10 +149,10 @@
BUILT_SOURCES = $(MARSHAL_GENERATED)
-Index: evolution-3.8.4/mail/Makefile.am
-===================================================================
---- evolution-3.8.4.orig/mail/Makefile.am 2013-07-25 13:37:06.313874054 -0400
-+++ evolution-3.8.4/mail/Makefile.am 2013-07-25 13:37:06.309874054 -0400
+Index: evolution-3.10.1/mail/Makefile.am
+===================================================================
+--- evolution-3.10.1.orig/mail/Makefile.am 2013-10-20 10:16:38.677853456 +0200
++++ evolution-3.10.1/mail/Makefile.am 2013-10-20 10:16:38.673853437 +0200
@@ -206,7 +206,7 @@
$(LIBSOUP_LIBS) \
-lresolv
@@ -162,10 +162,10 @@
libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h
-Index: evolution-3.8.4/mail/importers/Makefile.am
-===================================================================
---- evolution-3.8.4.orig/mail/importers/Makefile.am 2013-07-25 13:37:06.313874054 -0400
-+++ evolution-3.8.4/mail/importers/Makefile.am 2013-07-25 13:37:06.309874054 -0400
+Index: evolution-3.10.1/mail/importers/Makefile.am
+===================================================================
+--- evolution-3.10.1.orig/mail/importers/Makefile.am 2013-10-20 10:16:38.677853456 +0200
++++ evolution-3.10.1/mail/importers/Makefile.am 2013-10-20 10:16:38.673853437 +0200
@@ -18,7 +18,7 @@
pine-importer.c \
evolution-mbox-importer.c
@@ -174,24 +174,24 @@
+libevolution_mail_importers_la_LDFLAGS = $(NO_UNDEFINED)
libevolution_mail_importers_la_LIBADD = \
- $(top_builddir)/e-util/libeutil.la \
-Index: evolution-3.8.4/shell/Makefile.am
-===================================================================
---- evolution-3.8.4.orig/shell/Makefile.am 2013-07-25 13:37:06.313874054 -0400
-+++ evolution-3.8.4/shell/Makefile.am 2013-07-25 13:37:06.309874054 -0400
-@@ -89,7 +89,7 @@
+ $(top_builddir)/e-util/libevolution-util.la \
+Index: evolution-3.10.1/shell/Makefile.am
+===================================================================
+--- evolution-3.10.1.orig/shell/Makefile.am 2013-10-20 10:16:38.677853456 +0200
++++ evolution-3.10.1/shell/Makefile.am 2013-10-20 10:23:51.899978335 +0200
+@@ -85,7 +85,7 @@
evo-version.h \
- es-event.c
-
--libeshell_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-+libeshell_la_LDFLAGS = $(NO_UNDEFINED)
-
- libeshell_la_LIBADD = \
- $(top_builddir)/e-util/libeutil.la \
-Index: evolution-3.8.4/smime/gui/Makefile.am
-===================================================================
---- evolution-3.8.4.orig/smime/gui/Makefile.am 2013-07-25 13:37:06.313874054 -0400
-+++ evolution-3.8.4/smime/gui/Makefile.am 2013-07-25 13:37:06.309874054 -0400
+ $(NULL)
+
+-libevolution_shell_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
++libevolution_shell_la_LDFLAGS = $(NO_UNDEFINED)
+
+ libevolution_shell_la_LIBADD = \
+ $(top_builddir)/e-util/libevolution-util.la \
+Index: evolution-3.10.1/smime/gui/Makefile.am
+===================================================================
+--- evolution-3.10.1.orig/smime/gui/Makefile.am 2013-10-20 10:16:38.677853456 +0200
++++ evolution-3.10.1/smime/gui/Makefile.am 2013-10-20 10:16:38.677853456 +0200
@@ -44,7 +44,7 @@
$(GTKHTML_LIBS) \
$(CERT_UI_LIBS)
@@ -201,10 +201,10 @@
ui_DATA = smime-ui.ui
-Index: evolution-3.8.4/smime/lib/Makefile.am
-===================================================================
---- evolution-3.8.4.orig/smime/lib/Makefile.am 2013-07-25 13:37:06.313874054 -0400
-+++ evolution-3.8.4/smime/lib/Makefile.am 2013-07-25 13:37:06.309874054 -0400
+Index: evolution-3.10.1/smime/lib/Makefile.am
+===================================================================
+--- evolution-3.10.1.orig/smime/lib/Makefile.am 2013-10-20 10:16:38.677853456 +0200
++++ evolution-3.10.1/smime/lib/Makefile.am 2013-10-20 10:16:38.677853456 +0200
@@ -36,6 +36,6 @@
$(GTKHTML_LIBS) \
$(CERT_UI_LIBS)
More information about the pkg-evolution-commits
mailing list