[Pkg-telepathy-commits] [empathy] 04/08: Use default.mk for architecture variables

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch telepathy1
in repository empathy.

commit 294ec050014d7979bdbe87788fd116b87aba1aaa
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Mar 27 11:05:36 2014 +0000

    Use default.mk for architecture variables
---
 debian/changelog | 1 +
 debian/rules     | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 13ffbac..5a8e58f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ empathy (3.12.0-1) UNRELEASED; urgency=medium
   * Build against cogl and GOA from unstable
   * Reset gbp.conf for unstable
   * Run autoreconf on /telepathy-account-widgets as well as /
+  * Use default.mk for architecture variables
 
  -- Laurent Bigonville <bigon at debian.org>  Mon, 24 Mar 2014 18:16:07 +0100
 
diff --git a/debian/rules b/debian/rules
index cc8f12a..1b6bc86 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ DEB_DH_INSTALL_ARGS := --list-missing
 # Ensure at build time that the library has no dependencies on undefined
 # symbols, and speed up loading.
 DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-include /usr/share/dpkg/buildflags.mk
+include /usr/share/dpkg/default.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell=yes \
                              --enable-location=yes \
@@ -26,8 +26,6 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell=yes \
                              --enable-map=yes \
                              --enable-goa=yes
 
-DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
-
 ifeq ($(DEB_BUILD_ARCH_OS),linux)
   DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=nm --enable-gudev=yes
 else

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/empathy.git