[SCM] qtdoc packaging branch, master, updated. debian/5.1.0-1-15-gd5ec898

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Fri Jan 24 17:33:01 UTC 2014


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

The following commit has been merged in the master branch:
commit d5ec89867549ab59cb19c188a66ccd5ff7ee0f39
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Jan 24 14:32:45 2014 -0300

    Also add qtx11extras.
---
 debian/changelog | 5 +++--
 debian/control   | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 559ab30..93982bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ qtdoc-opensource-src (5.2.0-1) UNRELEASED; urgency=low
   * Properly clean the build. Thanks Dmitry Shachnev!
   * Bump qttools' build dependencies to 5.2.0-7~ to ensure we are building
     against the version that reintroduced the documentation.
-  * Add qtwebkit5-examples-doc[-html] and qtserialport-doc[-html] as build
-    dependencies and as dependencies of the respective packages.
+  * Add qtwebkit5-examples-doc[-html], qtx11extras-doc[-html] and
+    qtserialport-doc[-html] as build dependencies and as dependencies of the
+    respective packages.
   * Add qtbase5-doc-html as build dependency and as a dependency of the
     respective package. We will add qtbase5-doc as soon as it gets trough
     the NEW queue.
diff --git a/debian/control b/debian/control
index b300973..030630e 100644
--- a/debian/control
+++ b/debian/control
@@ -32,6 +32,8 @@ Build-Depends: debhelper (>= 9),
                qtwebkit5-doc-html,
                qtwebkit5-examples-doc,
                qtwebkit5-examples-doc-html,
+               qtx11extras5-doc,
+               qtx11extras5-doc-html,
                qtxmlpatterns5-doc,
                qtxmlpatterns5-doc-html
 Standards-Version: 3.9.5
@@ -50,6 +52,7 @@ Depends: qtdeclarative5-doc,
          qttools5-doc,
          qtwebkit5-doc,
          qtwebkit5-examples-doc,
+         qtx11extras5-doc,
          qtxmlpatterns5-doc,
          ${misc:Depends}
 Suggests: qtbase5-dev, qttools5-dev-tools
@@ -76,6 +79,7 @@ Depends: qtbase5-doc-html,
          qttools5-doc-html,
          qtwebkit5-doc-html,
          qtwebkit5-examples-doc-html,
+         qtx11extras5-doc-html,
          qtxmlpatterns5-doc-html,
          ${misc:Depends}
 Suggests: qtbase5-dev, qttools5-dev-tools, w3m | www-browser

-- 
qtdoc packaging



More information about the pkg-kde-commits mailing list