[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.2.1-2-3-g98cb52f

Dmitry Shachnev mitya57-guest at moszumanska.debian.org
Tue Feb 11 16:08:04 UTC 2014


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

The following commit has been merged in the experimental branch:
commit 98cb52f81b1ee384f98e70fc1239bd7cddf20e08
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Feb 11 20:07:59 2014 +0400

    Remove correct package.
---
 debian/changelog                       | 2 +-
 debian/control                         | 7 ++++---
 debian/qtdeclarative5-doc-html.install | 3 +++
 debian/qtdeclarative5-doc.install      | 3 ---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 84cd544..5894397 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 qtdeclarative-opensource-src (5.2.1-3) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
-  * Stop building qtdeclarative5-doc-html from this source, it will be
+  * Stop building qtdeclarative5-doc from this source, it will be
     built from qttools-opensource-src instead. This allows us to drop
     qttools5-dev-tools build-dependency and get rid of dependency loop.
 
diff --git a/debian/control b/debian/control
index 04c7a42..2d7766f 100644
--- a/debian/control
+++ b/debian/control
@@ -301,13 +301,14 @@ Description: Qt 5 declarative libraries debugging symbols
  .
  This package contains the debugging symbols for the Qt 5 declarative libraries.
 
-Package: qtdeclarative5-doc
+Package: qtdeclarative5-doc-html
 Priority: extra
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Description: Qt 5 declarative documentation
+Description: Qt 5 declarative HTML documentation
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This package contains the documentation for the Qt 5 declarative libraries.
+ This package contains the HTML documentation for the Qt 5 declarative
+ libraries.
diff --git a/debian/qtdeclarative5-doc-html.install b/debian/qtdeclarative5-doc-html.install
new file mode 100644
index 0000000..9b3a2d2
--- /dev/null
+++ b/debian/qtdeclarative5-doc-html.install
@@ -0,0 +1,3 @@
+usr/share/qt5/doc/qtqml/
+usr/share/qt5/doc/qtquick/
+usr/share/qt5/doc/qtquickdialogs/
diff --git a/debian/qtdeclarative5-doc.install b/debian/qtdeclarative5-doc.install
deleted file mode 100644
index c96d43c..0000000
--- a/debian/qtdeclarative5-doc.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/qt5/doc/qtqml.qch
-usr/share/qt5/doc/qtquick.qch
-usr/share/qt5/doc/qtquickdialogs.qch

-- 
qtdeclarative packaging



More information about the pkg-kde-commits mailing list