[SCM] Qt Messaging Framework (QMF) packaging branch, master, updated. debian/1.0.7-2011w08-1-5-g32103e4

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 8b0075e0a63ccc3cc0ae9096782a24d2fda59506
Author: Fathi Boudra <fabo at debian.org>
Date:   Mon Jun 20 11:36:48 2011 +0300

    Refresh patches and update tests installation patch
---
 debian/patches/fix_docs_installation.patch     |    4 +++
 debian/patches/fix_plugins_installation.patch  |   11 ++++++++
 debian/patches/fix_tests_installation.patch    |   31 ++++++++++++++++++-----
 debian/patches/no_rpath_tests_benchmarks.patch |   21 ++++++++++-----
 4 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/debian/patches/fix_docs_installation.patch b/debian/patches/fix_docs_installation.patch
index b8c7ebf..6a4d874 100644
--- a/debian/patches/fix_docs_installation.patch
+++ b/debian/patches/fix_docs_installation.patch
@@ -1,5 +1,9 @@
 Description: fix doc installation paths and install qch doc
 Author: Fathi Boudra <fabo at debian.org>
+---
+ doc/src/doc.pri |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
 --- a/doc/src/doc.pri
 +++ b/doc/src/doc.pri
 @@ -33,7 +33,7 @@ qch_docs.depends += html_docs
diff --git a/debian/patches/fix_plugins_installation.patch b/debian/patches/fix_plugins_installation.patch
index 4cc76eb..dfa9810 100644
--- a/debian/patches/fix_plugins_installation.patch
+++ b/debian/patches/fix_plugins_installation.patch
@@ -1,5 +1,16 @@
 Description: fix plugins installation path
 Author: Fathi Boudra <fabo at debian.org>
+---
+ examples/listfilterplugin/listfilterplugin.pro                      |    2 +-
+ examples/qtmail/plugins/composers/email/email.pro                   |    2 +-
+ examples/qtmail/plugins/viewers/generic/generic.pro                 |    2 +-
+ src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro |    2 +-
+ src/plugins/messageservices/imap/imap.pro                           |    2 +-
+ src/plugins/messageservices/pop/pop.pro                             |    2 +-
+ src/plugins/messageservices/qmfsettings/qmfsettings.pro             |    2 +-
+ src/plugins/messageservices/smtp/smtp.pro                           |    2 +-
+ 8 files changed, 8 insertions(+), 8 deletions(-)
+
 --- a/src/plugins/messageservices/imap/imap.pro
 +++ b/src/plugins/messageservices/imap/imap.pro
 @@ -2,7 +2,7 @@ TEMPLATE = lib
diff --git a/debian/patches/fix_tests_installation.patch b/debian/patches/fix_tests_installation.patch
index 91c9e0d..6af1b06 100644
--- a/debian/patches/fix_tests_installation.patch
+++ b/debian/patches/fix_tests_installation.patch
@@ -1,5 +1,12 @@
 Description: fix tests installation path
 Author: Fathi Boudra <fabo at debian.org>
+---
+ benchmarks/tst_messageserver/tst_messageserver.pro |    2 +-
+ tests/tests.pri                                    |    2 +-
+ tests/tests.pro                                    |    2 +-
+ tests/tst_python_email/tst_python_email.pro        |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
 --- a/benchmarks/tst_messageserver/tst_messageserver.pro
 +++ b/benchmarks/tst_messageserver/tst_messageserver.pro
 @@ -3,7 +3,7 @@ CONFIG += qtestlib unittest
@@ -13,7 +20,7 @@ Author: Fathi Boudra <fabo at debian.org>
  include($$BASE/common.pri)
 --- a/tests/tests.pri
 +++ b/tests/tests.pri
-@@ -2,7 +2,7 @@ macx {
+@@ -4,7 +4,7 @@ macx {
      QMAKE_MACOSX_DEPLOYMENT_TARGET=10.5
  }
  
@@ -24,12 +31,22 @@ 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,7 +4,7 @@ TARGET = tst_python_email
+@@ -5,7 +5,7 @@ TARGET = tst_python_email
+ !symbian {
+     DEFINES += SRCDIR=\\"$$_PRO_FILE_PWD_\\"
  
- DEFINES += SRCDIR=\\"$$_PRO_FILE_PWD_\\"
+-    testdata.path = $$QMF_INSTALL_ROOT/tests/testdata
++    testdata.path = $$QMF_INSTALL_ROOT/lib/qmf/tests/testdata
+     testdata.files = testdata/*
  
--testdata.path = $$QMF_INSTALL_ROOT/tests/testdata 
-+testdata.path = $$QMF_INSTALL_ROOT/lib/qmf/tests
- testdata.files = testdata/
+     INSTALLS += testdata
+--- a/tests/tests.pro
++++ b/tests/tests.pro
+@@ -31,6 +31,6 @@ CONFIG += unittest
  
- INSTALLS += testdata
+ # Install test file description
+ test_description.files = tests.xml
+-test_description.path  = $$QMF_INSTALL_ROOT/tests
++test_description.path  = $$QMF_INSTALL_ROOT/lib/qmf/tests
+ 
+ INSTALLS += test_description
diff --git a/debian/patches/no_rpath_tests_benchmarks.patch b/debian/patches/no_rpath_tests_benchmarks.patch
index 7b7ed23..ab80d9d 100644
--- a/debian/patches/no_rpath_tests_benchmarks.patch
+++ b/debian/patches/no_rpath_tests_benchmarks.patch
@@ -1,24 +1,31 @@
 Description: Remove rpath from tests and benchmarks
 Author: Fathi Boudra <fabo at debian.org>
+---
+ benchmarks/tst_messageserver/tst_messageserver.pro |    5 -----
+ tests/tests.pri                                    |    1 -
+ 2 files changed, 6 deletions(-)
+
 --- a/benchmarks/tst_messageserver/tst_messageserver.pro
 +++ b/benchmarks/tst_messageserver/tst_messageserver.pro
-@@ -29,9 +29,6 @@ INCLUDEPATH += . 3rdparty $$BASE/src/lib
+@@ -29,11 +29,6 @@ INCLUDEPATH += . 3rdparty $$BASE/src/lib
  LIBS += -L$$BASE/src/libraries/qmfmessageserver/build \
          -L$$BASE/src/libraries/qmfclient/build
  
--QMAKE_LFLAGS += -Wl,-rpath,$$BASE/src/libraries/qmfclient \
--    -Wl,-rpath,$$BASE/src/libraries/qmfmessageserver
+-!symbian {
+-    QMAKE_LFLAGS += -Wl,-rpath,$$BASE/src/libraries/qmfclient \
+-        -Wl,-rpath,$$BASE/src/libraries/qmfmessageserver
+-}
 -
  HEADERS += benchmarkcontext.h \
             qscopedconnection.h \
             testfsusage.h \
 --- a/tests/tests.pri
 +++ b/tests/tests.pri
-@@ -9,7 +9,6 @@ DEPENDPATH += .
+@@ -11,7 +11,6 @@ DEPENDPATH += .
  INCLUDEPATH += . $$QMFPATH $$QMFPATH/support
  LIBS += -L$$QMFPATH/build
  macx:LIBS += -F$$QMFPATH/build
--QMAKE_LFLAGS += -Wl,-rpath,$$QMFPATH
- 
- include(../common.pri)
+-!symbian:QMAKE_LFLAGS += -Wl,-rpath,$$QMFPATH
  
+ symbian {
+     TARGET.CAPABILITY = ReadUserData WriteUserData ReadDeviceData WriteDeviceData

-- 
Qt Messaging Framework (QMF) packaging