[SCM] krita packaging branch, master, updated. debian/3.1.1+dfsg-1-5-g869a449

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/calligra/krita.git;a=commitdiff;h=869a449

The following commit has been merged in the master branch:
commit 869a449fde13ae7ad4f6f3b4b7c08913e25b6f68
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 17 19:24:38 2017 +0200

    record source version of vc-dev as Built-Using
---
 debian/changelog | 2 ++
 debian/control   | 1 +
 debian/rules     | 8 ++++++++
 3 files changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3cb570e..62e749b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ krita (1:3.1.4+dfsg-0r1) UNRELEASED; urgency=medium
       system
   * Drop the -DPACKAGERS_BUILD=ON cmake parameter, as that option is gone.
   * Update copyright.
+  * Record as Built-Using the version of the source of vc-dev used for the
+    build.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 17 Jun 2017 15:48:06 +0200
 
diff --git a/debian/control b/debian/control
index ac90a68..e29b397 100644
--- a/debian/control
+++ b/debian/control
@@ -60,6 +60,7 @@ Suggests: krita-l10n (>= ${source:Version}),
           ffmpeg,
 Breaks: krita-data (<< 1:2.4)
 Replaces: krita-data (<< 1:2.4)
+Built-Using: ${vc:Built-Using}
 Description: pixel-based image manipulation program
  Krita is a creative application for raster images. Whether you want to create
  from scratch or work with existing images, Krita is for you. You can work with
diff --git a/debian/rules b/debian/rules
index eecd5c5..d766764 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,13 @@
 
 export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+ifeq ($(DEB_HOST_ARCH_CPU),$(findstring $(DEB_HOST_ARCH_CPU),amd64 i386))
+  VC_DEV_VERSION = $(shell dpkg-query -Wf '$${source:Package} (= $${source:Version})' vc-dev)
+else
+  VC_DEV_VERSION =
+endif
+
 # conflicts with old calligra-l10n
 # (mostly copied from l10n-packages.mk in pkg-kde-tools)
 l10npkgs_firstversion_ok := 1:2.9.11-1~
@@ -31,6 +38,7 @@ override_dh_install:
 	dh_install --list-missing
 
 override_dh_gencontrol:
+	dh_gencontrol -pkrita -- -Vvc:Built-Using='$(VC_DEV_VERSION)'
 	dh_gencontrol -pkrita-l10n -- -Vkrita:oldLangs='$(l10npkgs_packages_rels)'
 	dh_gencontrol --remaining-packages
 

-- 
krita packaging