[SCM] Qt Messaging Framework (QMF) packaging branch, master, updated. debian/1.0-2010w23-1-1-g2dc47cd

Fathi Boudra fabo at alioth.debian.org
Sat Jul 24 11:06:24 UTC 2010 

The following commit has been merged in the master branch:
commit 2dc47cd6cfa7e243143b8479f797f05b58c9154b
Author: Fathi Boudra <fabo at debian.org>
Date:   Sat Jul 24 14:04:21 2010 +0300

    Add qmf-tests package and ship the tests.
    Disable 01_disable_test_benchmarks.diff patch.
    
    Merge qmf-messageserver and libmessageserver1 packages.
    It doesn't make sense to ship them separately.
---
 debian/changelog                 |    9 +++++
 debian/control                   |   48 +++++++++++++++--------------
 debian/libmessageserver1.install |    5 +++
 debian/patches/series            |    2 +-
 debian/qmf-messageserver.install |    5 ---
 debian/qmf-tests.install         |   62 ++++++++++++++++++++++++++++++++++++++
 6 files changed, 102 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2716580..98cf34e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+qmf (1.0~2010w23-2) UNRELEASED; urgency=low
+
+  * Add qmf-tests package and ship the tests.
+    Disable 01_disable_test_benchmarks.diff patch.
+  * Merge qmf-messageserver and libmessageserver1 packages.
+    It doesn't make sense to ship them separately.
+
+ -- Fathi Boudra <fabo at debian.org>  Sat, 24 Jul 2010 13:48:14 +0300
+
 qmf (1.0~2010w23-1) experimental; urgency=low
 
   * Initial release. (Closes: #587747)
diff --git a/debian/control b/debian/control
index a677df0..2a73608 100644
--- a/debian/control
+++ b/debian/control
@@ -28,13 +28,23 @@ Description: Qt Messaging Framework (QMF) - development files
 Package: libmessageserver1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: 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
  that interacts with email and mail servers.
  .
- This package contains the message server support library. It provides
- assistance in developing GUI clients that access messaging data.
+ The MessageServer application is a daemon, designed to run continuously while
+ providing services to client applications. It provides messaging transport
+ functionality, communicating with external servers on behalf of Messaging
+ Framework client applications. New types of messaging (such as Instant
+ Messages or video messages) can be handled by the server application without
+ modification to existing client applications.
+ .
+ This package contains:
+  * the message server support library. It provides assistance in developing
+    GUI clients that access messaging data.
+  * a server application supporting multiple messaging transport mechanisms.
 
 Package: libqmfutil1
 Architecture: any
@@ -65,25 +75,6 @@ Description: Qt Messaging Framework (QMF) client library
  This package contains a library for developing applications that work with
  messages.
 
-Package: qmf-messageserver
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Section: utils
-Description: Qt Messaging Framework (QMF) message server
- 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
- that interacts with email and mail servers.
- .
- The MessageServer application is a daemon, designed to run continuously while
- providing services to client applications. It provides messaging transport
- functionality, communicating with external servers on behalf of Messaging
- Framework client applications. New types of messaging (such as Instant
- Messages or video messages) can be handled by the server application without
- modification to existing client applications.
- .
- This package contains a server application supporting multiple messaging
- transport mechanisms.
-
 Package: qmf-examples
 Architecture: any
 Section: x11
@@ -99,6 +90,17 @@ Description: Qt Messaging Framework (QMF) examples
  This package contains an example client application supporting common
  messaging functionality.
 
+Package: qmf-tests
+Architecture: any
+Section: utils
+Depends: ${shlibs:Depends}, ${misc: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
+ that interacts with email and mail servers.
+ .
+ This package contains the tests for the Qt Messaging Framework (QMF).
+
 Package: qmf-dbg
 Priority: extra
 Architecture: any
@@ -112,8 +114,8 @@ Description: Qt Messaging Framework (QMF) - debugging symbols
  process that can be used to build email clients, and more generally software
  that interacts with email and mail servers.
  .
- This package contains the debugging symbols for the Qt Messaging Framework
- (QMF) libraries.
+ This package contains the debugging symbols for Qt Messaging Framework (QMF)
+ libraries.
 
 Package: qmf-doc
 Architecture: all
diff --git a/debian/libmessageserver1.install b/debian/libmessageserver1.install
index 3b71cae..0ac091e 100644
--- a/debian/libmessageserver1.install
+++ b/debian/libmessageserver1.install
@@ -1 +1,6 @@
+usr/bin/messageserver
 usr/lib/libmessageserver.so.*
+usr/lib/qmf/plugins/messageservices/libimap.so
+usr/lib/qmf/plugins/messageservices/libpop.so
+usr/lib/qmf/plugins/messageservices/libqtopiamailfile.so
+usr/lib/qmf/plugins/messageservices/libsmtp.so
diff --git a/debian/patches/series b/debian/patches/series
index 50e5835..c30085e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-01_disable_test_benchmarks.diff
+#01_disable_test_benchmarks.diff
 02_fix_installation_paths.diff
 03_add_qch_documentation.diff
diff --git a/debian/qmf-messageserver.install b/debian/qmf-messageserver.install
deleted file mode 100644
index 56b9400..0000000
--- a/debian/qmf-messageserver.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/bin/messageserver
-usr/lib/qmf/plugins/messageservices/libimap.so
-usr/lib/qmf/plugins/messageservices/libpop.so
-usr/lib/qmf/plugins/messageservices/libqtopiamailfile.so
-usr/lib/qmf/plugins/messageservices/libsmtp.so
diff --git a/debian/qmf-tests.install b/debian/qmf-tests.install
new file mode 100644
index 0000000..a738236
--- /dev/null
+++ b/debian/qmf-tests.install
@@ -0,0 +1,62 @@
+usr/lib/qmf/tests/testdata/PyBanner048.gif
+usr/lib/qmf/tests/testdata/audiotest.au
+usr/lib/qmf/tests/testdata/msg_01.txt
+usr/lib/qmf/tests/testdata/msg_01a.txt
+usr/lib/qmf/tests/testdata/msg_02.txt
+usr/lib/qmf/tests/testdata/msg_03.txt
+usr/lib/qmf/tests/testdata/msg_04.txt
+usr/lib/qmf/tests/testdata/msg_05.txt
+usr/lib/qmf/tests/testdata/msg_06.txt
+usr/lib/qmf/tests/testdata/msg_07.txt
+usr/lib/qmf/tests/testdata/msg_08.txt
+usr/lib/qmf/tests/testdata/msg_09.txt
+usr/lib/qmf/tests/testdata/msg_10.txt
+usr/lib/qmf/tests/testdata/msg_11.txt
+usr/lib/qmf/tests/testdata/msg_12.txt
+usr/lib/qmf/tests/testdata/msg_12a.txt
+usr/lib/qmf/tests/testdata/msg_13.txt
+usr/lib/qmf/tests/testdata/msg_14.txt
+usr/lib/qmf/tests/testdata/msg_15.txt
+usr/lib/qmf/tests/testdata/msg_16.txt
+usr/lib/qmf/tests/testdata/msg_17.txt
+usr/lib/qmf/tests/testdata/msg_18.txt
+usr/lib/qmf/tests/testdata/msg_19.txt
+usr/lib/qmf/tests/testdata/msg_20.txt
+usr/lib/qmf/tests/testdata/msg_21.txt
+usr/lib/qmf/tests/testdata/msg_22.txt
+usr/lib/qmf/tests/testdata/msg_23.txt
+usr/lib/qmf/tests/testdata/msg_24.txt
+usr/lib/qmf/tests/testdata/msg_25.txt
+usr/lib/qmf/tests/testdata/msg_26.txt
+usr/lib/qmf/tests/testdata/msg_27.txt
+usr/lib/qmf/tests/testdata/msg_28.txt
+usr/lib/qmf/tests/testdata/msg_29.txt
+usr/lib/qmf/tests/testdata/msg_30.txt
+usr/lib/qmf/tests/testdata/msg_31.txt
+usr/lib/qmf/tests/testdata/msg_32.txt
+usr/lib/qmf/tests/testdata/msg_33.txt
+usr/lib/qmf/tests/testdata/msg_34.txt
+usr/lib/qmf/tests/testdata/msg_35.txt
+usr/lib/qmf/tests/testdata/msg_36.txt
+usr/lib/qmf/tests/testdata/msg_37.txt
+usr/lib/qmf/tests/testdata/msg_38.txt
+usr/lib/qmf/tests/testdata/msg_39.txt
+usr/lib/qmf/tests/testdata/msg_40.txt
+usr/lib/qmf/tests/testdata/msg_41.txt
+usr/lib/qmf/tests/testdata/msg_42.txt
+usr/lib/qmf/tests/testdata/msg_43.txt
+usr/lib/qmf/tests/testdata/msg_44.txt
+usr/lib/qmf/tests/tests.xml
+usr/lib/qmf/tests/tst_longstring
+usr/lib/qmf/tests/tst_messageserver
+usr/lib/qmf/tests/tst_python_email
+usr/lib/qmf/tests/tst_qlogsystem
+usr/lib/qmf/tests/tst_qmailaddress
+usr/lib/qmf/tests/tst_qmailcodec
+usr/lib/qmf/tests/tst_qmailmessage
+usr/lib/qmf/tests/tst_qmailmessagebody
+usr/lib/qmf/tests/tst_qmailmessageheader
+usr/lib/qmf/tests/tst_qmailmessagepart
+usr/lib/qmf/tests/tst_qmailstore
+usr/lib/qmf/tests/tst_qmailstorekeys
+usr/lib/qmf/tests/tst_qprivateimplementation

-- 
Qt Messaging Framework (QMF) packaging

More information about the pkg-kde-commits mailing list