callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New upstream release

Browse Source 
git-svn-id: file:///svn/pkg-evolution/experimental/evolution@2384 ed03ce00-e4f4-0310-9448-ee38221cb277
This commit is contained in:
Jeremy Bicha
2013-07-28 03:33:55 +00:00
parent d12e75e7df
commit 8cb563ad22
4 changed files with 94 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
evolution (3.8.4-1) UNRELEASED; urgency=low
* New upstream release
-- Jeremy Bicha <jbicha@ubuntu.com> Sat, 27 Jul 2013 23:31:02 -0400
evolution (3.8.2-2) experimental; urgency=low
* debian/control: Add an explicit depend on highlight

13
debian/control vendored
View File

@ -22,12 +22,12 @@ Build-Depends: debhelper (>= 9),
libglib2.0-dev (>= 2.34),
libgtk-3-dev (>= 3.4.0),
libgail-3-dev (>= 3.0.2),
libebook1.2-dev (>= 3.8.2),
libecal1.2-dev (>= 3.8.2),
libedataserver1.2-dev (>= 3.8.2),
libebackend1.2-dev (>= 3.8.2),
libebook-contacts1.2-dev (>= 3.8.2),
libcamel1.2-dev (>= 3.8.2),
libebook1.2-dev (>= 3.8.4),
libecal1.2-dev (>= 3.8.4),
libedataserver1.2-dev (>= 3.8.4),
libebackend1.2-dev (>= 3.8.4),
libebook-contacts1.2-dev (>= 3.8.4),
libcamel1.2-dev (>= 3.8.4),
evolution-data-server-dev (>= 3.8),
evolution-data-server-dev (<< 3.9),
libgtkhtml-4.0-dev (>= 4.5.2),
@ -63,7 +63,6 @@ Build-Depends: debhelper (>= 9),
libice-dev,
libgstreamer1.0-dev,
po-debconf,
rarian-compat,
yelp-tools,
gnome-pkg-tools,
gsettings-desktop-schemas-dev (>= 2.91.92),

162
debian/patches/10_revert_libevolution_avoid-version.patch vendored
View File

@ -6,11 +6,11 @@ Bug-GNOME: https://bugzilla.gnome.org/show_bug.cgi?id=591436
Forwarded: no
---
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 7664e3d..1b4ed83 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -23,7 +23,7 @@ libecontacteditor_la_SOURCES = \
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
@@ -23,7 +23,7 @@
e-contact-quick-add.c \
e-contact-quick-add.h
@ -19,11 +19,11 @@ index 7664e3d..1b4ed83 100644
libecontacteditor_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index e73b895..bf80738 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -19,7 +19,7 @@ libecontactlisteditor_la_SOURCES = \
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
@@ -19,7 +19,7 @@
e-contact-list-model.c \
e-contact-list-model.h
@ -32,11 +32,11 @@ index e73b895..bf80738 100644
libecontactlisteditor_la_LIBADD = \
$(top_builddir)/addressbook/util/libeabutil.la \
diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am
index 6345d29..4337421 100644
--- a/addressbook/importers/Makefile.am
+++ b/addressbook/importers/Makefile.am
@@ -18,7 +18,7 @@ libevolution_addressbook_importers_la_SOURCES = \
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
@@ -18,7 +18,7 @@
evolution-csv-importer.c \
evolution-addressbook-importers.h
@ -45,11 +45,11 @@ index 6345d29..4337421 100644
libevolution_addressbook_importers_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am
index 83bf1e7..0c1af2f 100644
--- a/addressbook/util/Makefile.am
+++ b/addressbook/util/Makefile.am
@@ -19,7 +19,7 @@ libeabutil_la_SOURCES = \
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
@@ -19,7 +19,7 @@
eab-book-util.c \
eab-book-util.h
@ -58,11 +58,11 @@ index 83bf1e7..0c1af2f 100644
libeabutil_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index b086902..140df3b 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -212,7 +212,7 @@ libevolution_calendar_la_LIBADD = \
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 @@
$(GTKHTML_LIBS) \
$(LIBSOUP_LIBS)
@ -71,11 +71,11 @@ index b086902..140df3b 100644
EXTRA_DIST = \
$(ui_DATA) \
diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am
index a6fb303..de55265 100644
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -15,7 +15,7 @@ libevolution_calendar_importers_la_SOURCES = \
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
@@ -15,7 +15,7 @@
evolution-calendar-importer.h \
icalendar-importer.c
@ -84,11 +84,11 @@ index a6fb303..de55265 100644
libevolution_calendar_importers_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 8c9425a..4cda3c6 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -52,7 +52,7 @@ libcomposer_la_SOURCES = \
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
@@ -52,7 +52,7 @@
e-composer-text-header.c \
e-msg-composer.c
@ -97,11 +97,11 @@ index 8c9425a..4cda3c6 100644
libcomposer_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 9fa1877..0a38d57 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -583,7 +583,7 @@ libeutil_la_SOURCES = \
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 @@
$(PLATFORM_SOURCES) \
$(NULL)
@ -110,24 +110,24 @@ index 9fa1877..0a38d57 100644
libeutil_la_LIBADD = \
$(top_builddir)/libgnomecanvas/libgnomecanvas.la \
diff --git a/em-format/Makefile.am b/em-format/Makefile.am
index f26a004..0b46d56 100644
--- a/em-format/Makefile.am
+++ b/em-format/Makefile.am
@@ -94,7 +94,7 @@ libemformat_la_SOURCES = \
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 @@
e-mail-stripsig-filter.c \
$(SMIME_EXTENSIONS)
-libemformat_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libemformat_la_LDFLAGS = $(NO_UNDEFINED)
if ENABLE_SMIME
diff --git a/libemail-engine/Makefile.am b/libemail-engine/Makefile.am
index 60a8437..e454862 100644
--- a/libemail-engine/Makefile.am
+++ b/libemail-engine/Makefile.am
@@ -76,7 +76,7 @@ libemail_engine_la_LIBADD = \
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
@@ -81,7 +81,7 @@
$(GTKHTML_LIBS) \
$(NULL)
@ -136,11 +136,11 @@ index 60a8437..e454862 100644
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libemail-engine.pc
diff --git a/libgnomecanvas/Makefile.am b/libgnomecanvas/Makefile.am
index a1eb3f1..a772e01 100644
--- a/libgnomecanvas/Makefile.am
+++ b/libgnomecanvas/Makefile.am
@@ -53,7 +53,7 @@ libgnomecanvas_la_LIBADD = \
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
@@ -53,7 +53,7 @@
$(GNOME_PLATFORM_LIBS) \
$(MATH_LIB)
@ -149,11 +149,11 @@ index a1eb3f1..a772e01 100644
BUILT_SOURCES = $(MARSHAL_GENERATED)
diff --git a/mail/Makefile.am b/mail/Makefile.am
index c0fdeb3..90accf2 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -206,7 +206,7 @@ libevolution_mail_la_LIBADD = \
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
@@ -206,7 +206,7 @@
$(LIBSOUP_LIBS) \
-lresolv
@ -162,11 +162,11 @@ index c0fdeb3..90accf2 100644
libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index 339bbe2..13cfa43 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -18,7 +18,7 @@ libevolution_mail_importers_la_SOURCES = \
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
@@ -18,7 +18,7 @@
pine-importer.c \
evolution-mbox-importer.c
@ -175,11 +175,11 @@ index 339bbe2..13cfa43 100644
libevolution_mail_importers_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
diff --git a/shell/Makefile.am b/shell/Makefile.am
index d1d3fdb..d7cbb78 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -84,7 +84,7 @@ libeshell_la_SOURCES = \
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 @@
evo-version.h \
es-event.c
@ -188,11 +188,11 @@ index d1d3fdb..d7cbb78 100644
libeshell_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am
index 1a867d5..278a70d 100644
--- a/smime/gui/Makefile.am
+++ b/smime/gui/Makefile.am
@@ -44,7 +44,7 @@ libevolution_smime_la_LIBADD = \
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
@@ -44,7 +44,7 @@
$(GTKHTML_LIBS) \
$(CERT_UI_LIBS)
@ -201,11 +201,11 @@ index 1a867d5..278a70d 100644
ui_DATA = smime-ui.ui
diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am
index 634c982..44eb986 100644
--- a/smime/lib/Makefile.am
+++ b/smime/lib/Makefile.am
@@ -36,6 +36,6 @@ libessmime_la_LIBADD = \
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
@@ -36,6 +36,6 @@
$(GTKHTML_LIBS) \
$(CERT_UI_LIBS)

1
debian/rules vendored
View File

@ -15,6 +15,7 @@ DEB_SHLIBDEPS_INCLUDE := debian/evolution/$(ELIBDIR)
DEB_DH_MAKESHLIBS_ARGS_libevolution += -V'libevolution (>= $(DEB_GNOME_VERSION)), libevolution (<< $(DEB_GNOME_NEXTVERSION))' --noscripts -X $(ELIBDIR)/modules
DEB_DH_MAKESHLIBS_ARGS_evolution += -V
DEB_DH_MAKESHLIBS_ARGS_ALL += --noscripts -X $(ELIBDIR)/plugins
DEB_DH_INSTALL_ARGS := --fail-missing -X.la
export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
export DEB_BUILD_MAINT_OPTIONS=hardening=+all