[SCM] qtsvg packaging branch, experimental, updated. debian/5.1.1-2-11-gff7053f

Dmitry Shachnev mitya57-guest at alioth.debian.org
Mon Nov 4 09:30:06 UTC 2013


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

The following commit has been merged in the experimental branch:
commit ff7053ff5c854f75e90f4b545cbe9e8e0f3df21c
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Nov 4 13:29:49 2013 +0400

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

diff --git a/debian/changelog b/debian/changelog
index 2953c71..45003a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,7 @@ qtsvg-opensource-src (5.2.0~beta1-1) UNRELEASED; urgency=low
   [ Dmitry Shachnev ]
   * New upstream beta release.
   * Update qtbase build-dependencies to 5.2.0.
-  * Include architecture.mk in debian/rules, as it is needed for
-    DEB_HOST_MULTIARCH to be defined.
+  * Explicitly define DEB_HOST_MULTIARCH in debian/rules.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 21 Oct 2013 15:04:45 +0400
 
diff --git a/debian/rules b/debian/rules
index 176ab1a..cbfabe9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/dpkg/architecture.mk
+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)

-- 
qtsvg packaging



More information about the pkg-kde-commits mailing list