[SCM] qttools packaging branch, experimental, updated. debian/5.2.1-8-11-g683cfb7

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Sat May 24 15:33:07 UTC 2014


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

The following commit has been merged in the experimental branch:
commit 683cfb7cb84d1d4c5f89e070a51f43540fdba040
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat May 24 12:32:38 2014 -0300

    We don't build QuickDialogs' doc anymore.
---
 debian/changelog                  | 2 ++
 debian/qtdeclarative5-doc.install | 1 -
 debian/rules                      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a36fe2c..41aec1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ qttools-opensource-src (5.3.0-1) UNRELEASED; urgency=medium
   * Remove fix_path_to_lrelease.patch, applied upstream.
   * Require qtdeclarative >= 5.3.0-3~, it includes a fix in the development
     package that we need.
+  * QuickDialogs are not part of Declarative anymore, so we don't build it's
+    documentation.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 17 May 2014 23:02:27 -0300
 
diff --git a/debian/qtdeclarative5-doc.install b/debian/qtdeclarative5-doc.install
index c96d43c..b68c080 100644
--- a/debian/qtdeclarative5-doc.install
+++ b/debian/qtdeclarative5-doc.install
@@ -1,3 +1,2 @@
 usr/share/qt5/doc/qtqml.qch
 usr/share/qt5/doc/qtquick.qch
-usr/share/qt5/doc/qtquickdialogs.qch
diff --git a/debian/rules b/debian/rules
index f079899..b76a2db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,7 @@ override_dh_auto_install-indep:
 	set -ex; for subdir in qdoc qmake qtconcurrent qtcore qtdbus qtgui qtnetwork \
 	                       qtopengl qtprintsupport qtscript qtscripttools qtsql \
 	                       qttestlib qtwidgets qtxml qtqml qtquick \
-	                       qtquickdialogs qtxmlpatterns qtwebkit; do \
+	                       qtxmlpatterns qtwebkit; do \
 		LD_LIBRARY_PATH=$(CURDIR)/lib $(CURDIR)/bin/qhelpgenerator \
 			/usr/share/qt5/doc/$$subdir/$$subdir.qhp -o \
 			$(CURDIR)/debian/tmp/usr/share/qt5/doc/$$subdir.qch; \

-- 
qttools packaging



More information about the pkg-kde-commits mailing list