[SCM] qtdoc packaging branch, master, updated. debian/5.1.0-1-14-ga52d650
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Fri Jan 24 17:26:01 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdoc.git;a=commitdiff;h=70b5831
The following commit has been merged in the master branch:
commit 70b5831b722796c044bc2695da434af9dcf07141
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Fri Jan 24 14:13:38 2014 -0300
Add qtbase5-doc-html as B-D and as dependency.
---
debian/changelog | 3 +++
debian/control | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index e8d5d83..6c13f8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ qtdoc-opensource-src (5.2.0-1) UNRELEASED; urgency=low
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.
+ * 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.
[ Dmitry Shachnev ]
* Drop the dh_compress hack, it no longer works now that xz
diff --git a/debian/control b/debian/control
index 112f4a9..59589d6 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends: debhelper (>= 9),
libqt5sql5-sqlite,
qtbase5-dev (>= 5.2.0~),
qtbase5-dev-tools (>= 5.2.0~),
+ qtbase5-doc-html,
qtdeclarative5-doc,
qtdeclarative5-doc-html,
qtgraphicaleffects5-doc,
@@ -62,7 +63,8 @@ Description: Qt 5 API Documentation
Package: qt5-doc-html
Architecture: all
-Depends: qtdeclarative5-doc-html,
+Depends: qtbase5-doc-html,
+ qtdeclarative5-doc-html,
qtgraphicaleffects5-doc-html,
qtmultimedia5-doc-html,
qtscript5-doc-html,
--
qtdoc packaging
More information about the pkg-kde-commits
mailing list