[SCM] qttools packaging branch, master, updated. debian/5.1.1-1-4-gb695131
Lisandro Damián Nicanor Pérez
lisandro at alioth.debian.org
Tue Oct 1 13:08:02 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qttools.git;a=commitdiff;h=b695131
The following commit has been merged in the master branch:
commit b69513179bd76b7680dbdb0a8bbf8d9ad12b1098
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Tue Oct 1 10:07:37 2013 -0300
No-op wrap-and-sort.
---
debian/control | 9 ++++-----
debian/copyright | 1 -
debian/qttools5-doc-html.install | 4 ++--
debian/qttools5-doc.install | 6 +++---
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/debian/control b/debian/control
index b58f751..a1a9814 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Description: Qt 5 CLucene module
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 includes the CLucene module. CLucene is a high-performance,
+ This package includes the CLucene module. CLucene is a high-performance,
scalable indexing and searching API.
Package: libqt5designer5
@@ -99,8 +99,7 @@ Package: qttools5-private-dev
Architecture: any
Section: libdevel
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: qttools5-dev (= ${binary:Version}),
- ${misc:Depends}
+Depends: qttools5-dev (= ${binary:Version}), ${misc:Depends}
Description: Qt 5 tools private development files
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
@@ -159,8 +158,8 @@ Multi-Arch: same
Priority: extra
Section: debug
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: qttools5-examples (= ${binary:Version}),
- qttools5-dbg (= ${binary:Version}),
+Depends: qttools5-dbg (= ${binary:Version}),
+ qttools5-examples (= ${binary:Version}),
${misc:Depends}
Description: Qt 5 tools examples debugging symbols
Qt is a cross-platform C++ application framework. Qt's primary feature
diff --git a/debian/copyright b/debian/copyright
index acba265..26b9888 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -220,4 +220,3 @@ License: GFDL-1.3
.
On Debian systems, the complete text of the GFDL-1.3 license can be found in
`/usr/share/common-licenses/GFDL-1.3`,
-
diff --git a/debian/qttools5-doc-html.install b/debian/qttools5-doc-html.install
index 1c75309..a7f030d 100644
--- a/debian/qttools5-doc-html.install
+++ b/debian/qttools5-doc-html.install
@@ -1,5 +1,5 @@
+usr/share/qt5/doc/qtassistant/
usr/share/qt5/doc/qtdesigner/
-usr/share/qt5/doc/qtlinguist/
usr/share/qt5/doc/qthelp/
-usr/share/qt5/doc/qtassistant/
+usr/share/qt5/doc/qtlinguist/
usr/share/qt5/doc/qtuitools/
diff --git a/debian/qttools5-doc.install b/debian/qttools5-doc.install
index 5882b33..3afbc6d 100644
--- a/debian/qttools5-doc.install
+++ b/debian/qttools5-doc.install
@@ -1,5 +1,5 @@
-usr/share/qt5/doc/qthelp.qch
-usr/share/qt5/doc/qtuitools.qch
-usr/share/qt5/doc/qtlinguist.qch
usr/share/qt5/doc/qtassistant.qch
usr/share/qt5/doc/qtdesigner.qch
+usr/share/qt5/doc/qthelp.qch
+usr/share/qt5/doc/qtlinguist.qch
+usr/share/qt5/doc/qtuitools.qch
--
qttools packaging
More information about the pkg-kde-commits
mailing list