[SCM] Qt Messaging Framework (QMF) packaging branch, master, updated. debian/1.0-2010w23-2-3-g01988e8
Fathi Boudra
fabo at alioth.debian.org
Mon Sep 6 04:41:59 UTC 2010
The following commit has been merged in the master branch:
commit 01988e8ad959d0282fbff4a07db2de2c2c6ebbe3
Author: Fathi Boudra <fabo at debian.org>
Date: Mon Sep 6 07:41:42 2010 +0300
Update debian/control:
- bump libqt4-dev and qt4-dev-tools build dependencies to 4:4.7.0~rc1.
- bump Standards-Version to 3.9.1 (no changes needed).
Update 02_fix_installation_paths.diff patch.
Remove 03_add_qch_documentation.diff - merged upstream.
Update installed files.
---
debian/changelog | 15 +++-
debian/control | 4 +-
debian/patches/02_fix_installation_paths.diff | 49 +++++++++---
debian/patches/03_add_qch_documentation.diff | 99 -------------------------
debian/patches/series | 1 -
debian/qmf-dev.install | 2 +
debian/qmf-examples.install | 1 +
7 files changed, 52 insertions(+), 119 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d71d658..4c134d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,20 @@
-qmf (1.0~2010w23-3) UNRELEASED; urgency=low
+qmf (1.0~2010w35-1) experimental; urgency=low
+
+ * New upstream release.
[ Fathi Boudra ]
- * Update debian/control: add libqt4-sql-sqlite missing dependency to
- libmessageserver1 package.
+ * Update debian/control:
+ - add libqt4-sql-sqlite missing dependency to libmessageserver1 package.
+ - bump libqt4-dev and qt4-dev-tools build dependencies to 4:4.7.0~rc1.
+ - bump Standards-Version to 3.9.1 (no changes needed).
+ * Update 02_fix_installation_paths.diff patch.
+ * Remove 03_add_qch_documentation.diff - merged upstream.
+ * Update installed files.
[ Modestas Vainius ]
* Fix debian/control Vcs fields to point to the new location.
- -- Fathi Boudra <fabo at debian.org> Tue, 24 Aug 2010 10:34:27 +0300
+ -- Fathi Boudra <fabo at debian.org> Sun, 05 Sep 2010 18:13:46 +0300
qmf (1.0~2010w23-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index d337a12..1cc3847 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: libs
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Fathi Boudra <fabo at debian.org>
-Build-Depends: debhelper (>= 7.4.15), libqt4-dev (>= 4:4.6.0), qt4-dev-tools (>= 4:4.6.0)
-Standards-Version: 3.9.0
+Build-Depends: debhelper (>= 7.4.15), libqt4-dev (>= 4:4.7.0~rc1), qt4-dev-tools (>= 4:4.7.0~rc1)
+Standards-Version: 3.9.1
Homepage: http://labs.trolltech.com/blogs/category/qtmessaging/
Vcs-Git: git://git.debian.org/pkg-kde/qmf.git
Vcs-Browser: http://git.debian.org/?p=pkg-kde/qmf.git;a=summary
diff --git a/debian/patches/02_fix_installation_paths.diff b/debian/patches/02_fix_installation_paths.diff
index 4a553fc..8bf9d61 100644
--- a/debian/patches/02_fix_installation_paths.diff
+++ b/debian/patches/02_fix_installation_paths.diff
@@ -26,9 +26,9 @@ Author: Fathi Boudra <fabo at debian.org>
contains(QT_CONFIG,webkit){
--- a/src/plugins/contentmanagers/qtopiamailfile/qtopiamailfile.pro
+++ b/src/plugins/contentmanagers/qtopiamailfile/qtopiamailfile.pro
-@@ -2,7 +2,7 @@ TEMPLATE = lib
- TARGET = qtopiamailfilemanager
+@@ -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
@@ -44,7 +44,7 @@ Author: Fathi Boudra <fabo at debian.org>
-target.path += $$QMF_INSTALL_ROOT/plugins/messageservices
+target.path += $$[QT_INSTALL_LIBS]/qmf/plugins/messageservices
- QT += network
+ QT = core network
--- a/src/plugins/messageservices/pop/pop.pro
+++ b/src/plugins/messageservices/pop/pop.pro
@@ -55,7 +55,7 @@ Author: Fathi Boudra <fabo at debian.org>
-target.path = $$QMF_INSTALL_ROOT/plugins/messageservices
+target.path = $$[QT_INSTALL_LIBS]/qmf/plugins/messageservices
- QT += network
+ QT = core network
--- a/src/plugins/messageservices/qtopiamailfile/qtopiamailfile.pro
+++ b/src/plugins/messageservices/qtopiamailfile/qtopiamailfile.pro
@@ -66,7 +66,7 @@ Author: Fathi Boudra <fabo at debian.org>
-target.path += $$QMF_INSTALL_ROOT/plugins/messageservices
+target.path += $$[QT_INSTALL_LIBS]/qmf/plugins/messageservices
- QT += network
+ QT = core network
--- a/src/plugins/messageservices/smtp/smtp.pro
+++ b/src/plugins/messageservices/smtp/smtp.pro
@@ -77,7 +77,7 @@ Author: Fathi Boudra <fabo at debian.org>
-target.path += $$QMF_INSTALL_ROOT/plugins/messageservices
+target.path += $$[QT_INSTALL_LIBS]/qmf/plugins/messageservices
- QT += network
+ QT = core network
--- a/examples/messagingaccounts/messagingaccounts.pro
+++ b/examples/messagingaccounts/messagingaccounts.pro
@@ -120,9 +120,9 @@ Author: Fathi Boudra <fabo at debian.org>
-target.path += $$QMF_INSTALL_ROOT/lib
+target.path += $$[QT_INSTALL_LIBS]
- QT *= network
-
-@@ -36,7 +36,7 @@ SOURCES += qmailauthenticator.cpp \
+ QT = core network
+ !contains(DEFINES,QMF_NO_MESSAGE_SERVICE_EDITOR):QT += gui
+@@ -37,7 +37,7 @@ SOURCES += qmailauthenticator.cpp \
qmailstoreaccountfilter.cpp \
qmailtransport.cpp
@@ -142,7 +142,7 @@ Author: Fathi Boudra <fabo at debian.org>
DEFINES += QT_BUILD_QCOP_LIB QTOPIAMAIL_INTERNAL
win32: {
-@@ -150,7 +150,7 @@ TRANSLATIONS += libqtopiamail-ar.ts \
+@@ -155,7 +155,7 @@ TRANSLATIONS += libqtopiamail-ar.ts \
libqtopiamail-zh_CN.ts \
libqtopiamail-zh_TW.ts
@@ -153,9 +153,9 @@ Author: Fathi Boudra <fabo at debian.org>
INSTALLS += header_files
--- a/src/tools/messageserver/messageserver.pro
+++ b/src/tools/messageserver/messageserver.pro
-@@ -2,7 +2,7 @@ TEMPLATE = app
- TARGET = messageserver
- CONFIG += messageserver qtopiamail
+@@ -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]
@@ -197,3 +197,26 @@ Author: Fathi Boudra <fabo at debian.org>
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/03_add_qch_documentation.diff b/debian/patches/03_add_qch_documentation.diff
deleted file mode 100644
index b850dd6..0000000
--- a/debian/patches/03_add_qch_documentation.diff
+++ /dev/null
@@ -1,99 +0,0 @@
-Description: add qt compressed help (qch) documentation
-Author: Fathi Boudra <fabo at debian.org>
-
---- a/qmf.pro
-+++ b/qmf.pro
-@@ -21,11 +21,9 @@ SUBDIRS = src/libraries/qtopiamail \
- SUBDIRS += benchmarks
- }
-
-+defineReplace(targetPath) {
-+ return($$replace(1, /, $$QMAKE_DIR_SEP))
-+}
-
--# Custom target 'doc' to generate documentation
--dox.target = doc
--dox.commands = qdoc3 $$_PRO_FILE_PWD_/doc/src/qmf.qdocconf
--dox.depends =
--
--QMAKE_EXTRA_TARGETS += dox
-+include(doc/src/doc.pri)
-
---- /dev/null
-+++ b/doc/src/doc.pri
-@@ -0,0 +1,49 @@
-+QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc3)
-+HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator)
-+
-+equals(QMAKE_DIR_SEP, /) { # unix, mingw+msys
-+ QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$QDOC_BIN
-+} else:win32-g++* { # just mingw
-+ # The lack of spaces in front of the && is necessary!
-+ QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& $$QDOC_BIN
-+} else { # nmake
-+ QDOC = set SRCDIR=$$PWD $$escape_expand(\\n\\t) \
-+ set OUTDIR=$$OUT_PWD/doc/html $$escape_expand(\\n\\t) \
-+ $$QDOC_BIN
-+}
-+
-+QHP_FILE = $$OUT_PWD/doc/html/qmf.qhp
-+QCH_FILE = $$OUT_PWD/doc/html/qmf.qch
-+
-+HELP_DEP_FILES = $$PWD/index.qdoc \
-+ $$PWD/messageserver.qdoc \
-+ $$PWD/messaging.qdoc \
-+ $$PWD/qtmail.qdoc \
-+ $$PWD/qtopiamail.qdoc \
-+ $$PWD/qtopiamail_messageserver.qdoc \
-+ $$PWD/qtopiamail_qmfutil.qdoc \
-+ $$PWD/qmf.qdocconf \
-+
-+html_docs.commands = $$QDOC $$PWD/qmf.qdocconf
-+html_docs.depends += $$HELP_DEP_FILES
-+html_docs.files = $$QHP_FILE
-+
-+qch_docs.commands = $$HELPGENERATOR -o \"$$QCH_FILE\" $$QHP_FILE
-+qch_docs.depends += html_docs
-+qch_docs.files = $$QCH_FILE
-+
-+unix:!macx {
-+ qch_docs.path = $$[QT_INSTALL_PREFIX]/share/qmf/doc
-+ qch_docs.CONFIG += no_check_exist
-+ INSTALLS += qch_docs
-+}
-+
-+docs.depends = qch_docs
-+QMAKE_EXTRA_TARGETS += html_docs qch_docs docs
-+
-+OTHER_FILES = $$HELP_DEP_FILES \
-+ $$PWD/api/api-pages.qdoc \
-+ $$PWD/api/classhierarchy.qdoc \
-+ $$PWD/api/groups.qdoc \
-+ $$PWD/examples/messageviewer.qdoc \
-+ $$PWD/examples/messagenavigator.qdoc
---- a/doc/src/qmf.qdocconf
-+++ b/doc/src/qmf.qdocconf
-@@ -1,5 +1,21 @@
--project = Qtopia Messaging Framework
--description = QMF Reference Documentation
-+project = Qt Messaging Framework
-+description = "Qt Messaging Framework Reference Documentation"
-+
-+qhp.projects = QMF
-+qhp.QMF.file = qmf.qhp
-+qhp.QMF.namespace = com.nokia.qmf.100
-+qhp.QMF.virtualFolder = doc
-+qhp.QMF.indexTitle = Qt Messaging Framework
-+qhp.QMF.filterAttributes = qmf 1.0.0
-+qhp.QMF.customFilters.QMF.name = Qt Messaging Framework 1.0.0
-+qhp.QMF.customFilters.QMF.filterAttributes = qmf 1.0.0
-+qhp.QMF.indexRoot =
-+qhp.QMF.extraFiles = \
-+ classic.css \
-+ images/codeless.png \
-+ images/messagenavigator-example.png \
-+ images/messageviewer-example.png \
-+ images/qtlogo.png
-
- imagedirs = images
-
diff --git a/debian/patches/series b/debian/patches/series
index c612408..dfb8c48 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
02_fix_installation_paths.diff
-03_add_qch_documentation.diff
04_no_rpath_tests_benchmarks.diff
diff --git a/debian/qmf-dev.install b/debian/qmf-dev.install
index c1013e2..e0b53ce 100644
--- a/debian/qmf-dev.install
+++ b/debian/qmf-dev.install
@@ -9,10 +9,12 @@ 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
diff --git a/debian/qmf-examples.install b/debian/qmf-examples.install
index 2e4fa2b..cff013b 100644
--- a/debian/qmf-examples.install
+++ b/debian/qmf-examples.install
@@ -1,4 +1,5 @@
usr/bin/messagingaccounts
usr/bin/qtmail
+usr/bin/serverobserver
usr/lib/qmf/plugins/composers/libemailcomposer.so
usr/lib/qmf/plugins/viewers/libgenericviewer.so
--
Qt Messaging Framework (QMF) packaging
More information about the pkg-kde-commits
mailing list