r2285 - in /experimental/evolution/debian: ./ patches/
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Fri Oct 5 21:51:12 UTC 2012
Author: sjoerd
Date: Fri Oct 5 21:51:12 2012
New Revision: 2285
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2285
Log:
Target experimental
Removed:
experimental/evolution/debian/patches/04_gettext_intltool.patch
Modified:
experimental/evolution/debian/changelog
experimental/evolution/debian/control
experimental/evolution/debian/evolution-common.install
experimental/evolution/debian/evolution-plugins-experimental.install
experimental/evolution/debian/evolution-plugins.install
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
experimental/evolution/debian/rules
Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=2285&op=diff
==============================================================================
--- experimental/evolution/debian/changelog (original)
+++ experimental/evolution/debian/changelog Fri Oct 5 21:51:12 2012
@@ -1,3 +1,16 @@
+evolution (3.6.0-1) experimental; urgency=low
+
+ * New upstream release
+ * Sync with ubuntu
+ * debian/patches/04_gettext_intltool.patch: Dropped fixed upstream
+ * debian/patches/02_nss_paths.patch: refreshed
+ * debian/patches/10_revert_libevolution_avoid-version.patch: refresh
+ * debian/evolution{,-plugins*}.install: Don't install plugins that
+ have been converted into modules
+ * debian/evolution-common.install: Update for new help install location
+
+ -- Sjoerd Simons <sjoerd at debian.org> Fri, 05 Oct 2012 23:51:00 +0200
+
evolution (3.4.3-1) unstable; urgency=low
* Team upload.
Modified: experimental/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/control?rev=2285&op=diff
==============================================================================
--- experimental/evolution/debian/control (original)
+++ experimental/evolution/debian/control Fri Oct 5 21:51:12 2012
@@ -20,34 +20,33 @@
dh-autoreconf,
dpkg-dev (>= 1.16.1),
libgeoclue-dev (>= 0.12),
- libglib2.0-dev (>= 2.30),
- libgtk-3-dev (>= 3.2.0),
+ libglib2.0-dev (>= 2.32),
+ libgtk-3-dev (>= 3.4.0),
libgail-3-dev (>= 3.0.2),
- libebook1.2-dev (>= 3.4.2),
- libecal1.2-dev (>= 3.4.2),
- libedataserver1.2-dev (>= 3.4.2),
- libedataserverui-3.0-dev (>= 3.4.2),
- libebackend1.2-dev (>= 3.4.2),
- libcamel1.2-dev (>= 3.4.2),
- evolution-data-server-dev (>= 3.4.2),
- evolution-data-server-dev (<< 3.5),
- libgtkhtml-4.0-dev (>= 4.1.2),
+ libebook1.2-dev (>= 3.5.90),
+ libecal1.2-dev (>= 3.5.90),
+ libedataserver1.2-dev (>= 3.5.90),
+ libedataserverui-3.0-dev (>= 3.5.90),
+ libebackend1.2-dev (>= 3.5.90),
+ libcamel1.2-dev (>= 3.5.90),
+ evolution-data-server-dev (>= 3.6),
+ evolution-data-server-dev (<< 3.7),
+ libgtkhtml-4.0-dev (>= 4.5.2),
libgtkhtml-editor-4.0-dev,
+ libwebkitgtk-3.0-dev (>= 1.8.0),
libgnome-desktop-3-dev (>= 2.91.3),
gnome-icon-theme (>= 2.30.2.1),
- libgconf2-dev,
- libsoup-gnome2.4-dev (>= 2.31.2),
+ libsoup-gnome2.4-dev (>= 2.38.1),
libxml2-dev (>= 2.7.3),
shared-mime-info (>= 0.22),
libnotify-dev (>= 0.7),
libdbus-glib-1-dev (>= 0.6),
- libgweather-3-dev (>= 2.90.0),
+ libgweather-3-dev (>= 3.5.0),
libcanberra-gtk3-dev (>= 0.25),
network-manager-dev (>= 0.7) [linux-any],
intltool (>= 0.40.0),
libtool (>= 2.2),
pkg-config (>= 0.16.0),
- gnome-doc-utils (>= 0.20.10),
gtk-doc-tools (>= 1.14),
libcairo2-dev (>= 1.10),
libchamplain-gtk-0.12-dev (>= 0.12),
@@ -66,11 +65,11 @@
libice-dev,
libgstreamer0.10-dev,
po-debconf,
- python-dev,
rarian-compat,
+ yelp-tools,
gnome-pkg-tools,
gsettings-desktop-schemas-dev (>= 2.91.92),
- libgoa-1.0-dev (>= 3.1.1),
+ libgoa-1.0-dev (>= 3.2),
libmx-dev,
libclutter-gtk-1.0-dev (>= 0.90),
libclutter-1.0-dev (>= 1.0.0)
@@ -80,8 +79,8 @@
Depends: ${shlibs:Depends},
${misc:Depends},
evolution-common (= ${source:Version}),
- evolution-data-server (>= 3.4),
- evolution-data-server (<< 3.5),
+ evolution-data-server (>= 3.6),
+ evolution-data-server (<< 3.7),
gnome-icon-theme (>= 2.30.2.1),
dbus,
psmisc
@@ -159,9 +158,9 @@
# evolution-shell
libebackend1.2-dev,
libgtk-3-dev,
- libgconf2-dev,
libgnome-desktop-3-dev,
libedataserverui-3.0-dev,
+ libwebkitgtk-3.0-dev (>= 1.8.0),
# evolution-utils
libedataserver1.2-dev
Description: development library files for Evolution
Modified: experimental/evolution/debian/evolution-common.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution-common.install?rev=2285&op=diff
==============================================================================
--- experimental/evolution/debian/evolution-common.install (original)
+++ experimental/evolution/debian/evolution-common.install Fri Oct 5 21:51:12 2012
@@ -1,7 +1,6 @@
usr/share/GConf
-usr/share/mime-info
usr/share/evolution
usr/share/icons/hicolor
usr/share/locale
usr/share/glib-2.0
-usr/share/gnome
+usr/share/help
Modified: experimental/evolution/debian/evolution-plugins-experimental.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution-plugins-experimental.install?rev=2285&op=diff
==============================================================================
--- experimental/evolution/debian/evolution-plugins-experimental.install (original)
+++ experimental/evolution/debian/evolution-plugins-experimental.install Fri Oct 5 21:51:12 2012
@@ -1,4 +1,2 @@
usr/lib/evolution/*/plugins/*-external-editor.so
usr/lib/evolution/*/plugins/*-external-editor.eplug
-usr/lib/evolution/*/plugins/*-tnef-attachments.so
-usr/lib/evolution/*/plugins/*-tnef-attachments.eplug
Modified: experimental/evolution/debian/evolution-plugins.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution-plugins.install?rev=2285&op=diff
==============================================================================
--- experimental/evolution/debian/evolution-plugins.install (original)
+++ experimental/evolution/debian/evolution-plugins.install Fri Oct 5 21:51:12 2012
@@ -1,5 +1,3 @@
-usr/lib/evolution/*/plugins/*-bbdb.so
-usr/lib/evolution/*/plugins/*-bbdb.eplug
usr/lib/evolution/*/plugins/*-save-calendar.so
usr/lib/evolution/*/plugins/*-save-calendar.eplug
usr/lib/evolution/*/plugins/*-mail-to-task.so
@@ -10,21 +8,13 @@
usr/lib/evolution/*/plugins/*-prefer-plain.eplug
usr/lib/evolution/*/plugins/*-mail-notification.so
usr/lib/evolution/*/plugins/*-mail-notification.eplug
-usr/lib/evolution/*/plugins/*-attachment-reminder.so
-usr/lib/evolution/*/plugins/*-attachment-reminder.eplug
-usr/lib/evolution/*/plugins/*-backup-restore.so
-usr/lib/evolution/*/plugins/*-backup-restore.eplug
usr/lib/evolution/*/plugins/*-email-custom-header.so
usr/lib/evolution/*/plugins/*-email-custom-header.eplug
usr/lib/evolution/*/plugins/*-face.so
usr/lib/evolution/*/plugins/*-face.eplug
usr/lib/evolution/*/plugins/*-templates.so
usr/lib/evolution/*/plugins/*-templates.eplug
-usr/lib/evolution/*/plugins/*-vcard-inline.so
-usr/lib/evolution/*/plugins/*-vcard-inline.eplug
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/*-pst-import.so
usr/lib/evolution/*/plugins/*-pst-import.eplug
Modified: experimental/evolution/debian/evolution.install
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/evolution.install?rev=2285&op=diff
==============================================================================
--- experimental/evolution/debian/evolution.install (original)
+++ experimental/evolution/debian/evolution.install Fri Oct 5 21:51:12 2012
@@ -1,29 +1,10 @@
debian/evolution.xpm usr/share/pixmaps/
-etc/gconf
etc/xdg
usr/bin
-usr/lib/evolution/*/plugins/*-calendar-file.so
-usr/lib/evolution/*/plugins/*-calendar-file.eplug
-usr/lib/evolution/*/plugins/*-calendar-http.so
-usr/lib/evolution/*/plugins/*-calendar-http.eplug
usr/lib/evolution/*/plugins/*-itip-formatter.so
usr/lib/evolution/*/plugins/*-itip-formatter.eplug
-usr/lib/evolution/*/plugins/*-default-source.so
-usr/lib/evolution/*/plugins/*-default-source.eplug
-usr/lib/evolution/*/plugins/*-addressbook-file.so
-usr/lib/evolution/*/plugins/*-addressbook-file.eplug
usr/lib/evolution/*/plugins/*-mark-all-read.so
usr/lib/evolution/*/plugins/*-mark-all-read.eplug
usr/lib/evolution/*/plugins/*-publish-calendar.so
usr/lib/evolution/*/plugins/*-publish-calendar.eplug
-usr/lib/evolution/*/plugins/*-caldav.so
-usr/lib/evolution/*/plugins/*-caldav.eplug
-usr/lib/evolution/*/plugins/*-imap-features.so
-usr/lib/evolution/*/plugins/*-imap-features.eplug
-usr/lib/evolution/*/plugins/*-google.so
-usr/lib/evolution/*/plugins/*-google.eplug
-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/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=2285&op=diff
==============================================================================
--- experimental/evolution/debian/patches/02_nss_paths.patch (original)
+++ experimental/evolution/debian/patches/02_nss_paths.patch Fri Oct 5 21:51:12 2012
@@ -4,9 +4,11 @@
built-in certificate store of NSS) lives, and it's actually under libdir/nss
rather than directly under libdir.
---- a/configure.ac
-+++ b/configure.ac
-@@ -842,7 +842,7 @@
+Index: evolution-3.5.4/configure.ac
+===================================================================
+--- evolution-3.5.4.orig/configure.ac 2012-07-13 02:22:13.000000000 +1200
++++ evolution-3.5.4/configure.ac 2012-07-19 15:32:15.587176324 +1200
+@@ -793,7 +793,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=2285&op=diff
==============================================================================
--- experimental/evolution/debian/patches/10_revert_libevolution_avoid-version.patch (original)
+++ experimental/evolution/debian/patches/10_revert_libevolution_avoid-version.patch Fri Oct 5 21:51:12 2012
@@ -5,8 +5,39 @@
Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=591436
Forwarded: no
---- a/a11y/Makefile.am
-+++ b/a11y/Makefile.am
+---
+ a11y/Makefile.am | 2 +-
+ addressbook/gui/contact-editor/Makefile.am | 2 +-
+ addressbook/gui/contact-list-editor/Makefile.am | 2 +-
+ addressbook/importers/Makefile.am | 2 +-
+ addressbook/util/Makefile.am | 2 +-
+ calendar/gui/Makefile.am | 2 +-
+ calendar/importers/Makefile.am | 2 +-
+ composer/Makefile.am | 2 +-
+ e-util/Makefile.am | 2 +-
+ em-format/Makefile.am | 2 +-
+ filter/Makefile.am | 2 +-
+ libemail-engine/Makefile.am | 2 +-
+ libemail-utils/Makefile.am | 2 +-
+ libevolution-utils/Makefile.am | 2 +-
+ libgnomecanvas/Makefile.am | 2 +-
+ mail/Makefile.am | 2 +-
+ mail/importers/Makefile.am | 2 +-
+ shell/Makefile.am | 2 +-
+ smclient/Makefile.am | 3 ++-
+ smime/gui/Makefile.am | 2 +-
+ smime/lib/Makefile.am | 2 +-
+ widgets/e-timezone-dialog/Makefile.am | 2 +-
+ widgets/menus/Makefile.am | 2 +-
+ widgets/misc/Makefile.am | 2 +-
+ widgets/table/Makefile.am | 2 +-
+ widgets/text/Makefile.am | 2 +-
+ 27 files changed, 28 insertions(+), 27 deletions(-)
+
+Index: evolution-3.5.4/a11y/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/a11y/Makefile.am 2012-03-10 05:33:37.000000000 +1300
++++ evolution-3.5.4/a11y/Makefile.am 2012-07-19 15:32:23.335176055 +1200
@@ -14,7 +14,7 @@
gal-a11y-util.h \
gal-a11y-factory.h
@@ -16,8 +47,10 @@
libevolution_a11y_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
---- a/addressbook/gui/contact-editor/Makefile.am
-+++ b/addressbook/gui/contact-editor/Makefile.am
+Index: evolution-3.5.4/addressbook/gui/contact-editor/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/addressbook/gui/contact-editor/Makefile.am 2012-03-10 05:33:37.000000000 +1300
++++ evolution-3.5.4/addressbook/gui/contact-editor/Makefile.am 2012-07-19 15:32:23.339176055 +1200
@@ -24,7 +24,7 @@
e-contact-quick-add.c \
e-contact-quick-add.h
@@ -27,8 +60,10 @@
libecontacteditor_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
---- a/addressbook/gui/contact-list-editor/Makefile.am
-+++ b/addressbook/gui/contact-list-editor/Makefile.am
+Index: evolution-3.5.4/addressbook/gui/contact-list-editor/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/addressbook/gui/contact-list-editor/Makefile.am 2012-03-10 05:33:37.000000000 +1300
++++ evolution-3.5.4/addressbook/gui/contact-list-editor/Makefile.am 2012-07-19 15:32:23.339176055 +1200
@@ -19,7 +19,7 @@
e-contact-list-model.c \
e-contact-list-model.h
@@ -38,8 +73,10 @@
libecontactlisteditor_la_LIBADD = \
$(top_builddir)/addressbook/util/libeabutil.la \
---- a/addressbook/importers/Makefile.am
-+++ b/addressbook/importers/Makefile.am
+Index: evolution-3.5.4/addressbook/importers/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/addressbook/importers/Makefile.am 2012-06-03 15:03:11.000000000 +1200
++++ evolution-3.5.4/addressbook/importers/Makefile.am 2012-07-19 15:32:23.339176055 +1200
@@ -18,7 +18,7 @@
evolution-csv-importer.c \
evolution-addressbook-importers.h
@@ -49,8 +86,10 @@
libevolution_addressbook_importers_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
---- a/addressbook/util/Makefile.am
-+++ b/addressbook/util/Makefile.am
+Index: evolution-3.5.4/addressbook/util/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/addressbook/util/Makefile.am 2012-03-10 05:33:38.000000000 +1300
++++ evolution-3.5.4/addressbook/util/Makefile.am 2012-07-19 15:32:23.339176055 +1200
@@ -18,7 +18,7 @@
eab-book-util.c \
eab-book-util.h
@@ -60,9 +99,11 @@
libeabutil_la_LIBADD = \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
---- a/calendar/gui/Makefile.am
-+++ b/calendar/gui/Makefile.am
-@@ -219,7 +219,7 @@
+Index: evolution-3.5.4/calendar/gui/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/calendar/gui/Makefile.am 2012-06-15 07:43:27.000000000 +1200
++++ evolution-3.5.4/calendar/gui/Makefile.am 2012-07-19 15:32:23.339176055 +1200
+@@ -220,7 +220,7 @@
$(GTKHTML_LIBS) \
$(LIBSOUP_LIBS)
@@ -71,8 +112,10 @@
EXTRA_DIST = \
$(ui_DATA) \
---- a/calendar/importers/Makefile.am
-+++ b/calendar/importers/Makefile.am
+Index: evolution-3.5.4/calendar/importers/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/calendar/importers/Makefile.am 2012-03-10 05:33:40.000000000 +1300
++++ evolution-3.5.4/calendar/importers/Makefile.am 2012-07-19 15:32:23.339176055 +1200
@@ -16,7 +16,7 @@
evolution-calendar-importer.h \
icalendar-importer.c
@@ -82,9 +125,11 @@
libevolution_calendar_importers_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
---- a/composer/Makefile.am
-+++ b/composer/Makefile.am
-@@ -54,7 +54,7 @@
+Index: evolution-3.5.4/composer/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/composer/Makefile.am 2012-05-11 01:43:17.000000000 +1200
++++ evolution-3.5.4/composer/Makefile.am 2012-07-19 15:32:23.339176055 +1200
+@@ -56,7 +56,7 @@
e-composer-text-header.c \
e-msg-composer.c
@@ -93,9 +138,11 @@
libcomposer_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
---- a/e-util/Makefile.am
-+++ b/e-util/Makefile.am
-@@ -113,7 +113,7 @@
+Index: evolution-3.5.4/e-util/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/e-util/Makefile.am 2012-06-04 05:16:15.000000000 +1200
++++ evolution-3.5.4/e-util/Makefile.am 2012-07-19 15:32:23.339176055 +1200
+@@ -117,7 +117,7 @@
e-util-private.h \
$(PLATFORM_SOURCES)
@@ -104,19 +151,23 @@
libeutil_la_LIBADD = \
$(top_builddir)/libevolution-utils/libevolution-utils.la \
---- a/em-format/Makefile.am
-+++ b/em-format/Makefile.am
-@@ -22,7 +22,7 @@
- em-inline-filter.c \
- em-stripsig-filter.c
+Index: evolution-3.5.4/em-format/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/em-format/Makefile.am 2012-06-26 14:28:56.000000000 +1200
++++ evolution-3.5.4/em-format/Makefile.am 2012-07-19 15:32:23.339176055 +1200
+@@ -98,7 +98,7 @@
+ e-mail-stripsig-filter.c \
+ $(SMIME_EXTENSIONS)
-libemformat_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libemformat_la_LDFLAGS = $(NO_UNDEFINED)
- libemformat_la_LIBADD = \
- $(top_builddir)/e-util/libeutil.la \
---- a/filter/Makefile.am
-+++ b/filter/Makefile.am
+
+ if ENABLE_SMIME
+Index: evolution-3.5.4/filter/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/filter/Makefile.am 2012-03-10 05:33:40.000000000 +1300
++++ evolution-3.5.4/filter/Makefile.am 2012-07-19 15:32:23.339176055 +1200
@@ -53,7 +53,7 @@
e-rule-editor.c \
e-rule-editor.h
@@ -126,19 +177,23 @@
libfilter_la_LIBADD = \
$(top_builddir)/libevolution-utils/libevolution-utils.la \
---- a/mail/Makefile.am
-+++ b/mail/Makefile.am
-@@ -196,7 +196,7 @@
- $(GTKHTML_LIBS) \
- $(SMIME_LIBS)
+Index: evolution-3.5.4/mail/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/mail/Makefile.am 2012-07-11 05:34:53.000000000 +1200
++++ evolution-3.5.4/mail/Makefile.am 2012-07-19 15:32:23.367176055 +1200
+@@ -234,7 +234,7 @@
+ $(LIBSOUP_LIBS) \
+ -lresolv
-libevolution_mail_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_mail_la_LDFLAGS = $(NO_UNDEFINED)
libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h
---- a/mail/importers/Makefile.am
-+++ b/mail/importers/Makefile.am
+Index: evolution-3.5.4/mail/importers/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/mail/importers/Makefile.am 2012-03-10 05:33:42.000000000 +1300
++++ evolution-3.5.4/mail/importers/Makefile.am 2012-07-19 15:32:23.367176055 +1200
@@ -19,7 +19,7 @@
pine-importer.c \
evolution-mbox-importer.c
@@ -148,10 +203,12 @@
libevolution_mail_importers_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
---- a/shell/Makefile.am
-+++ b/shell/Makefile.am
-@@ -88,7 +88,7 @@
- e-shell-window-actions.c \
+Index: evolution-3.5.4/shell/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/shell/Makefile.am 2012-07-03 07:14:15.000000000 +1200
++++ evolution-3.5.4/shell/Makefile.am 2012-07-19 15:32:23.383176055 +1200
+@@ -90,7 +90,7 @@
+ evo-version.h \
es-event.c
-libeshell_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
@@ -159,8 +216,10 @@
libeshell_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
---- a/smclient/Makefile.am
-+++ b/smclient/Makefile.am
+Index: evolution-3.5.4/smclient/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/smclient/Makefile.am 2012-05-21 12:55:34.000000000 +1200
++++ evolution-3.5.4/smclient/Makefile.am 2012-07-19 15:32:23.383176055 +1200
@@ -22,7 +22,8 @@
$(EGG_SMCLIENT_LIBS) \
$(platform_libs)
@@ -171,8 +230,10 @@
libeggsmclient_la_SOURCES = \
eggsmclient.c \
---- a/smime/gui/Makefile.am
-+++ b/smime/gui/Makefile.am
+Index: evolution-3.5.4/smime/gui/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/smime/gui/Makefile.am 2012-03-10 05:33:44.000000000 +1300
++++ evolution-3.5.4/smime/gui/Makefile.am 2012-07-19 15:32:23.383176055 +1200
@@ -46,7 +46,7 @@
$(GNOME_PLATFORM_LIBS) \
$(CERT_UI_LIBS)
@@ -182,8 +243,10 @@
ui_DATA = smime-ui.ui
---- a/smime/lib/Makefile.am
-+++ b/smime/lib/Makefile.am
+Index: evolution-3.5.4/smime/lib/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/smime/lib/Makefile.am 2012-03-10 05:33:44.000000000 +1300
++++ evolution-3.5.4/smime/lib/Makefile.am 2012-07-19 15:32:23.383176055 +1200
@@ -35,6 +35,6 @@
$(GNOME_PLATFORM_LIBS) \
$(CERT_UI_LIBS)
@@ -192,8 +255,10 @@
+libessmime_la_LDFLAGS = $(NO_UNDEFINED)
-include $(top_srcdir)/git.mk
---- a/widgets/e-timezone-dialog/Makefile.am
-+++ b/widgets/e-timezone-dialog/Makefile.am
+Index: evolution-3.5.4/widgets/e-timezone-dialog/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/widgets/e-timezone-dialog/Makefile.am 2012-03-10 05:33:44.000000000 +1300
++++ evolution-3.5.4/widgets/e-timezone-dialog/Makefile.am 2012-07-19 15:32:23.383176055 +1200
@@ -13,7 +13,7 @@
e-timezone-dialog.c \
e-timezone-dialog.h
@@ -203,8 +268,10 @@
libetimezonedialog_la_LIBADD = \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
---- a/widgets/menus/Makefile.am
-+++ b/widgets/menus/Makefile.am
+Index: evolution-3.5.4/widgets/menus/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/widgets/menus/Makefile.am 2012-03-10 05:33:44.000000000 +1300
++++ evolution-3.5.4/widgets/menus/Makefile.am 2012-07-19 15:32:23.383176055 +1200
@@ -40,7 +40,7 @@
gal-view-new-dialog.h \
gal-view.h
@@ -214,9 +281,11 @@
libmenus_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
---- a/widgets/misc/Makefile.am
-+++ b/widgets/misc/Makefile.am
-@@ -150,7 +150,7 @@
+Index: evolution-3.5.4/widgets/misc/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/widgets/misc/Makefile.am 2012-06-15 07:43:27.000000000 +1200
++++ evolution-3.5.4/widgets/misc/Makefile.am 2012-07-19 15:32:23.383176055 +1200
+@@ -171,7 +171,7 @@
ea-cell-table.c \
ea-widgets.c
@@ -225,8 +294,10 @@
libemiscwidgets_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
---- a/widgets/table/Makefile.am
-+++ b/widgets/table/Makefile.am
+Index: evolution-3.5.4/widgets/table/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/widgets/table/Makefile.am 2012-03-10 05:33:45.000000000 +1300
++++ evolution-3.5.4/widgets/table/Makefile.am 2012-07-19 15:32:23.383176055 +1200
@@ -164,7 +164,7 @@
gal-a11y-e-tree.h \
gal-a11y-e-tree-factory.h
@@ -236,8 +307,10 @@
libetable_la_LIBADD = \
$(top_builddir)/a11y/libevolution-a11y.la \
---- a/widgets/text/Makefile.am
-+++ b/widgets/text/Makefile.am
+Index: evolution-3.5.4/widgets/text/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/widgets/text/Makefile.am 2012-03-10 05:33:45.000000000 +1300
++++ evolution-3.5.4/widgets/text/Makefile.am 2012-07-19 15:32:23.383176055 +1200
@@ -28,7 +28,7 @@
gal-a11y-e-text-factory.h \
gal-a11y-e-text.h
@@ -247,18 +320,11 @@
libetext_la_LIBADD = \
$(top_builddir)/a11y/libevolution-a11y.la \
---- a/capplet/settings/Makefile.am
-+++ b/capplet/settings/Makefile.am
-@@ -63,5 +63,5 @@
- $(top_builddir)/libemail-engine/libemail-engine.la \
- $(top_builddir)/e-util/libeutil.la
-
--libevolution_mail_settings_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-+libevolution_mail_settings_la_LDFLAGS = $(NO_UNDEFINED)
-
---- a/libemail-engine/Makefile.am
-+++ b/libemail-engine/Makefile.am
-@@ -62,7 +62,7 @@
+Index: evolution-3.5.4/libemail-engine/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/libemail-engine/Makefile.am 2012-06-03 15:03:11.000000000 +1200
++++ evolution-3.5.4/libemail-engine/Makefile.am 2012-07-19 15:32:23.383176055 +1200
+@@ -64,7 +64,7 @@
$(GNOME_PLATFORM_LIBS) \
$(NULL)
@@ -267,9 +333,11 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libemail-engine.pc
---- a/libemail-utils/Makefile.am
-+++ b/libemail-utils/Makefile.am
-@@ -35,7 +35,7 @@
+Index: evolution-3.5.4/libemail-utils/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/libemail-utils/Makefile.am 2012-06-03 15:03:11.000000000 +1200
++++ evolution-3.5.4/libemail-utils/Makefile.am 2012-07-19 15:32:23.383176055 +1200
+@@ -27,7 +27,7 @@
mail-mt.c \
$(NULL)
@@ -278,8 +346,10 @@
libemail_utils_la_LIBADD = \
$(top_builddir)/filter/libfilter.la \
---- a/libevolution-utils/Makefile.am
-+++ b/libevolution-utils/Makefile.am
+Index: evolution-3.5.4/libevolution-utils/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/libevolution-utils/Makefile.am 2012-03-10 05:33:41.000000000 +1300
++++ evolution-3.5.4/libevolution-utils/Makefile.am 2012-07-19 15:32:23.383176055 +1200
@@ -30,7 +30,7 @@
evolution-util.c \
$(NULL)
@@ -289,9 +359,11 @@
libevolution_utils_la_LIBADD = \
$(EVOLUTION_DATA_SERVER_LIBS) \
---- a/libgnomecanvas/Makefile.am
-+++ b/libgnomecanvas/Makefile.am
-@@ -62,7 +62,7 @@
+Index: evolution-3.5.4/libgnomecanvas/Makefile.am
+===================================================================
+--- evolution-3.5.4.orig/libgnomecanvas/Makefile.am 2012-06-19 13:29:21.000000000 +1200
++++ evolution-3.5.4/libgnomecanvas/Makefile.am 2012-07-19 15:32:23.383176055 +1200
+@@ -60,7 +60,7 @@
$(GNOME_PLATFORM_LIBS) \
$(MATH_LIB)
Modified: experimental/evolution/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/series?rev=2285&op=diff
==============================================================================
--- experimental/evolution/debian/patches/series (original)
+++ experimental/evolution/debian/patches/series Fri Oct 5 21:51:12 2012
@@ -1,3 +1,2 @@
02_nss_paths.patch
-04_gettext_intltool.patch
10_revert_libevolution_avoid-version.patch
Modified: experimental/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/rules?rev=2285&op=diff
==============================================================================
--- experimental/evolution/debian/rules (original)
+++ experimental/evolution/debian/rules Fri Oct 5 21:51:12 2012
@@ -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.4
+ELIBDIR := usr/lib/evolution/3.6
DEB_SHLIBDEPS_INCLUDE := debian/evolution/$(ELIBDIR)
DEB_DH_MAKESHLIBS_ARGS_libevolution += -V'libevolution (>= $(DEB_GNOME_VERSION)), libevolution (<< $(DEB_GNOME_NEXTVERSION))' --noscripts -X $(ELIBDIR)/modules
@@ -28,7 +28,7 @@
--with-krb5=/usr \
--sysconfdir=/etc \
--libexecdir=/usr/lib \
- --enable-plugins=experimental \
+ --enable-plugins=all \
--enable-pst-import \
--enable-python \
--enable-contact-maps \
More information about the pkg-evolution-commits
mailing list