[SCM] qtbase packaging branch, master, updated. debian/5.2.0+dfsg-6-3-gdd85a4c

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=71240e0

The following commit has been merged in the master branch:
commit 71240e07fbbde7aea3d11775ea22a8e5b7f09cab
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Dec 21 21:01:33 2013 +0400

    Explicitly define all DEB_HOST_ARCH{,_BITS} variables and remove duplicate variables.
---
 debian/changelog |  4 ++++
 debian/rules     | 13 ++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 61bc2bc..7f0c565 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,10 @@ qtbase-opensource-src (5.2.0+dfsg-3) UNRELEASED; urgency=low
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Update symbols files with buildds' logs.
 
+  [ Dmitry Shachnev ]
+  * Explicitly define all DEB_HOST_ARCH{,_BITS} variables and remove duplicate
+    variables.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 20 Dec 2013 21:31:31 +0100
 
 qtbase-opensource-src (5.2.0+dfsg-2) experimental; urgency=medium
diff --git a/debian/rules b/debian/rules
index 3a12374..e5d683a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,9 @@
 #export DH_VERBOSE=1
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_ARCH_BITS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
 
 export PATH := $(PATH):$(shell pwd)/bin
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
@@ -32,15 +34,12 @@ vendor := $(shell dpkg-vendor --query Vendor)
 # I've opened a bug in debhelper to allow this:
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=703201
 
-arch= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-os= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-
 # Retrieve packages that have a .install-common file
 pkgs_with_common = $(patsubst debian/%.install-common,%,$(wildcard debian/*.install-common))
 # Retrieve packages that have a .install-$arch file
-pkgs_with_arch = $(patsubst debian/%.install-$(arch),%,$(wildcard debian/*.install-$(arch)))
+pkgs_with_arch = $(patsubst debian/%.install-$(DEB_HOST_ARCH),%,$(wildcard debian/*.install-$(DEB_HOST_ARCH)))
 # Retrieve packages that have a .install-$os file
-pkgs_with_os = $(patsubst debian/%.install-$(os),%,$(wildcard debian/*.install-$(os)))
+pkgs_with_os = $(patsubst debian/%.install-$(DEB_HOST_ARCH_OS),%,$(wildcard debian/*.install-$(DEB_HOST_ARCH)))
 
 
 ifneq (,$(filter %-sql-ibase,$(shell dh_listpackages)))
@@ -249,11 +248,11 @@ override_dh_install:
 	done
 
 	set -e; for pkg in $(pkgs_with_arch); do \
-		cat debian/$$pkg.install-$(arch) >> debian/$$pkg.install ; \
+		cat debian/$$pkg.install-$(DEB_HOST_ARCH) >> debian/$$pkg.install ; \
 	done
 
 	set -e; for pkg in $(pkgs_with_os); do \
-		cat debian/$$pkg.install-$(os) >> debian/$$pkg.install ; \
+		cat debian/$$pkg.install-$(DEB_HOST_ARCH_OS) >> debian/$$pkg.install ; \
 	done
 
 	# Call dh_install normally. It will process .install, .install.ARCH

-- 
qtbase packaging