[SCM] qtdoc packaging branch, master, updated. debian/5.5.1-1-6-g8b950bb

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Mon Jun 13 14:28:46 UTC 2016


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

The following commit has been merged in the master branch:
commit fabed58030ea745ea6c43cd729cdfd7330d95808
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Jun 13 11:28:23 2016 -0300

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

diff --git a/debian/changelog b/debian/changelog
index d37cceb..8003cba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,6 @@ 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 e76de0d..744ae23 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ 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~),
@@ -37,8 +36,7 @@ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/qt/qtdoc.git
 
 Package: qt5-doc
 Architecture: all
-Depends: qt3d5-doc,
-         qtbase5-doc (>= 5.5.1~),
+Depends: qtbase5-doc (>= 5.5.1~),
          qtconnectivity5-doc,
          qtdeclarative5-doc,
          qtgraphicaleffects5-doc,
@@ -70,8 +68,7 @@ Description: Qt 5 API Documentation
 
 Package: qt5-doc-html
 Architecture: all
-Depends: qt3d5-doc-html,
-         qtbase5-doc-html (>= 5.5.1+dfsg~),
+Depends: 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