[SCM] qtdoc packaging branch, master, updated. debian/5.1.0-1-12-ge4a9da4

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


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

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

    Add qtwebkit5-examples-doc and qtwebkit5-examples-doc-html
    
    As B-D and dependencies.
---
 debian/changelog | 2 ++
 debian/control   | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index aca4302..e8d5d83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ 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 and qtwebkit5-examples-doc-html as build
+    dependencies and as dependencies of the respective packages.
 
   [ Dmitry Shachnev ]
   * Drop the dh_compress hack, it no longer works now that xz
diff --git a/debian/control b/debian/control
index 8a913d4..112f4a9 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,8 @@ Build-Depends: debhelper (>= 9),
                qttools5-doc-html (>= 5.2.0-7~),
                qtwebkit5-doc,
                qtwebkit5-doc-html,
+               qtwebkit5-examples-doc,
+               qtwebkit5-examples-doc-html,
                qtxmlpatterns5-doc,
                qtxmlpatterns5-doc-html
 Standards-Version: 3.9.5
@@ -43,6 +45,7 @@ Depends: qtdeclarative5-doc,
          qtsvg5-doc,
          qttools5-doc,
          qtwebkit5-doc,
+         qtwebkit5-examples-doc,
          qtxmlpatterns5-doc,
          ${misc:Depends}
 Suggests: qtbase5-dev, qttools5-dev-tools
@@ -66,6 +69,7 @@ Depends: qtdeclarative5-doc-html,
          qtsvg5-doc-html,
          qttools5-doc-html,
          qtwebkit5-doc-html,
+         qtwebkit5-examples-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