r2805 - in /experimental/evolution-data-server/debian: changelog control libedataserver-1.2-21.symbols rules

[ah at users.alioth.debian.org]

Author: ah
Date: Thu Oct  1 17:06:13 2015
New Revision: 2805

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2805
Log:
Import and update 3.16.3-1.1 NMU

Modified:
    experimental/evolution-data-server/debian/changelog
    experimental/evolution-data-server/debian/control
    experimental/evolution-data-server/debian/libedataserver-1.2-21.symbols
    experimental/evolution-data-server/debian/rules

Modified: experimental/evolution-data-server/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/changelog?rev=2805&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/changelog	(original)
+++ experimental/evolution-data-server/debian/changelog	Thu Oct  1 17:06:13 2015
@@ -1,3 +1,10 @@
+evolution-data-server (3.18.0-2) experimental; urgency=medium
+
+  * Import and update 3.16.3-1.1 NMU
+    - temporarily disables libphonenumber (build-)dep
+
+ -- Andreas Henriksson <andreas at fatal.se>  Thu, 01 Oct 2015 18:47:53 +0200
+
 evolution-data-server (3.18.0-1) experimental; urgency=medium
 
   * New upstream release.
@@ -34,6 +41,17 @@
   * debian/*.symbols: Add new ones.
 
  -- Iain Lane <laney at debian.org>  Thu, 27 Aug 2015 12:39:50 +0100
+
+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
 

Modified: experimental/evolution-data-server/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/control?rev=2805&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/control	(original)
+++ experimental/evolution-data-server/debian/control	Thu Oct  1 17:06:13 2015
@@ -41,7 +41,6 @@
                libkrb5-dev,
                libldap2-dev,
                liboauth-dev (>= 0.9.4),
-               libphonenumber6-dev [linux-any],
                libjson-glib-dev,
                librest-dev (>= 0.7),
                libnss3-dev,
@@ -57,6 +56,7 @@
                pkg-config (>= 0.16),
                valac (>= 0.22),
                gnome-common (>= 3.6.0)
+#               libphonenumber6-dev [linux-any],
 XS-Testsuite: autopkgtest
 
 Package: evolution-data-server

Modified: experimental/evolution-data-server/debian/libedataserver-1.2-21.symbols
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/libedataserver-1.2-21.symbols?rev=2805&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/libedataserver-1.2-21.symbols	(original)
+++ experimental/evolution-data-server/debian/libedataserver-1.2-21.symbols	Thu Oct  1 17:06:13 2015
@@ -1,11 +1,5 @@
 libedataserver-1.2.so.21 libedataserver-1.2-21 #MINVER#
- _ZN6icu_5514StringByteSinkINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEE6AppendEPKci at Base 3.17.90
- _ZN6icu_5514StringByteSinkINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEED0Ev at Base 3.17.90
- _ZN6icu_5514StringByteSinkINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEED1Ev at Base 3.17.90
- _ZN6icu_5514StringByteSinkINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEED2Ev at Base 3.17.90
- _ZTIN6icu_5514StringByteSinkINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE at Base 3.17.90
- _ZTSN6icu_5514StringByteSinkINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE at Base 3.17.90
- _ZTVN6icu_5514StringByteSinkINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEE at Base 3.17.90
+ (c++|regex|optional=template)"icu_[0-9]+::StringByteSink<.*@Base" 3.17.90
  __e_source_private_replace_dbus_object at Base 3.17
  e_async_closure_callback at Base 3.17
  e_async_closure_free at Base 3.17

Modified: experimental/evolution-data-server/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution-data-server/debian/rules?rev=2805&op=diff
==============================================================================
--- experimental/evolution-data-server/debian/rules	(original)
+++ experimental/evolution-data-server/debian/rules	Thu Oct  1 17:06:13 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 \