[SCM] qtmultimedia packaging branch, master, updated. debian/5.2.0-2-3-ga6cb862

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Fri Jan 31 23:01:30 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtmultimedia.git;a=commitdiff;h=158b36e

The following commit has been merged in the master branch:
commit 158b36e5b2d925f1bf92c6246ab28af8cd60c560
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Nov 4 13:53:30 2013 +0400

    Explicitly define DEB_HOST_MULTIARCH in debian/rules.
---
 debian/changelog | 1 +
 debian/rules     | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d581247..616ef6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtmultimedia-opensource-src (5.2.0~beta1-1) UNRELEASED; urgency=low
   * Bump Qt 5 build-dependencies to 5.2.0.
   * Update qtmultimedia5-examples.install.
   * Make Vcs-Browser field canonical by dropping useless attribute.
+  * Explicitly define DEB_HOST_MULTIARCH in debian/rules.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 30 Oct 2013 12:17:59 +0400
 
diff --git a/debian/rules b/debian/rules
index ac48d87..b5abf64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed

-- 
qtmultimedia packaging



More information about the pkg-kde-commits mailing list