[SCM] Qt Messaging Framework (QMF) packaging branch, master, updated. debian/1.0-2010w35-1-1-gd1e2c8d
Fathi Boudra
fabo at alioth.debian.org
Sat Oct 9 16:20:49 UTC 2010
The following commit has been merged in the master branch:
commit d1e2c8dc7932abab2cb29de147951048b2d243eb
Author: Fathi Boudra <fabo at debian.org>
Date: Sat Oct 9 19:15:52 2010 +0300
New upstream release - several renaming changes have been made to QMF.
These changes are unfortunately source and binary incompatible.
Update patches to apply against the new release.
Update debian/control:
- Adjust packages name
libmessageserver1 -> libqmfmessageserver1
libqtopiamail1 -> libqmfclient1
- Add qmf-doc-html package.
Update debian/rules:
- pass QMF_INSTALL_ROOT configure option.
- install qmf.sh to set QMF_PLUGINS environment variable.
- install messageserver.desktop to autostart messageserver.
Update installed files.
---
debian/changelog | 18 ++
debian/control | 40 +++-
debian/libqmfclient1.install | 2 +
...erver1.install => libqmfmessageserver1.install} | 6 +-
debian/libqtopiamail1.install | 2 -
debian/messageserver.desktop | 5 +
debian/patches/02_fix_installation_paths.diff | 222 --------------------
debian/patches/fix_docs_installation.patch | 23 ++
debian/patches/fix_plugins_installation.patch | 90 ++++++++
debian/patches/fix_tests_installation.patch | 37 ++++
...hmarks.diff => no_rpath_tests_benchmarks.patch} | 29 ++--
debian/patches/series | 6 +-
debian/qmf-dev.install | 96 +++++----
debian/qmf-doc-html.install | 1 +
debian/qmf-doc.install | 2 +-
debian/qmf.sh | 2 +
debian/rules | 12 +-
17 files changed, 290 insertions(+), 303 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4c134d0..7e4aff1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+qmf (1.0~2010w39-1) experimental; urgency=low
+
+ * New upstream release - several renaming changes have been made to QMF.
+ These changes are unfortunately source and binary incompatible.
+ * Update patches to apply against the new release.
+ * Update debian/control:
+ - Adjust packages name
+ libmessageserver1 -> libqmfmessageserver1
+ libqtopiamail1 -> libqmfclient1
+ - Add qmf-doc-html package.
+ * Update debian/rules:
+ - pass QMF_INSTALL_ROOT configure option.
+ - install qmf.sh to set QMF_PLUGINS environment variable.
+ - install messageserver.desktop to autostart messageserver.
+ * Update installed files.
+
+ -- Fathi Boudra <fabo at debian.org> Sat, 09 Oct 2010 09:47:08 +0300
+
qmf (1.0~2010w35-1) experimental; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 1cc3847..0ddf848 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,9 @@ Package: qmf-dev
Section: libdevel
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- libmessageserver1 (= ${binary:Version}),
+ libqmfmessageserver1 (= ${binary:Version}),
libqmfutil1 (= ${binary:Version}),
- libqtopiamail1 (= ${binary:Version})
+ libqmfclient1 (= ${binary:Version})
Suggests: qmf-doc
Description: Qt Messaging Framework (QMF) - development files
The Qt Messaging Framework, QMF, consists of a C++ library and daemon server
@@ -25,11 +25,11 @@ Description: Qt Messaging Framework (QMF) - development files
This package contains the development files needed to build Qt applications
using Qt Messaging Framework libraries.
-Package: libmessageserver1
+Package: libqmfmessageserver1
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql-sqlite
-Conflicts: qmf-messageserver
-Replaces: qmf-messageserver (<< 1.0~2010w23-2)
+Conflicts: qmf-messageserver, libmessageserver1
+Replaces: qmf-messageserver (<< 1.0~2010w23-2), libmessageserver1 (<< 1.0~2010w39-1)
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
@@ -58,9 +58,11 @@ Description: Qt Messaging Framework (QMF) messaging client utility library
This package contains the messaging client utility library. It provides
assistance in developing plugins for the Message Server daemon.
-Package: libqtopiamail1
+Package: libqmfclient1
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libqtopiamail1
+Replaces: libqtopiamail1 (<< 1.0~2010w39-1)
Description: Qt Messaging Framework (QMF) client 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
@@ -107,9 +109,9 @@ Priority: extra
Architecture: any
Section: debug
Depends: ${shlibs:Depends}, ${misc:Depends},
- libmessageserver1 (= ${binary:Version}),
+ libqmfmessageserver1 (= ${binary:Version}),
libqmfutil1 (= ${binary:Version}),
- libqtopiamail1 (= ${binary:Version})
+ libqmfclient1 (= ${binary:Version})
Description: Qt Messaging Framework (QMF) - debugging symbols
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
@@ -122,10 +124,28 @@ Package: qmf-doc
Architecture: all
Section: doc
Depends: ${misc:Depends}
-Suggests: qt4-dev-tools, qt4-doc
-Description: Qt Messaging Framework (QMF) - documentation
+Suggests: qmf-dev, qt4-dev-tools, qt4-doc
+Description: Qt Messaging Framework (QMF) - QCH documentation
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 documentation for Qt Messaging Framework (QMF).
+ .
+ The documentation is provided in the new help format and manpage format;
+ the new help format version can be viewed in conjunction with the Qt Assistant
+ found in the qt4-dev-tools package.
+
+Package: qmf-doc-html
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: w3m | www-browser | x-www-browser, qmf-dev, qt4-dev-tools, qt4-doc-html
+Description: Qt Messaging Framework (QMF) - HTML documentation
+ 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 documentation for Qt Messaging Framework (QMF).
+ .
+ The documentation is provided in HTML format.
diff --git a/debian/libqmfclient1.install b/debian/libqmfclient1.install
new file mode 100644
index 0000000..c1f08d4
--- /dev/null
+++ b/debian/libqmfclient1.install
@@ -0,0 +1,2 @@
+usr/lib/libqmfclient.so.*
+usr/lib/qmf/plugins/contentmanagers/libqmfstoragemanager.so
diff --git a/debian/libmessageserver1.install b/debian/libqmfmessageserver1.install
similarity index 52%
rename from debian/libmessageserver1.install
rename to debian/libqmfmessageserver1.install
index 0ac091e..81d1cb2 100644
--- a/debian/libmessageserver1.install
+++ b/debian/libqmfmessageserver1.install
@@ -1,6 +1,8 @@
+etc/profile.d/qmf.sh
+etc/xdg/autostart/messageserver.desktop
usr/bin/messageserver
-usr/lib/libmessageserver.so.*
+usr/lib/libqmfmessageserver.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/libqmfsettings.so
usr/lib/qmf/plugins/messageservices/libsmtp.so
diff --git a/debian/libqtopiamail1.install b/debian/libqtopiamail1.install
deleted file mode 100644
index ff89534..0000000
--- a/debian/libqtopiamail1.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libqtopiamail.so.*
-usr/lib/qmf/plugins/contentmanagers/libqtopiamailfilemanager.so
diff --git a/debian/messageserver.desktop b/debian/messageserver.desktop
new file mode 100644
index 0000000..e4c718c
--- /dev/null
+++ b/debian/messageserver.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Application
+Name=Qt Messaging Framework (QMF) message server
+Exec=/usr/bin/messageserver
+Terminal=false
diff --git a/debian/patches/02_fix_installation_paths.diff b/debian/patches/02_fix_installation_paths.diff
deleted file mode 100644
index 8bf9d61..0000000
--- a/debian/patches/02_fix_installation_paths.diff
+++ /dev/null
@@ -1,222 +0,0 @@
-Description: fix installation paths
- QMF_INSTALL_ROOT is qmf specific and should be avoided
-Author: Fathi Boudra <fabo at debian.org>
-
---- a/examples/qtmail/plugins/composers/email/email.pro
-+++ b/examples/qtmail/plugins/composers/email/email.pro
-@@ -2,7 +2,7 @@ TEMPLATE = lib
- TARGET = emailcomposer
- CONFIG += qtopiamail qmfutil plugin
-
--target.path += $$QMF_INSTALL_ROOT/plugins/composers
-+target.path += $$[QT_INSTALL_LIBS]/qmf/plugins/composers
-
- DEFINES += PLUGIN_INTERNAL
-
---- a/examples/qtmail/plugins/viewers/generic/generic.pro
-+++ b/examples/qtmail/plugins/viewers/generic/generic.pro
-@@ -2,7 +2,7 @@ TEMPLATE = lib
- TARGET = genericviewer
- CONFIG += qtopiamail qmfutil plugin
-
--target.path += $$QMF_INSTALL_ROOT/plugins/viewers
-+target.path += $$[QT_INSTALL_LIBS]/qmf/plugins/viewers
-
- # Use webkit to render mail if available
- contains(QT_CONFIG,webkit){
---- a/src/plugins/contentmanagers/qtopiamailfile/qtopiamailfile.pro
-+++ b/src/plugins/contentmanagers/qtopiamailfile/qtopiamailfile.pro
-@@ -3,7 +3,7 @@ TARGET = qtopiamailfilemanager
- CONFIG += qtopiamail plugin
- QT = core
-
--target.path += $$QMF_INSTALL_ROOT/plugins/contentmanagers
-+target.path += $$[QT_INSTALL_LIBS]/qmf/plugins/contentmanagers
-
- DEFINES += PLUGIN_INTERNAL
-
---- a/src/plugins/messageservices/imap/imap.pro
-+++ b/src/plugins/messageservices/imap/imap.pro
-@@ -2,7 +2,7 @@ TEMPLATE = lib
- TARGET = imap
- CONFIG += messageserver qtopiamail plugin
-
--target.path += $$QMF_INSTALL_ROOT/plugins/messageservices
-+target.path += $$[QT_INSTALL_LIBS]/qmf/plugins/messageservices
-
- QT = core network
-
---- a/src/plugins/messageservices/pop/pop.pro
-+++ b/src/plugins/messageservices/pop/pop.pro
-@@ -2,7 +2,7 @@ TEMPLATE = lib
- TARGET = pop
- CONFIG += qtopiamail messageserver plugin
-
--target.path = $$QMF_INSTALL_ROOT/plugins/messageservices
-+target.path = $$[QT_INSTALL_LIBS]/qmf/plugins/messageservices
-
- QT = core network
-
---- a/src/plugins/messageservices/qtopiamailfile/qtopiamailfile.pro
-+++ b/src/plugins/messageservices/qtopiamailfile/qtopiamailfile.pro
-@@ -2,7 +2,7 @@ TEMPLATE = lib
- TARGET = qtopiamailfile
- CONFIG += qtopiamail messageserver plugin
-
--target.path += $$QMF_INSTALL_ROOT/plugins/messageservices
-+target.path += $$[QT_INSTALL_LIBS]/qmf/plugins/messageservices
-
- QT = core network
-
---- a/src/plugins/messageservices/smtp/smtp.pro
-+++ b/src/plugins/messageservices/smtp/smtp.pro
-@@ -3,7 +3,7 @@ TARGET = smtp
-
- CONFIG += qtopiamail messageserver plugin
-
--target.path += $$QMF_INSTALL_ROOT/plugins/messageservices
-+target.path += $$[QT_INSTALL_LIBS]/qmf/plugins/messageservices
-
- QT = core network
-
---- a/examples/messagingaccounts/messagingaccounts.pro
-+++ b/examples/messagingaccounts/messagingaccounts.pro
-@@ -1,6 +1,6 @@
- TEMPLATE = app
- TARGET = messagingaccounts
--target.path += $$QMF_INSTALL_ROOT/bin
-+target.path += $$[QT_INSTALL_BINS]
- CONFIG += qtopiamail messageserver
-
- DEPENDPATH += .
---- a/examples/qtmail/app/app.pro
-+++ b/examples/qtmail/app/app.pro
-@@ -1,7 +1,7 @@
- TEMPLATE = app
- TARGET = qtmail
- CONFIG += qmfutil qtopiamail messageserver
--target.path += $$QMF_INSTALL_ROOT/bin
-+target.path += $$[QT_INSTALL_BINS]
-
- DEPENDPATH += .
-
---- a/examples/qtmail/libs/qmfutil/qmfutil.pro
-+++ b/examples/qtmail/libs/qmfutil/qmfutil.pro
-@@ -3,7 +3,7 @@ CONFIG += warn_on
- CONFIG += qtopiamail
- TARGET = qmfutil
-
--target.path += $$QMF_INSTALL_ROOT/lib
-+target.path += $$[QT_INSTALL_LIBS]
-
- DEFINES += QMFUTIL_INTERNAL
- symbian: {
---- a/src/libraries/messageserver/messageserver.pro
-+++ b/src/libraries/messageserver/messageserver.pro
-@@ -3,7 +3,7 @@ CONFIG += warn_on
- CONFIG += qtopiamail
- TARGET = messageserver
-
--target.path += $$QMF_INSTALL_ROOT/lib
-+target.path += $$[QT_INSTALL_LIBS]
-
- QT = core network
- !contains(DEFINES,QMF_NO_MESSAGE_SERVICE_EDITOR):QT += gui
-@@ -37,7 +37,7 @@ SOURCES += qmailauthenticator.cpp \
- qmailstoreaccountfilter.cpp \
- qmailtransport.cpp
-
--header_files.path=$$QMF_INSTALL_ROOT/include/messageserver
-+header_files.path=$$[QT_INSTALL_PREFIX]/include/messageserver
- header_files.files=$$PUBLIC_HEADERS
-
- INSTALLS += header_files
---- a/src/libraries/qtopiamail/qtopiamail.pro
-+++ b/src/libraries/qtopiamail/qtopiamail.pro
-@@ -2,7 +2,7 @@ TEMPLATE = lib
- CONFIG += warn_on
- TARGET = qtopiamail
-
--target.path += $$QMF_INSTALL_ROOT/lib
-+target.path += $$[QT_INSTALL_LIBS]
-
- DEFINES += QT_BUILD_QCOP_LIB QTOPIAMAIL_INTERNAL
- win32: {
-@@ -155,7 +155,7 @@ TRANSLATIONS += libqtopiamail-ar.ts \
- libqtopiamail-zh_CN.ts \
- libqtopiamail-zh_TW.ts
-
--header_files.path=$$QMF_INSTALL_ROOT/include/qtopiamail
-+header_files.path=$$[QT_INSTALL_PREFIX]/include/qtopiamail
- header_files.files=$$PUBLIC_HEADERS
-
- INSTALLS += header_files
---- a/src/tools/messageserver/messageserver.pro
-+++ b/src/tools/messageserver/messageserver.pro
-@@ -4,7 +4,7 @@ CONFIG += messageserver qtopiamail
- QT = core
- !contains(DEFINES,QMF_NO_MESSAGE_SERVICE_EDITOR):QT += gui
-
--target.path += $$QMF_INSTALL_ROOT/bin
-+target.path += $$[QT_INSTALL_BINS]
-
- 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
-
---- a/doc/src/doc.pri
-+++ b/doc/src/doc.pri
-@@ -33,8 +33,9 @@ qch_docs.depends += html_docs
- qch_docs.files = $$QCH_FILE
-
- unix:!macx {
-- qch_docs.path = $$QMF_INSTALL_ROOT/share/qmf/doc
-+ qch_docs.path = $$[QT_INSTALL_PREFIX]/share/qmf/doc
- qch_docs.CONFIG += no_check_exist
-+ INSTALLS += qch_docs
- }
-
- docs.depends = qch_docs
---- a/examples/serverobserver/serverobserver.pro
-+++ b/examples/serverobserver/serverobserver.pro
-@@ -1,6 +1,6 @@
- TEMPLATE = app
- TARGET = serverobserver
--target.path += $$QMF_INSTALL_ROOT/bin
-+target.path += $$[QT_INSTALL_BINS]
- CONFIG += qtopiamail messageserver
-
- DEPENDPATH += .
diff --git a/debian/patches/fix_docs_installation.patch b/debian/patches/fix_docs_installation.patch
new file mode 100644
index 0000000..9bfff69
--- /dev/null
+++ b/debian/patches/fix_docs_installation.patch
@@ -0,0 +1,23 @@
+Description: fix doc installation paths and install qch doc
+Author: Fathi Boudra <fabo at debian.org>
+--- a/doc/src/doc.pri
++++ b/doc/src/doc.pri
+@@ -33,7 +33,7 @@ qch_docs.depends += html_docs
+ qch_docs.files = $$QCH_FILE
+
+ unix:!macx {
+- qch_docs.path = $$QMF_INSTALL_ROOT/share/qmf/doc
++ qch_docs.path = $$QMF_INSTALL_ROOT/share/qmf/doc/qch
+ qch_docs.CONFIG += no_check_exist
+ }
+
+@@ -46,3 +46,9 @@ OTHER_FILES = $$HELP_DEP_FILES \
+ $$_PRO_FILE_PWD_/doc/src/api/groups.qdoc \
+ $$_PRO_FILE_PWD_/doc/src/examples/messageviewer.qdoc \
+ $$_PRO_FILE_PWD_/doc/src/examples/messagenavigator.qdoc
++
++# TEMP: deploying existing html files
++html.files = $$_PRO_FILE_PWD_/doc/html/*
++html.path = $$QMF_INSTALL_ROOT/share/qmf/doc/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
new file mode 100644
index 0000000..151c3dc
--- /dev/null
+++ b/debian/patches/fix_plugins_installation.patch
@@ -0,0 +1,90 @@
+Description: fix plugins installation path
+Author: Fathi Boudra <fabo at debian.org>
+--- a/src/plugins/messageservices/imap/imap.pro
++++ b/src/plugins/messageservices/imap/imap.pro
+@@ -2,7 +2,7 @@ TEMPLATE = lib
+ TARGET = imap
+ CONFIG += qmfmessageserver qmfclient plugin
+
+-target.path += $$QMF_INSTALL_ROOT/plugins/messageservices
++target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/messageservices
+
+ QT = core network
+
+--- a/src/plugins/messageservices/pop/pop.pro
++++ b/src/plugins/messageservices/pop/pop.pro
+@@ -2,7 +2,7 @@ TEMPLATE = lib
+ TARGET = pop
+ CONFIG += qmfclient qmfmessageserver plugin
+
+-target.path = $$QMF_INSTALL_ROOT/plugins/messageservices
++target.path = $$QMF_INSTALL_ROOT/lib/qmf/plugins/messageservices
+
+ QT = core network
+
+--- a/src/plugins/messageservices/qmfsettings/qmfsettings.pro
++++ b/src/plugins/messageservices/qmfsettings/qmfsettings.pro
+@@ -2,7 +2,7 @@ TEMPLATE = lib
+ TARGET = qmfsettings
+ CONFIG += qmfclient qmfmessageserver plugin
+
+-target.path += $$QMF_INSTALL_ROOT/plugins/messageservices
++target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/messageservices
+
+ QT = core network
+
+--- a/src/plugins/messageservices/smtp/smtp.pro
++++ b/src/plugins/messageservices/smtp/smtp.pro
+@@ -3,7 +3,7 @@ TARGET = smtp
+
+ CONFIG += qmfclient qmfmessageserver plugin
+
+-target.path += $$QMF_INSTALL_ROOT/plugins/messageservices
++target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/messageservices
+
+ QT = core network
+
+--- a/examples/listfilterplugin/listfilterplugin.pro
++++ b/examples/listfilterplugin/listfilterplugin.pro
+@@ -3,7 +3,7 @@ TARGET = listfilterplugin
+ CONFIG += qmfclient plugin
+ QT = core
+
+-target.path += $$QMF_INSTALL_ROOT/plugins/contentmanagers
++target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/contentmanagers
+
+ DEFINES += PLUGIN_INTERNAL
+
+--- a/examples/qtmail/plugins/composers/email/email.pro
++++ b/examples/qtmail/plugins/composers/email/email.pro
+@@ -2,7 +2,7 @@ TEMPLATE = lib
+ TARGET = emailcomposer
+ CONFIG += qmfclient qmfutil plugin
+
+-target.path += $$QMF_INSTALL_ROOT/plugins/composers
++target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/composers
+
+ DEFINES += PLUGIN_INTERNAL
+
+--- a/examples/qtmail/plugins/viewers/generic/generic.pro
++++ b/examples/qtmail/plugins/viewers/generic/generic.pro
+@@ -2,7 +2,7 @@ TEMPLATE = lib
+ TARGET = genericviewer
+ CONFIG += qmfclient qmfutil plugin
+
+-target.path += $$QMF_INSTALL_ROOT/plugins/viewers
++target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/viewers
+
+ # Use webkit to render mail if available
+ contains(QT_CONFIG,webkit){
+--- a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro
++++ b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro
+@@ -3,7 +3,7 @@ TARGET = qmfstoragemanager
+ CONFIG += qmfclient plugin
+ QT = core
+
+-target.path += $$QMF_INSTALL_ROOT/plugins/contentmanagers
++target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/contentmanagers
+
+ DEFINES += PLUGIN_INTERNAL
+
diff --git a/debian/patches/fix_tests_installation.patch b/debian/patches/fix_tests_installation.patch
new file mode 100644
index 0000000..17c843a
--- /dev/null
+++ b/debian/patches/fix_tests_installation.patch
@@ -0,0 +1,37 @@
+Description: fix tests installation path
+Author: Fathi Boudra <fabo at debian.org>
+--- 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+=$$QMF_INSTALL_ROOT/lib/qmf/tests
+
+ QMFPATH=../../src/libraries/qmfclient
+ 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 = $$QMF_INSTALL_ROOT/lib/qmf/tests/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)
diff --git a/debian/patches/04_no_rpath_tests_benchmarks.diff b/debian/patches/no_rpath_tests_benchmarks.patch
similarity index 55%
rename from debian/patches/04_no_rpath_tests_benchmarks.diff
rename to debian/patches/no_rpath_tests_benchmarks.patch
index 325a584..7b7ed23 100644
--- a/debian/patches/04_no_rpath_tests_benchmarks.diff
+++ b/debian/patches/no_rpath_tests_benchmarks.patch
@@ -1,25 +1,24 @@
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
+ LIBS += -L$$BASE/src/libraries/qmfmessageserver/build \
+ -L$$BASE/src/libraries/qmfclient/build
--QMAKE_LFLAGS += -Wl,-rpath,$$BASE/src/libraries/qtopiamail \
-- -Wl,-rpath,$$BASE/src/libraries/messageserver
+-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 += .
+ INCLUDEPATH += . $$QMFPATH $$QMFPATH/support
+ LIBS += -L$$QMFPATH/build
+ macx:LIBS += -F$$QMFPATH/build
+-QMAKE_LFLAGS += -Wl,-rpath,$$QMFPATH
+
+ include(../common.pri)
+
diff --git a/debian/patches/series b/debian/patches/series
index dfb8c48..230d9dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
-02_fix_installation_paths.diff
-04_no_rpath_tests_benchmarks.diff
+fix_docs_installation.patch
+fix_plugins_installation.patch
+fix_tests_installation.patch
+no_rpath_tests_benchmarks.patch
diff --git a/debian/qmf-dev.install b/debian/qmf-dev.install
index e0b53ce..5478fb5 100644
--- a/debian/qmf-dev.install
+++ b/debian/qmf-dev.install
@@ -1,47 +1,51 @@
-usr/include/messageserver/qmailauthenticator.h
-usr/include/messageserver/qmailmessageclassifier.h
-usr/include/messageserver/qmailmessageservice.h
-usr/include/messageserver/qmailserviceconfiguration.h
-usr/include/messageserver/qmailstoreaccountfilter.h
-usr/include/messageserver/qmailtransport.h
-usr/include/qtopiamail/qmailaccount.h
-usr/include/qtopiamail/qmailaccountconfiguration.h
-usr/include/qtopiamail/qmailaccountkey.h
-usr/include/qtopiamail/qmailaccountlistmodel.h
-usr/include/qtopiamail/qmailaccountsortkey.h
-usr/include/qtopiamail/qmailaction.h
-usr/include/qtopiamail/qmailaddress.h
-usr/include/qtopiamail/qmailcodec.h
-usr/include/qtopiamail/qmailcontentmanager.h
-usr/include/qtopiamail/qmaildatacomparator.h
-usr/include/qtopiamail/qmaildisconnected.h
-usr/include/qtopiamail/qmailfolder.h
-usr/include/qtopiamail/qmailfolderfwd.h
-usr/include/qtopiamail/qmailfolderkey.h
-usr/include/qtopiamail/qmailfoldersortkey.h
-usr/include/qtopiamail/qmailglobal.h
-usr/include/qtopiamail/qmailid.h
-usr/include/qtopiamail/qmailipc.h
-usr/include/qtopiamail/qmailkeyargument.h
-usr/include/qtopiamail/qmaillog.h
-usr/include/qtopiamail/qmailmessage.h
-usr/include/qtopiamail/qmailmessagefwd.h
-usr/include/qtopiamail/qmailmessagekey.h
-usr/include/qtopiamail/qmailmessagelistmodel.h
-usr/include/qtopiamail/qmailmessagemodelbase.h
-usr/include/qtopiamail/qmailmessageremovalrecord.h
-usr/include/qtopiamail/qmailmessageserver.h
-usr/include/qtopiamail/qmailmessageset.h
-usr/include/qtopiamail/qmailmessagesortkey.h
-usr/include/qtopiamail/qmailmessagethreadedmodel.h
-usr/include/qtopiamail/qmailnamespace.h
-usr/include/qtopiamail/qmailpluginmanager.h
-usr/include/qtopiamail/qmailserviceaction.h
-usr/include/qtopiamail/qmailsortkeyargument.h
-usr/include/qtopiamail/qmailstore.h
-usr/include/qtopiamail/qmailtimestamp.h
-usr/include/qtopiamail/qprivateimplementation.h
-usr/include/qtopiamail/qprivateimplementationdef.h
-usr/lib/libmessageserver.so
+usr/include/qmfmessageserver/qmailauthenticator.h
+usr/include/qmfmessageserver/qmailmessageclassifier.h
+usr/include/qmfmessageserver/qmailmessageservice.h
+usr/include/qmfmessageserver/qmailserviceconfiguration.h
+usr/include/qmfmessageserver/qmailstoreaccountfilter.h
+usr/include/qmfmessageserver/qmailtransport.h
+usr/include/qmfclient/qmailaccount.h
+usr/include/qmfclient/qmailaccountconfiguration.h
+usr/include/qmfclient/qmailaccountkey.h
+usr/include/qmfclient/qmailaccountlistmodel.h
+usr/include/qmfclient/qmailaccountsortkey.h
+usr/include/qmfclient/qmailaction.h
+usr/include/qmfclient/qmailaddress.h
+usr/include/qmfclient/qmailcodec.h
+usr/include/qmfclient/qmailcontentmanager.h
+usr/include/qmfclient/qmaildatacomparator.h
+usr/include/qmfclient/qmaildisconnected.h
+usr/include/qmfclient/qmailfolder.h
+usr/include/qmfclient/qmailfolderfwd.h
+usr/include/qmfclient/qmailfolderkey.h
+usr/include/qmfclient/qmailfoldersortkey.h
+usr/include/qmfclient/qmailglobal.h
+usr/include/qmfclient/qmailid.h
+usr/include/qmfclient/qmailipc.h
+usr/include/qmfclient/qmailkeyargument.h
+usr/include/qmfclient/qmaillog.h
+usr/include/qmfclient/qmailmessage.h
+usr/include/qmfclient/qmailmessagefwd.h
+usr/include/qmfclient/qmailmessagekey.h
+usr/include/qmfclient/qmailmessagelistmodel.h
+usr/include/qmfclient/qmailmessagemodelbase.h
+usr/include/qmfclient/qmailmessageremovalrecord.h
+usr/include/qmfclient/qmailmessageserver.h
+usr/include/qmfclient/qmailmessageset.h
+usr/include/qmfclient/qmailmessagesortkey.h
+usr/include/qmfclient/qmailmessagethreadedmodel.h
+usr/include/qmfclient/qmailnamespace.h
+usr/include/qmfclient/qmailpluginmanager.h
+usr/include/qmfclient/qmailserviceaction.h
+usr/include/qmfclient/qmailsortkeyargument.h
+usr/include/qmfclient/qmailstore.h
+usr/include/qmfclient/qmailtimestamp.h
+usr/include/qmfclient/qprivateimplementation.h
+usr/include/qmfclient/qprivateimplementationdef.h
+usr/lib/libqmfmessageserver.prl
+usr/lib/libqmfmessageserver.so
usr/lib/libqmfutil.so
-usr/lib/libqtopiamail.so
+usr/lib/libqmfclient.prl
+usr/lib/libqmfclient.so
+usr/lib/pkgconfig/qmfmessageserver.pc
+usr/lib/pkgconfig/qmfclient.pc
diff --git a/debian/qmf-doc-html.install b/debian/qmf-doc-html.install
new file mode 100644
index 0000000..4d25fd0
--- /dev/null
+++ b/debian/qmf-doc-html.install
@@ -0,0 +1 @@
+usr/share/qmf/doc/html/*
diff --git a/debian/qmf-doc.install b/debian/qmf-doc.install
index 5128d23..4b9db95 100644
--- a/debian/qmf-doc.install
+++ b/debian/qmf-doc.install
@@ -1 +1 @@
-usr/share/qmf/doc/qmf.qch
+usr/share/qmf/doc/qch/qmf.qch
diff --git a/debian/qmf.sh b/debian/qmf.sh
new file mode 100644
index 0000000..27008ca
--- /dev/null
+++ b/debian/qmf.sh
@@ -0,0 +1,2 @@
+# Set QMF_PLUGINS environment variable
+export QMF_PLUGINS=/usr/lib/qmf/plugins
diff --git a/debian/rules b/debian/rules
index 6ca39a6..c07de34 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,12 @@
%:
dh $@ --parallel --list-missing --dbg-package=qmf-dbg
-override_dh_auto_clean:
- dh_auto_clean
- rm -rf doc/html
+override_dh_auto_configure:
+ dh_auto_configure -- QMF_INSTALL_ROOT=/usr
+
+override_dh_auto_install:
+ install -D -p -m 0644 debian/qmf.sh \
+ debian/tmp/etc/profile.d/qmf.sh
+ install -D -p -m 0644 debian/messageserver.desktop \
+ debian/tmp/etc/xdg/autostart/messageserver.desktop
+ dh_auto_install
--
Qt Messaging Framework (QMF) packaging
More information about the pkg-kde-commits
mailing list