[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.7.1-2-3-ge98830a
Simon Quigley
tsimonq2-guest at moszumanska.debian.org
Mon Apr 17 11:53:53 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=e98830a
The following commit has been merged in the experimental branch:
commit e98830a42df67a8caabc915c7f8a7cf554ad3940
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date: Mon Apr 17 06:53:50 2017 -0500
Enable nodoc to be used
---
debian/changelog | 2 ++
debian/control | 10 ++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 23c35cb..4cff5e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qtdeclarative-opensource-src (5.9.0~beta-1) UNRELEASED; urgency=medium
[ Simon Quigley ]
* New upstream release.
+ * Bump dpkg-dev build-dependency to 1.17.14, for build profiles.
+ * Do not build the documentation packages when the nodoc profile is enabled.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 17 Apr 2017 06:43:41 -0500
diff --git a/debian/control b/debian/control
index 8db12b7..74f23e9 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
Timo Jyrinki <timo at debian.org>,
Dmitry Shachnev <mitya57 at debian.org>
Build-Depends: debhelper (>= 9.20160114~),
- dpkg-dev (>= 1.16.1),
+ dpkg-dev (>= 1.17.14),
libgl1-mesa-dri,
libqt5opengl5-dev (>= 5.9.0~beta+dfsg~),
libqt5xmlpatterns5-dev (>= 5.9.0~beta~),
@@ -17,9 +17,9 @@ Build-Depends: debhelper (>= 9.20160114~),
qtbase5-private-dev (>= 5.9.0~beta+dfsg~),
xauth,
xvfb
-Build-Depends-Indep: libqt5sql5-sqlite (>= 5.9.0~beta+dfsg~),
- qtbase5-doc-html (>= 5.9.0~beta+dfsg~),
- qttools5-dev-tools (>= 5.9.0~beta~)
+Build-Depends-Indep: libqt5sql5-sqlite (>= 5.9.0~beta+dfsg~) <!nodoc>,
+ qtbase5-doc-html (>= 5.9.0~beta+dfsg~) <!nodoc>,
+ qttools5-dev-tools (>= 5.9.0~beta~) <!nodoc>
Standards-Version: 3.9.8
Homepage: http://qt-project.org/
Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtdeclarative.git
@@ -317,6 +317,7 @@ Description: Qt 5 declarative examples
This package contains Qt 5 declarative examples.
Package: qtdeclarative5-doc
+Build-Profiles: <!nodoc>
Priority: extra
Architecture: all
Section: doc
@@ -328,6 +329,7 @@ Description: Qt 5 declarative documentation
This package contains the documentation for the Qt 5 declarative libraries.
Package: qtdeclarative5-doc-html
+Build-Profiles: <!nodoc>
Priority: extra
Architecture: all
Section: doc
--
qtdeclarative packaging
More information about the pkg-kde-commits
mailing list