[SCM] Qt Messaging Framework (QMF) packaging branch, master, updated. debian/1.0-2010w23-1-2-gf51e7dc
Fathi Boudra
fabo at alioth.debian.org
Sat Jul 24 12:18:27 UTC 2010
The following commit has been merged in the master branch:
commit f51e7dc29444a5db03fd15f5303283729a6930c1
Author: Fathi Boudra <fabo at debian.org>
Date: Sat Jul 24 15:17:21 2010 +0300
Add 04_no_rpath_tests_benchmarks.diff to remove rpath from tests and benchmarks.
---
debian/changelog | 2 +
debian/patches/01_disable_test_benchmarks.diff | 22 -------------
debian/patches/02_fix_installation_paths.diff | 35 ++++++++++++++++++++++
debian/patches/03_add_qch_documentation.diff | 2 +-
debian/patches/04_no_rpath_tests_benchmarks.diff | 25 +++++++++++++++
debian/patches/series | 2 +-
debian/qmf-tests.install | 2 -
7 files changed, 64 insertions(+), 26 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 98cf34e..0304158 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qmf (1.0~2010w23-2) UNRELEASED; urgency=low
* Add qmf-tests package and ship the tests.
Disable 01_disable_test_benchmarks.diff patch.
+ * Add 04_no_rpath_tests_benchmarks.diff to remove rpath from tests and
+ benchmarks.
* Merge qmf-messageserver and libmessageserver1 packages.
It doesn't make sense to ship them separately.
diff --git a/debian/patches/01_disable_test_benchmarks.diff b/debian/patches/01_disable_test_benchmarks.diff
deleted file mode 100644
index d12db98..0000000
--- a/debian/patches/01_disable_test_benchmarks.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: disable tests and benchmarks
-Author: Fathi Boudra <fabo at debian.org>
-
---- a/qmf.pro
-+++ b/qmf.pro
-@@ -9,7 +9,6 @@ SUBDIRS = src/libraries/qtopiamail \
- src/plugins/messageservices/qtopiamailfile \
- src/plugins/contentmanagers/qtopiamailfile \
- src/tools/messageserver \
-- tests \
- examples/qtmail/libs/qmfutil \
- examples/qtmail/app \
- examples/qtmail/plugins/viewers/generic \
-@@ -17,7 +16,7 @@ SUBDIRS = src/libraries/qtopiamail \
- examples/messagingaccounts \
-
- # disable benchmark test on mac until ported
--!macx {
-+win32 {
- SUBDIRS += benchmarks
- }
-
diff --git a/debian/patches/02_fix_installation_paths.diff b/debian/patches/02_fix_installation_paths.diff
index 07eeb01..4a553fc 100644
--- a/debian/patches/02_fix_installation_paths.diff
+++ b/debian/patches/02_fix_installation_paths.diff
@@ -162,3 +162,38 @@ Author: Fathi Boudra <fabo at debian.org>
DEPENDPATH += .
+--- a/benchmarks/tst_messageserver/tst_messageserver.pro
++++ b/benchmarks/tst_messageserver/tst_messageserver.pro
+@@ -3,7 +3,7 @@ CONFIG += qtestlib unittest
+ CONFIG += messageserver qtopiamail
+
+ TARGET = tst_messageserver
+-target.path += $$QMF_INSTALL_ROOT/tests
++target.path += $$[QT_INSTALL_LIBS]/qmf/tests
+
+ BASE=../../
+ include($$BASE/common.pri)
+--- a/tests/tests.pri
++++ b/tests/tests.pri
+@@ -2,7 +2,7 @@ macx {
+ QMAKE_MACOSX_DEPLOYMENT_TARGET=10.5
+ }
+
+-target.path+=$$QMF_INSTALL_ROOT/tests
++target.path+=$$[QT_INSTALL_LIBS]/qmf/tests
+
+ QTOPIAMAIL=../../src/libraries/qtopiamail
+ 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
+
+ DEFINES += SRCDIR=\\\"$$_PRO_FILE_PWD_\\\"
+
+-testdata.path = $$QMF_INSTALL_ROOT/tests/testdata
+-testdata.files = testdata/
++testdata.path = $$[QT_INSTALL_LIBS]/qmf/tests/testdata
++testdata.files = testdata/*
+
+ INSTALLS += testdata
+
diff --git a/debian/patches/03_add_qch_documentation.diff b/debian/patches/03_add_qch_documentation.diff
index 9412c16..b850dd6 100644
--- a/debian/patches/03_add_qch_documentation.diff
+++ b/debian/patches/03_add_qch_documentation.diff
@@ -3,7 +3,7 @@ Author: Fathi Boudra <fabo at debian.org>
--- a/qmf.pro
+++ b/qmf.pro
-@@ -20,11 +20,9 @@ win32 {
+@@ -21,11 +21,9 @@ SUBDIRS = src/libraries/qtopiamail \
SUBDIRS += benchmarks
}
diff --git a/debian/patches/04_no_rpath_tests_benchmarks.diff b/debian/patches/04_no_rpath_tests_benchmarks.diff
new file mode 100644
index 0000000..325a584
--- /dev/null
+++ b/debian/patches/04_no_rpath_tests_benchmarks.diff
@@ -0,0 +1,25 @@
+Description: Remove rpath from tests and benchmarks
+Author: Fathi Boudra <fabo at debian.org>
+
+--- a/tests/tests.pri
++++ b/tests/tests.pri
+@@ -9,7 +9,6 @@ DEPENDPATH += .
+ INCLUDEPATH += . $$QTOPIAMAIL $$QTOPIAMAIL/support
+ LIBS += -L$$QTOPIAMAIL/build
+ macx:LIBS += -F$$QTOPIAMAIL/build
+-QMAKE_LFLAGS += -Wl,-rpath,$$QTOPIAMAIL
+
+ include(../common.pri)
+
+--- a/benchmarks/tst_messageserver/tst_messageserver.pro
++++ b/benchmarks/tst_messageserver/tst_messageserver.pro
+@@ -29,9 +29,6 @@ INCLUDEPATH += . 3rdparty $$BASE/src/lib
+ LIBS += -L$$BASE/src/libraries/messageserver/build \
+ -L$$BASE/src/libraries/qtopiamail/build
+
+-QMAKE_LFLAGS += -Wl,-rpath,$$BASE/src/libraries/qtopiamail \
+- -Wl,-rpath,$$BASE/src/libraries/messageserver
+-
+ HEADERS += benchmarkcontext.h \
+ qscopedconnection.h \
+ testfsusage.h \
diff --git a/debian/patches/series b/debian/patches/series
index c30085e..141f890 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-#01_disable_test_benchmarks.diff
02_fix_installation_paths.diff
03_add_qch_documentation.diff
+04_no_rpath.diff
diff --git a/debian/qmf-tests.install b/debian/qmf-tests.install
index a738236..032b63e 100644
--- a/debian/qmf-tests.install
+++ b/debian/qmf-tests.install
@@ -46,11 +46,9 @@ 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
--
Qt Messaging Framework (QMF) packaging
More information about the pkg-kde-commits
mailing list