[SCM] qtmultimedia packaging branch, master, updated. debian/5.4.2-1

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 064e3a1cd96317d05cc7b2c7ba3a31b0d2c2653b
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Dec 22 13:58:48 2014 +0300

    Build-depend on qtbase5-doc-html.
---
 debian/changelog | 2 ++
 debian/control   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9bd7b20..9d5739b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ qtmultimedia-opensource-src (5.4.0-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Update debian/copyright to reflect LGPL v3 addition.
   * Update Vcs-Browser field to point to cgit interface.
+  * Add qtbase5-doc-html to Build-Depends-Indep to make sure docs
+    are properly linked with qtbase.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 15 Dec 2014 07:55:37 +0000
 
diff --git a/debian/control b/debian/control
index b2999da..eb6bfdf 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Build-Depends: debhelper (>= 9.0.0),
                qtdeclarative5-private-dev (>= 5.4.0~),
                zlib1g-dev
 Build-Depends-Indep: libqt5sql5-sqlite (>= 5.4.0+dfsg~),
+                     qtbase5-doc-html (>= 5.4.0+dfsg~),
                      qttools5-dev-tools (>= 5.4.0~)
 Standards-Version: 3.9.5
 Homepage: https://qt-project.org/

-- 
qtmultimedia packaging