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

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 8663e4fd41f136e9168100763411e182a480f67a
Author: Fathi Boudra <fabo at debian.org>
Date:   Sun Mar 6 11:54:18 2011 +0200

    Refresh patches for 1.0.7~2011w08
---
 debian/patches/fix_docs_installation.patch    |    4 +-
 debian/patches/fix_plugins_installation.patch |    2 +-
 debian/patches/fix_tests_installation.patch   |   28 +++++++++++-------------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/debian/patches/fix_docs_installation.patch b/debian/patches/fix_docs_installation.patch
index 9bfff69..b8c7ebf 100644
--- a/debian/patches/fix_docs_installation.patch
+++ b/debian/patches/fix_docs_installation.patch
@@ -7,7 +7,7 @@ Author: Fathi Boudra <fabo at debian.org>
  
  unix:!macx {
 -    qch_docs.path = $$QMF_INSTALL_ROOT/share/qmf/doc
-+    qch_docs.path = $$QMF_INSTALL_ROOT/share/qmf/doc/qch
++    qch_docs.path = $$QMF_INSTALL_ROOT/share/doc/qmf/qch
      qch_docs.CONFIG += no_check_exist
  }
  
@@ -18,6 +18,6 @@ Author: Fathi Boudra <fabo at debian.org>
 +
 +# TEMP: deploying existing html files
 +html.files = $$_PRO_FILE_PWD_/doc/html/*
-+html.path = $$QMF_INSTALL_ROOT/share/qmf/doc/html
++html.path = $$QMF_INSTALL_ROOT/share/doc/qmf/html
 +html.CONFIG += no_check_exist
 +INSTALLS += html qch_docs
diff --git a/debian/patches/fix_plugins_installation.patch b/debian/patches/fix_plugins_installation.patch
index 151c3dc..4cc76eb 100644
--- a/debian/patches/fix_plugins_installation.patch
+++ b/debian/patches/fix_plugins_installation.patch
@@ -9,7 +9,7 @@ Author: Fathi Boudra <fabo at debian.org>
 -target.path += $$QMF_INSTALL_ROOT/plugins/messageservices
 +target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/messageservices
  
- QT = core network
+ QT += core network
  
 --- a/src/plugins/messageservices/pop/pop.pro
 +++ b/src/plugins/messageservices/pop/pop.pro
diff --git a/debian/patches/fix_tests_installation.patch b/debian/patches/fix_tests_installation.patch
index 17c843a..3716b50 100644
--- a/debian/patches/fix_tests_installation.patch
+++ b/debian/patches/fix_tests_installation.patch
@@ -1,5 +1,16 @@
 Description: fix tests installation path
 Author: Fathi Boudra <fabo at debian.org>
+--- a/benchmarks/tst_messageserver/tst_messageserver.pro
++++ b/benchmarks/tst_messageserver/tst_messageserver.pro
+@@ -3,7 +3,7 @@ CONFIG += qtestlib unittest
+ CONFIG += qmfmessageserver qmfclient
+ 
+ TARGET = tst_messageserver 
+-target.path += $$QMF_INSTALL_ROOT/tests
++target.path += $$QMF_INSTALL_ROOT/lib/qmf/tests
+ 
+ BASE=../../
+ include($$BASE/common.pri)
 --- a/tests/tests.pri
 +++ b/tests/tests.pri
 @@ -2,7 +2,7 @@ macx {
@@ -13,25 +24,12 @@ Author: Fathi Boudra <fabo at debian.org>
  DEPENDPATH += .
 --- a/tests/tst_python_email/tst_python_email.pro
 +++ b/tests/tst_python_email/tst_python_email.pro
-@@ -4,8 +4,8 @@ TARGET = tst_python_email
+@@ -4,7 +4,7 @@ TARGET = tst_python_email
  
  DEFINES += SRCDIR=\\\"$$_PRO_FILE_PWD_\\\"
  
 -testdata.path = $$QMF_INSTALL_ROOT/tests/testdata 
--testdata.files = testdata/
 +testdata.path = $$QMF_INSTALL_ROOT/lib/qmf/tests/testdata
-+testdata.files = testdata/*
+ testdata.files = testdata/
  
  INSTALLS += testdata
- 
---- a/benchmarks/tst_messageserver/tst_messageserver.pro
-+++ b/benchmarks/tst_messageserver/tst_messageserver.pro
-@@ -3,7 +3,7 @@ CONFIG += qtestlib unittest
- CONFIG += qmfmessageserver qmfclient
- 
- TARGET = tst_messageserver 
--target.path += $$QMF_INSTALL_ROOT/tests
-+target.path += $$QMF_INSTALL_ROOT/lib/qmf/tests
- 
- BASE=../../
- include($$BASE/common.pri)

-- 
Qt Messaging Framework (QMF) packaging