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

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 0ed71c98cb902abe2bcf9bfda6ca0d6afcdce476
Author: Fathi Boudra <fabo at debian.org>
Date:   Sat Jul 24 16:20:35 2010 +0300

    Add missing conflicts and upload to experimental
---
 debian/changelog |    2 +-
 debian/control   |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0304158..8d80bbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qmf (1.0~2010w23-2) UNRELEASED; urgency=low
+qmf (1.0~2010w23-2) experimental; urgency=low
 
   * Add qmf-tests package and ship the tests.
     Disable 01_disable_test_benchmarks.diff patch.
diff --git a/debian/control b/debian/control
index 2a73608..ab267ec 100644
--- a/debian/control
+++ b/debian/control
@@ -28,6 +28,7 @@ Description: Qt Messaging Framework (QMF) - development files
 Package: libmessageserver1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: qmf-messageserver
 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

-- 
Qt Messaging Framework (QMF) packaging