[SCM] qtdoc packaging branch, master, updated. debian/5.5.0-2-3-g9898a2d

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Thu Oct 22 01:05:38 UTC 2015


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

The following commit has been merged in the master branch:
commit 9898a2d9daa6b83679f184bdfa0a9ba64a653bc3
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Oct 21 22:05:15 2015 -0300

    Temporarily remove qt3d-doc[-html] packages from [Build-]dependencies
---
 debian/changelog | 2 ++
 debian/control   | 7 ++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d82be84..5ef4056 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtdoc-opensource-src (5.5.1-1) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
     - Bump Qt build dependencies.
+  * Temporarily remove qt3d-doc[-html] packages from [Build-]dependencies
+    until it gets accepted from the NEW queue.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 19 Oct 2015 13:23:03 -0300
 
diff --git a/debian/control b/debian/control
index 2f3e0ff..0460ba6 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