[SCM] qtbase packaging branch, master, updated. debian/5.0.0-1-40-g6114fae

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 6114fae7001c0173816702108c16bc5fbbea3c9f
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Apr 7 22:56:02 2013 -0300

    The make variables should be enclosed in parenthesis.
    
    And also fix an aesthetic typo.
---
 debian/rules |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 966db66..940e782 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ vendor := $(shell dpkg-vendor --query Vendor)
 # 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)
+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))
@@ -271,11 +271,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-$(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-$(os) >> debian/$$pkg.install ; \
 	done
 
 	# Call dh_install normally. It will process .install, .install.ARCH

-- 
qtbase packaging