r2890 - in /unstable/evolution-data-server/debian: changelog control rules

[bigon at users.alioth.debian.org]

Author: bigon
Date: Thu May 12 21:10:04 2016
New Revision: 2890

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2890
Log:
* Re-enable libphonenumber support
* Drop -dbg package en rely on the -dbgsym automatically built packages
* Add 'Multi-arch: foreign' field to evolution-data-server-common package

Modified:
    unstable/evolution-data-server/debian/changelog
    unstable/evolution-data-server/debian/control
    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=2890&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/changelog	(original)
+++ unstable/evolution-data-server/debian/changelog	Thu May 12 21:10:04 2016
@@ -1,3 +1,11 @@
+evolution-data-server (3.20.2-2) UNRELEASED; urgency=medium
+
+  * Re-enable libphonenumber support
+  * Drop -dbg package en rely on the -dbgsym automatically built packages
+  * Add 'Multi-arch: foreign' field to evolution-data-server-common package
+
+ -- Laurent Bigonville <bigon at debian.org>  Thu, 12 May 2016 23:08:46 +0200
+
 evolution-data-server (3.20.2-1) experimental; 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=2890&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/control	(original)
+++ unstable/evolution-data-server/debian/control	Thu May 12 21:10:04 2016
@@ -17,8 +17,8 @@
 Standards-Version: 3.9.8
 Homepage: https://wiki.gnome.org/Apps/Evolution
 Vcs-Svn: svn://anonscm.debian.org/pkg-evolution/unstable/evolution-data-server
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-evolution/unstable/evolution-data-server
-Build-Depends: debhelper (>= 9),
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-evolution/unstable/evolution-data-server
+Build-Depends: debhelper (>= 9.20160114~),
                cdbs (>= 0.4.90),
                dh-autoreconf,
                dpkg-dev (>= 1.16.1),
@@ -57,8 +57,8 @@
                gnome-pkg-tools,
                pkg-config (>= 0.16),
                valac (>= 0.22),
-               gnome-common (>= 3.6.0)
-#               libphonenumber6-dev [linux-any],
+               gnome-common (>= 3.6.0),
+               libphonenumber-dev [linux-any kfreebsd-any],
 
 Package: evolution-data-server
 Architecture: any
@@ -67,8 +67,7 @@
          evolution-data-server-common (= ${source:Version}),
          libcamel-1.2-57 (= ${binary:Version}),
          gnome-keyring,
-Suggests: evolution,
-          evolution-data-server-dbg (= ${binary:Version})
+Suggests: evolution
 Breaks: libebook-1.2-13 (<< 3.6),
         libedataserverui-3.0-5
 Description: evolution database backend server
@@ -78,6 +77,7 @@
 Package: evolution-data-server-common
 Architecture: all
 Depends: ${misc:Depends}
+Multi-arch: foreign
 Description: architecture independent files for Evolution Data Server
  The data server, called "Evolution Data Server" is responsible for managing
  calendar and addressbook information.
@@ -95,15 +95,6 @@
 Breaks: libedataserverui-3.0-dev
 Description: Development files for evolution-data-server (metapackage)
  This package contains header files and static library of evolution-data-server.
-
-Package: evolution-data-server-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: evolution-data-server (= ${binary:Version}),
-         ${misc:Depends}
-Description: evolution database backend server with debugging symbols
- This package contains unstripped binaries used for debugging.
 
 Package: evolution-data-server-doc
 Section: doc

Modified: unstable/evolution-data-server/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/rules?rev=2890&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/rules	(original)
+++ unstable/evolution-data-server/debian/rules	Thu May 12 21:10:04 2016
@@ -30,9 +30,9 @@
 DEB_EXPORT_BUILDFLAGS = 1
 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),$(filter $(DEB_HOST_ARCH_OS),linux kfreebsd))
+	DEB_CONFIGURE_EXTRA_FLAGS += --with-phonenumber=/usr
+endif
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
 	--sysconfdir=/etc \
@@ -51,6 +51,8 @@
 DEB_DH_MAKESHLIBS_ARGS_evolution-data-server += -Xusr/lib/evolution-data-server/
 DEB_FIXPERMS_EXCLUDE_evolution-data-server += usr/lib/evolution/camel-lock-helper*
 
+DEB_DH_STRIP_ARGS_ALL = --dbgsym-migration='evolution-data-server-dbg (<< 3.20.2-2~)'
+
 # don't configure with --libdir, but move the files manually, because
 # /usr/lib/evolution-data-server must not change.
 common-install-impl::