r2778 - in /unstable/evolution-data-server/debian: changelog control libedataserver-1.2-20.symbols rules

[laney at users.alioth.debian.org]

Author: laney
Date: Wed Aug 26 17:05:42 2015
New Revision: 2778

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2778
Log:
Commit the NMU


Modified:
    unstable/evolution-data-server/debian/changelog
    unstable/evolution-data-server/debian/control
    unstable/evolution-data-server/debian/libedataserver-1.2-20.symbols
    unstable/evolution-data-server/debian/rules

Modified: unstable/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/changelog?rev=2778&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog	(original)
+++ unstable/evolution-data-server/debian/changelog	Wed Aug 26 17:05:42 2015
@@ -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 <smcv at debian.org>  Thu, 06 Aug 2015 19:56:33 +0100
+
 evolution-data-server (3.16.3-1) unstable; urgency=medium
 
   * New upstream release.

Modified: unstable/evolution-data-server/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/control?rev=2778&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/control	(original)
+++ unstable/evolution-data-server/debian/control	Wed Aug 26 17:05:42 2015
@@ -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,

Modified: unstable/evolution-data-server/debian/libedataserver-1.2-20.symbols
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/libedataserver-1.2-20.symbols?rev=2778&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/libedataserver-1.2-20.symbols	(original)
+++ unstable/evolution-data-server/debian/libedataserver-1.2-20.symbols	Wed Aug 26 17:05:42 2015
@@ -1,11 +1,5 @@
 libedataserver-1.2.so.20 libedataserver-1.2-20 #MINVER#
- _ZN6icu_5214StringByteSinkISsE6AppendEPKci at Base 3.16.2
- _ZN6icu_5214StringByteSinkISsED0Ev at Base 3.16.2
- _ZN6icu_5214StringByteSinkISsED1Ev at Base 3.16.2
- _ZN6icu_5214StringByteSinkISsED2Ev at Base 3.16.2
- _ZTIN6icu_5214StringByteSinkISsEE at Base 3.16.2
- _ZTSN6icu_5214StringByteSinkISsEE at Base 3.16.2
- _ZTVN6icu_5214StringByteSinkISsEE at Base 3.16.2
+ (c++|regex|optional=template)"icu_[0-9]+::StringByteSink<.*@Base" 3.16.2
  __e_source_private_replace_dbus_object at Base 3.16.2
  e_async_closure_callback at Base 3.16.2
  e_async_closure_free at Base 3.16.2

Modified: unstable/evolution-data-server/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/rules?rev=2778&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/rules	(original)
+++ unstable/evolution-data-server/debian/rules	Wed Aug 26 17:05:42 2015
@@ -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 \