On Thu, 06 Aug 2015 at 10:25:54 +0100, Simon McVittie wrote:
> I have not been able to test the patched e-d-s yet, since upgrading
> my system to the g++-5 ABI still has too much collateral damage
Now tested and uploaded to DELAYED/2, final debdiff attached.
Please let me know if I should cancel or reschedule.
S
diffstat for evolution-data-server-3.16.3 evolution-data-server-3.16.3
changelog | 11 +++++++++++
control | 1 -
libedataserver-1.2-20.symbols | 8 +-------
rules | 6 +++---
4 files changed, 15 insertions(+), 11 deletions(-)
diff -Nru evolution-data-server-3.16.3/debian/changelog evolution-data-server-3.16.3/debian/changelog
--- evolution-data-server-3.16.3/debian/changelog 2015-06-11 20:28:39.000000000 +0100
+++ evolution-data-server-3.16.3/debian/changelog 2015-08-06 19:56:34.000000000 +0100
@@ -1,3 +1,14 @@
+evolution-data-server (3.16.3-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Disable libphonenumber support for now, to disentangle e-d-s from
+ that part of the libstdc++ transition (which it appears is going
+ to involve a new upstream release).
+ * debian/libedataserver-1.2-20.symbols: mark ICU template instantiations
+ as optional since they are not intended to be ABI (Closes: #792494)
+
+ -- Simon McVittie <[email protected]> Thu, 06 Aug 2015 19:56:33 +0100
+
evolution-data-server (3.16.3-1) unstable; urgency=medium
* New upstream release.
diff -Nru evolution-data-server-3.16.3/debian/control evolution-data-server-3.16.3/debian/control
--- evolution-data-server-3.16.3/debian/control 2015-05-31 12:54:52.000000000 +0100
+++ evolution-data-server-3.16.3/debian/control 2015-08-06 09:39:16.000000000 +0100
@@ -40,7 +40,6 @@
libkrb5-dev,
libldap2-dev,
liboauth-dev (>= 0.9.4),
- libphonenumber6-dev [linux-any],
libjson-glib-dev,
librest-dev (>= 0.7),
libnss3-dev,
diff -Nru evolution-data-server-3.16.3/debian/libedataserver-1.2-20.symbols evolution-data-server-3.16.3/debian/libedataserver-1.2-20.symbols
--- evolution-data-server-3.16.3/debian/libedataserver-1.2-20.symbols 2015-06-11 19:57:52.000000000 +0100
+++ evolution-data-server-3.16.3/debian/libedataserver-1.2-20.symbols 2015-08-06 10:05:11.000000000 +0100
@@ -1,11 +1,5 @@
libedataserver-1.2.so.20 libedataserver-1.2-20 #MINVER#
- _ZN6icu_5214StringByteSinkISsE6AppendEPKci@Base 3.16.2
- _ZN6icu_5214StringByteSinkISsED0Ev@Base 3.16.2
- _ZN6icu_5214StringByteSinkISsED1Ev@Base 3.16.2
- _ZN6icu_5214StringByteSinkISsED2Ev@Base 3.16.2
- _ZTIN6icu_5214StringByteSinkISsEE@Base 3.16.2
- _ZTSN6icu_5214StringByteSinkISsEE@Base 3.16.2
- _ZTVN6icu_5214StringByteSinkISsEE@Base 3.16.2
+ (c++|regex|optional=template)"icu_[0-9]+::StringByteSink<.*@Base" 3.16.2
__e_source_private_replace_dbus_object@Base 3.16.2
e_async_closure_callback@Base 3.16.2
e_async_closure_free@Base 3.16.2
diff -Nru evolution-data-server-3.16.3/debian/rules evolution-data-server-3.16.3/debian/rules
--- evolution-data-server-3.16.3/debian/rules 2014-09-06 17:44:17.000000000 +0100
+++ evolution-data-server-3.16.3/debian/rules 2015-08-06 09:50:39.000000000 +0100
@@ -25,9 +25,9 @@
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
include /usr/share/dpkg/buildflags.mk
-ifeq ($(DEB_HOST_ARCH_OS),linux)
- DEB_CONFIGURE_EXTRA_FLAGS += --with-phonenumber=/usr
-endif
+#ifeq ($(DEB_HOST_ARCH_OS),linux)
+# DEB_CONFIGURE_EXTRA_FLAGS += --with-phonenumber=/usr
+#endif
DEB_CONFIGURE_EXTRA_FLAGS += \
--sysconfdir=/etc \
