[SCM] Qt Messaging Framework (QMF) packaging branch, master, updated. debian/1.0.7-2011w08-1-5-g32103e4
Fathi Boudra
fabo at alioth.debian.org
Mon Jun 20 08:38:14 UTC 2011
The following commit has been merged in the master branch:
commit 8f75bbdfc205e9e22d3122c64bfeb7e2c73693c4
Author: Fathi Boudra <fabo at debian.org>
Date: Mon Jun 20 11:34:57 2011 +0300
Use wrap-and-sort
---
debian/control | 42 +++++++++++++++++++++++++-----------------
debian/copyright | 14 +++++++-------
2 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/debian/control b/debian/control
index 6668603..8d7f564 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,9 @@ Section: libs
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Fathi Boudra <fabo at debian.org>
-Build-Depends: debhelper (>= 7.4.15), libqt4-dev (>= 4:4.7.0), qt4-dev-tools (>= 4:4.7.0)
+Build-Depends: debhelper (>= 7.4.15),
+ libqt4-dev (>= 4:4.7.0),
+ qt4-dev-tools (>= 4:4.7.0)
Standards-Version: 3.9.1
Homepage: http://labs.trolltech.com/blogs/category/qtmessaging/
Vcs-Git: git://git.debian.org/pkg-kde/qmf.git
@@ -12,10 +14,11 @@ Vcs-Browser: http://git.debian.org/?p=pkg-kde/qmf.git;a=summary
Package: qmf-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libqmfmessageserver1 (= ${binary:Version}),
- libqmfutil1 (= ${binary:Version}),
- libqmfclient1 (= ${binary:Version})
+Depends: libqmfclient1 (= ${binary:Version}),
+ libqmfmessageserver1 (= ${binary:Version}),
+ libqmfutil1 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Suggests: qmf-doc
Description: Qt Messaging Framework (QMF) - development files
The Qt Messaging Framework, QMF, consists of a C++ library and daemon server
@@ -27,9 +30,10 @@ Description: Qt Messaging Framework (QMF) - development files
Package: libqmfmessageserver1
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql-sqlite
-Conflicts: qmf-messageserver, libmessageserver1
-Replaces: qmf-messageserver (<< 1.0~2010w23-2), libmessageserver1 (<< 1.0~2010w39-1)
+Depends: libqt4-sql-sqlite, ${misc:Depends}, ${shlibs:Depends}
+Conflicts: libmessageserver1, qmf-messageserver
+Replaces: libmessageserver1 (<< 1.0~2010w39-1),
+ qmf-messageserver (<< 1.0~2010w23-2)
Description: Qt Messaging Framework (QMF) message server support library
The Qt Messaging Framework, QMF, consists of a C++ library and daemon server
process that can be used to build email clients, and more generally software
@@ -49,7 +53,7 @@ Description: Qt Messaging Framework (QMF) message server support library
Package: libqmfutil1
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Qt Messaging Framework (QMF) messaging client utility library
The Qt Messaging Framework, QMF, consists of a C++ library and daemon server
process that can be used to build email clients, and more generally software
@@ -60,7 +64,7 @@ Description: Qt Messaging Framework (QMF) messaging client utility library
Package: libqmfclient1
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Conflicts: libqtopiamail1
Replaces: libqtopiamail1 (<< 1.0~2010w39-1)
Description: Qt Messaging Framework (QMF) client library
@@ -81,7 +85,7 @@ Description: Qt Messaging Framework (QMF) client library
Package: qmf-examples
Architecture: any
Section: x11
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Qt Messaging Framework (QMF) examples
The Qt Messaging Framework, QMF, consists of a C++ library and daemon server
process that can be used to build email clients, and more generally software
@@ -96,7 +100,7 @@ Description: Qt Messaging Framework (QMF) examples
Package: qmf-tests
Architecture: any
Section: utils
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Qt Messaging Framework (QMF) tests
The Qt Messaging Framework, QMF, consists of a C++ library and daemon server
process that can be used to build email clients, and more generally software
@@ -108,10 +112,11 @@ Package: qmf-dbg
Priority: extra
Architecture: any
Section: debug
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libqmfmessageserver1 (= ${binary:Version}),
- libqmfutil1 (= ${binary:Version}),
- libqmfclient1 (= ${binary:Version})
+Depends: libqmfclient1 (= ${binary:Version}),
+ libqmfmessageserver1 (= ${binary:Version}),
+ libqmfutil1 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Qt Messaging Framework (QMF) - debugging symbols
The Qt Messaging Framework, QMF, consists of a C++ library and daemon server
process that can be used to build email clients, and more generally software
@@ -140,7 +145,10 @@ Package: qmf-doc-html
Architecture: all
Section: doc
Depends: ${misc:Depends}
-Suggests: w3m | www-browser | x-www-browser, qmf-dev, qt4-dev-tools, qt4-doc-html
+Suggests: qmf-dev,
+ qt4-dev-tools,
+ qt4-doc-html,
+ w3m | www-browser | x-www-browser
Description: Qt Messaging Framework (QMF) - HTML documentation
The Qt Messaging Framework, QMF, consists of a C++ library and daemon server
process that can be used to build email clients, and more generally software
diff --git a/debian/copyright b/debian/copyright
index 22d3f05..e810d04 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -54,7 +54,7 @@ As an additional permission to the GNU Lesser General Public License version
2.1, the object code form of a "work that uses the Library" may incorporate
material from a header file that is part of the Library. You may distribute
such object code under terms of your choice, provided that:
- (i) the header files of the Library have not been modified; and
+ (i) the header files of the Library have not been modified; and
(ii) the incorporated material is limited to numerical parameters, data
structure layouts, accessors, macros, inline functions and
templates; and
@@ -182,16 +182,16 @@ Copyright for benchmarks/tst_messageserver/3rdparty/valgrind_p.h:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- 2. The origin of this software must not be misrepresented; you must
- not claim that you wrote the original software. If you use this
- software in a product, an acknowledgment in the product
+ 2. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product
documentation would be appreciated but is not required.
3. Altered source versions must be plainly marked as such, and must
not be misrepresented as being the original software.
- 4. The name of the author may not be used to endorse or promote
- products derived from this software without specific prior written
+ 4. The name of the author may not be used to endorse or promote
+ products derived from this software without specific prior written
permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
@@ -213,4 +213,4 @@ Copyright for benchmarks/tst_messageserver/3rdparty/valgrind_p.h:
the terms of the GNU General Public License, version 2. See the
COPYING file in the source distribution for details.
- ----------------------------------------------------------------
+ ----------------------------------------------------------------
--
Qt Messaging Framework (QMF) packaging
More information about the pkg-kde-commits
mailing list