[SCM] Qt Mobility packaging branch, master, updated. fdf10c0ccbe49ed70a45fdc2165be0522a948865

Fathi Boudra fabo at alioth.debian.org
Fri Jul 2 08:18:36 UTC 2010 

The following commit has been merged in the master branch:
commit fdf10c0ccbe49ed70a45fdc2165be0522a948865
Author: Fathi Boudra <fabo at debian.org>
Date:   Fri Jul 2 11:16:14 2010 +0300

    Add Qt Messaging module to Qt Mobility
    Update debian/copyright
---
 debian/control                     |   13 ++++-
 debian/copyright                   |  103 +++++++++++++++++++++++++++++++++++-
 debian/libqtmessaging1.install     |    1 +
 debian/qtmobility-dev.install      |   39 ++++++++++++++
 debian/qtmobility-examples.install |    4 ++
 debian/rules                       |    6 ++-
 6 files changed, 163 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 7293c31..5b11384 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders: Fathi Boudra <fabo at debian.org>
 Build-Depends: debhelper (>= 7.4.15), pkg-kde-tools (>= 0.6.4),
  libqt4-dev (>= 4:4.7.0~beta1), libqt4-opengl-dev (>= 4:4.7.0~beta1),
  libasound2-dev, libbluetooth-dev, libpulse-dev, libx11-dev,
- network-manager-dev
+ network-manager-dev, qmf-dev
 Standards-Version: 3.9.0
 Section: libs
 Homepage: http://labs.trolltech.com/page/Projects/QtMobility
@@ -19,6 +19,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  libqtbearer1 (= ${binary:Version}),
  libqtcontacts1 (= ${binary:Version}),
  libqtlocation1 (= ${binary:Version}),
+ libqtmessaging1 (= ${binary:Version}),
 # libqtmultimediakit1 (= ${binary:Version}),
  libqtpublishsubscribe1 (= ${binary:Version}),
  libqtsensors1 (= ${binary:Version}),
@@ -57,6 +58,15 @@ Description: Qt Mobility Location module
  This package contains the Location API. It provides a library for distributing
  and receiving location data using arbitrary data sources.
 
+Package: libqtmessaging1
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Qt Mobility Messaging module
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+ .
+ This package contains the Messaging API. It is a common interface for handling
+ SMS, MMS, MIME Email and TNEF Email messages.
+
 #Package: libqtmultimediakit1
 #Architecture: any
 #Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -151,6 +161,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  libqtbearer1 (= ${binary:Version}),
  libqtcontacts1 (= ${binary:Version}),
  libqtlocation1 (= ${binary:Version}),
+ libqtmessaging1 (= ${binary:Version}),
 # libqtmultimediakit1 (= ${binary:Version}),
  libqtpublishsubscribe1 (= ${binary:Version}),
  libqtsensors1 (= ${binary:Version}),
diff --git a/debian/copyright b/debian/copyright
index 1ad7e64..10c2f7f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,7 +12,7 @@ Upstream Author:
 
 Copyright:
 
-    Copyright (C)  2010 Nokia Corporation and/or its subsidiary(-ies).
+    Copyright (C) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
     All rights reserved.
 
 License:
@@ -77,3 +77,104 @@ The Debian packaging is:
     Copyright (C) 2010 Fathi Boudra <fabo at debian.org>
 
 and is licensed under the LGPL version 2.1, see above.
+
+Copyright for examples:
+
+    You may use this file under the terms of the BSD license as follows:
+
+    "Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the
+      distribution.
+    * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+      the names of its contributors may be used to endorse or promote
+      products derived from this software without specific prior written
+      permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+
+The following examples are exceptions: 
+
+    - audiodevices
+    - audioinput
+    - audiooutputs
+    - declarative-sfw-dialer
+    - sensors/panorama
+    - videographicsitem
+    - videowidget
+
+and are licensed under the LGPL version 2.1, see above.
+
+Copyright for the following files:
+
+    tools/icheck/parser/src/libs/cplusplus/Macro.cpp
+    tools/icheck/parser/src/libs/cplusplus/Macro.h
+    tools/icheck/parser/src/libs/cplusplus/PreprocessorEnvironment.cpp
+    tools/icheck/parser/src/libs/cplusplus/PreprocessorEnvironment.h
+    tools/icheck/parser/src/libs/cplusplus/pp-cctype.h
+    tools/icheck/parser/src/libs/cplusplus/pp-engine.cpp
+    tools/icheck/parser/src/libs/cplusplus/pp-engine.h
+    tools/icheck/parser/src/libs/cplusplus/pp-macro-expander.h
+    tools/icheck/parser/src/libs/cplusplus/pp-scanner.cpp
+    tools/icheck/parser/src/libs/cplusplus/pp-scanner.h
+    tools/icheck/parser/src/libs/cplusplus/pp.h
+    tools/icheck/parser/src/shared/cplusplus/* excluding:
+    - tools/icheck/parser/src/shared/cplusplus/ASTClone.cpp
+    - tools/icheck/parser/src/shared/cplusplus/ASTMatch0.cpp
+    - tools/icheck/parser/src/shared/cplusplus/ASTMatcher.cpp
+    - tools/icheck/parser/src/shared/cplusplus/ASTMatcher.h
+    - tools/icheck/parser/src/shared/cplusplus/ASTVisit.cpp
+    - tools/icheck/parser/src/shared/cplusplus/Array.cpp
+    - tools/icheck/parser/src/shared/cplusplus/LiteralTable.cpp
+    - tools/icheck/parser/src/shared/cplusplus/ObjectiveCAtKeywords.cpp
+    - tools/icheck/parser/src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp
+    - tools/icheck/parser/src/shared/cplusplus/ObjectiveCTypeQualifiers.h
+    - tools/icheck/parser/src/shared/cplusplus/TypeMatcher.cpp
+    - tools/icheck/parser/src/shared/cplusplus/TypeMatcher.h
+
+    Copyright 2005-2008 Roberto Raggi <roberto at kdevelop.org>
+
+    Permission to use, copy, modify, distribute, and sell this software and its
+    documentation for any purpose is hereby granted without fee, provided that
+    the above copyright notice appear in all copies and that both that
+    copyright notice and this permission notice appear in supporting
+    documentation.
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+    KDEVELOP TEAM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+    AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Copyright for src/publishsubscribe/dlmalloc.c file:
+
+    This is a version (aka dlmalloc) of malloc/free/realloc written by
+    Doug Lea and released to the public domain.  Use, modify, and
+    redistribute this code without permission or acknowledgement in any
+    way you wish.  Send questions, comments, complaints, performance
+    data, etc to dl at cs.oswego.edu
+
+    VERSION 2.7.2 Sat Aug 17 09:07:30 2002  Doug Lea  (dl at gee)
+
+    Note: There may be an updated version of this malloc obtainable at
+          ftp://gee.cs.oswego.edu/pub/misc/malloc.c
+          Check before installing!
diff --git a/debian/libqtmessaging1.install b/debian/libqtmessaging1.install
new file mode 100644
index 0000000..25d636d
--- /dev/null
+++ b/debian/libqtmessaging1.install
@@ -0,0 +1 @@
+usr/lib/libQtMessaging.so.*
diff --git a/debian/qtmobility-dev.install b/debian/qtmobility-dev.install
index 0d70e90..2697b06 100644
--- a/debian/qtmobility-dev.install
+++ b/debian/qtmobility-dev.install
@@ -143,6 +143,43 @@ usr/include/QtLocation/qgeopositioninfosource.h
 usr/include/QtLocation/qgeosatelliteinfo.h
 usr/include/QtLocation/qgeosatelliteinfosource.h
 usr/include/QtLocation/qnmeapositioninfosource.h
+usr/include/QtMessaging/QMessage
+usr/include/QtMessaging/QMessageAccount
+usr/include/QtMessaging/QMessageAccountFilter
+usr/include/QtMessaging/QMessageAccountId
+usr/include/QtMessaging/QMessageAccountSortOrder
+usr/include/QtMessaging/QMessageAddress
+usr/include/QtMessaging/QMessageContentContainer
+usr/include/QtMessaging/QMessageContentContainerId
+usr/include/QtMessaging/QMessageFilter
+usr/include/QtMessaging/QMessageFolder
+usr/include/QtMessaging/QMessageFolderFilter
+usr/include/QtMessaging/QMessageFolderId
+usr/include/QtMessaging/QMessageFolderSortOrder
+usr/include/QtMessaging/QMessageId
+usr/include/QtMessaging/QMessageManager
+usr/include/QtMessaging/QMessageService
+usr/include/QtMessaging/QMessageSortOrder
+usr/include/QtMessaging/QMessageStore
+usr/include/QtMessaging/qmessage.h
+usr/include/QtMessaging/qmessageaccount.h
+usr/include/QtMessaging/qmessageaccountfilter.h
+usr/include/QtMessaging/qmessageaccountid.h
+usr/include/QtMessaging/qmessageaccountsortorder.h
+usr/include/QtMessaging/qmessageaddress.h
+usr/include/QtMessaging/qmessagecontentcontainer.h
+usr/include/QtMessaging/qmessagecontentcontainerid.h
+usr/include/QtMessaging/qmessagedatacomparator.h
+usr/include/QtMessaging/qmessagefilter.h
+usr/include/QtMessaging/qmessagefolder.h
+usr/include/QtMessaging/qmessagefolderfilter.h
+usr/include/QtMessaging/qmessagefolderid.h
+usr/include/QtMessaging/qmessagefoldersortorder.h
+usr/include/QtMessaging/qmessageglobal.h
+usr/include/QtMessaging/qmessageid.h
+usr/include/QtMessaging/qmessagemanager.h
+usr/include/QtMessaging/qmessageservice.h
+usr/include/QtMessaging/qmessagesortorder.h
 #usr/include/QtMultimediaKit/QAbstractAudioDeviceInfo
 #usr/include/QtMultimediaKit/QAbstractAudioInput
 #usr/include/QtMultimediaKit/QAbstractAudioOutput
@@ -348,6 +385,8 @@ usr/lib/libQtContacts.prl
 usr/lib/libQtContacts.so
 usr/lib/libQtLocation.prl
 usr/lib/libQtLocation.so
+usr/lib/libQtMessaging.prl
+usr/lib/libQtMessaging.so
 #usr/lib/libQtMultimediaKit.prl
 #usr/lib/libQtMultimediaKit.so
 usr/lib/libQtPublishSubscribe.prl
diff --git a/debian/qtmobility-examples.install b/debian/qtmobility-examples.install
index d7e738a..dde60ff 100644
--- a/debian/qtmobility-examples.install
+++ b/debian/qtmobility-examples.install
@@ -11,6 +11,7 @@ usr/bin/cubehouse
 usr/bin/fetchgooglemaps
 usr/bin/flickrdemo
 usr/bin/grueapp
+usr/bin/keepintouch
 usr/bin/lightmaps_with_location
 usr/bin/logfilepositionsource
 usr/bin/metadata
@@ -19,11 +20,13 @@ usr/bin/orientation
 usr/bin/publish-subscribe
 usr/bin/qmlcontacts
 usr/bin/qsysinfo
+usr/bin/querymessages
 #usr/bin/radio
 usr/bin/reading_perf
 usr/bin/samplephonebook
 usr/bin/satellitedialog
 usr/bin/sensor_explorer
+usr/bin/serviceactions
 usr/bin/servicebrowser
 usr/bin/sfw-notes
 usr/bin/show_acceleration
@@ -39,6 +42,7 @@ usr/bin/smallsensors
 #usr/bin/videographicsitem
 #usr/bin/videowidget
 usr/bin/weatherinfo_with_location
+usr/bin/writemessage
 usr/lib/qt4/plugins/sensors/libqtsensors_grueplugin.so
 usr/lib/qt4/plugins/serviceframework/libserviceframework_bluetoothtransferplugin.so
 usr/lib/qt4/plugins/serviceframework/libserviceframework_filemanagerplugin.so
diff --git a/debian/rules b/debian/rules
index 46a2b3c..fc524c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# QMF environment variables should be set
+export QMF_INCLUDEDIR := /usr/include/qtopiamail
+export QMF_LIBDIR := /usr/lib
+
 %:
 	dh $@ --parallel --list-missing --dbg-package=qtmobility-dbg --with pkgkde_symbolshelper
 
@@ -14,7 +18,7 @@ override_dh_auto_configure:
 	    -bindir "/usr/bin" \
 	    -plugindir "/usr/lib/qt4/plugins" \
 	    -examples \
-	    -modules "bearer location contacts publishsubscribe versit systeminfo serviceframework sensors"
+	    -modules "bearer location contacts publishsubscribe versit messaging systeminfo serviceframework sensors"
 
 override_dh_auto_clean:
 	dh_auto_clean

-- 
Qt Mobility packaging

More information about the pkg-kde-commits mailing list