[SCM] qtdoc packaging branch, master, updated. debian/5.5.1-1-3-g91a7ec1

Dmitry Shachnev mitya57 at moszumanska.debian.org
Sat Jan 9 17:16:06 UTC 2016


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

The following commit has been merged in the master branch:
commit 91a7ec1e5eed72129301fd1e98cbf1cb54bb42d1
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jan 9 20:14:39 2016 +0300

    Revert "Temporarily remove qt3d-doc[-html] packages from [Build-]dependencies"
    
    This reverts commit 9898a2d9daa6b83679f184bdfa0a9ba64a653bc3.
---
 debian/changelog | 1 +
 debian/control   | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8003cba..d37cceb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtdoc-opensource-src (5.5.1-2) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Set Priority to extra because all Qt submodules doc packages are extra.
+  * Add qt3d5-doc[-html] packages back.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 09 Jan 2016 20:12:28 +0300
 
diff --git a/debian/control b/debian/control
index 744ae23..e76de0d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
            Dmitry Shachnev <mitya57 at debian.org>
 Build-Depends: debhelper (>= 9),
                libqt5sql5-sqlite (>= 5.5.1+dfsg~),
+               qt3d5-doc-html (>= 5.5.1~),
                qtbase5-dev (>= 5.5.1+dfsg~),
                qtbase5-dev-tools (>= 5.5.1+dfsg~),
                qtbase5-doc-html (>= 5.5.1+dfsg~),
@@ -36,7 +37,8 @@ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/qt/qtdoc.git
 
 Package: qt5-doc
 Architecture: all
-Depends: qtbase5-doc (>= 5.5.1~),
+Depends: qt3d5-doc,
+         qtbase5-doc (>= 5.5.1~),
          qtconnectivity5-doc,
          qtdeclarative5-doc,
          qtgraphicaleffects5-doc,
@@ -68,7 +70,8 @@ Description: Qt 5 API Documentation
 
 Package: qt5-doc-html
 Architecture: all
-Depends: qtbase5-doc-html (>= 5.5.1+dfsg~),
+Depends: qt3d5-doc-html,
+         qtbase5-doc-html (>= 5.5.1+dfsg~),
          qtconnectivity5-doc-html,
          qtdeclarative5-doc-html,
          qtgraphicaleffects5-doc-html,

-- 
qtdoc packaging



More information about the pkg-kde-commits mailing list