[SCM] Qt Mobility packaging branch, master, updated. debian/1.0.2-1-10-g9ad64ea

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 5859fd48c4e18b42605cf6f183a1b39dfa06ea31
Author: Fathi Boudra <fabo at debian.org>
Date:   Wed Mar 9 11:26:27 2011 +0200

    Remove patches:
     - ftbfs_multimedia_examples.patch - fixed upstream.
     - enable_pkgconfig_support.patch - fixed upstream.
     - qmf_2010w36_support.patch - merged upstream.
---
 debian/changelog                               |   10 +++
 debian/patches/enable_pkgconfig_support.patch  |   79 ------------------------
 debian/patches/ftbfs_multimedia_examples.patch |   21 ------
 debian/patches/qmf_2010w36_support.patch       |   16 -----
 4 files changed, 10 insertions(+), 116 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f3a15d3..4b63858 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+qtmobility (1.2.0~beta0+git3174-1) unstable; urgency=low
+
+  * New upstream snapshot based on master branch - Upload to Sid.
+  * Remove patches:
+    - ftbfs_multimedia_examples.patch - fixed upstream.
+    - enable_pkgconfig_support.patch - fixed upstream.
+    - qmf_2010w36_support.patch - merged upstream.
+
+ -- Fathi Boudra <fabo at debian.org>  Sun, 06 Mar 2011 14:15:40 +0200
+
 qtmobility (1.1.0~beta2-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/enable_pkgconfig_support.patch b/debian/patches/enable_pkgconfig_support.patch
deleted file mode 100644
index 33ddee1..0000000
--- a/debian/patches/enable_pkgconfig_support.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Description: Enable pkconfig support and fix install path
-Author: Fathi Boudra <fabo at debian.org>
---- a/src/contacts/contacts.pro
-+++ b/src/contacts/contacts.pro
-@@ -90,9 +90,16 @@ maemo6 {
-     isEmpty(CONTACTS_DEFAULT_ENGINE): CONTACTS_DEFAULT_ENGINE=tracker
- }
- 
--maemo5|maemo6 {
-+CONFIG += app
-+include(../../features/deploy.pri)
-+
-+maemo5|maemo6|linux-* {
-     CONFIG += create_pc create_prl
-     QMAKE_PKGCONFIG_DESCRIPTION = Qt Mobility - Contacts API
-+    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-+    QMAKE_PKGCONFIG_LIBDIR = $$target.path
-+    QMAKE_PKGCONFIG_INCDIR = $$headers.path
-+    QMAKE_PKGCONFIG_CFLAGS = -I$${QT_MOBILITY_INCLUDE}/QtMobility
-     pkgconfig.path = $$QT_MOBILITY_LIB/pkgconfig
-     pkgconfig.files = QtContacts.pc
- 
-@@ -129,6 +136,3 @@ simulator {
- }
- 
- !isEmpty(CONTACTS_DEFAULT_ENGINE): DEFINES += Q_CONTACTS_DEFAULT_ENGINE=$$CONTACTS_DEFAULT_ENGINE
--
--CONFIG += app
--include(../../features/deploy.pri)
---- a/src/versit/versit.pro
-+++ b/src/versit/versit.pro
-@@ -80,14 +80,18 @@ symbian {
-     DEPLOYMENT += VERSIT_DEPLOYMENT
- }
- 
--maemo5|maemo6 {
-+CONFIG += app
-+include(../../features/deploy.pri)
-+
-+maemo5|maemo6|linux-* {
-     CONFIG += create_pc create_prl
-     QMAKE_PKGCONFIG_DESCRIPTION = Qt Mobility - Versit API
-+    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-+    QMAKE_PKGCONFIG_LIBDIR = $$target.path
-+    QMAKE_PKGCONFIG_INCDIR = $$headers.path
-+    QMAKE_PKGCONFIG_CFLAGS = -I$${QT_MOBILITY_INCLUDE}/QtMobility
-     pkgconfig.path = $$QT_MOBILITY_LIB/pkgconfig
-     pkgconfig.files = QtVersit.pc
- 
-     INSTALLS += pkgconfig
- }
--
--CONFIG += app
--include(../../features/deploy.pri)
---- a/src/versitorganizer/versitorganizer.pro
-+++ b/src/versitorganizer/versitorganizer.pro
-@@ -59,14 +59,18 @@ symbian {
-     DEPLOYMENT += VERSIT_ORGANIZER_DEPLOYMENT
- }
- 
--maemo5|maemo6 {
-+CONFIG += app
-+include(../../features/deploy.pri)
-+
-+maemo5|maemo6|linux-* {
-     CONFIG += create_pc create_prl
-     QMAKE_PKGCONFIG_DESCRIPTION = Qt Mobility - Versit API for Organizer
-+    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-+    QMAKE_PKGCONFIG_LIBDIR = $$target.path
-+    QMAKE_PKGCONFIG_INCDIR = $$headers.path
-+    QMAKE_PKGCONFIG_CFLAGS = -I$${QT_MOBILITY_INCLUDE}/QtMobility
-     pkgconfig.path = $$QT_MOBILITY_LIB/pkgconfig
-     pkgconfig.files = QtVersitOrganizer.pc
- 
-     INSTALLS += pkgconfig
- }
--
--CONFIG += app
--include(../../features/deploy.pri)
diff --git a/debian/patches/ftbfs_multimedia_examples.patch b/debian/patches/ftbfs_multimedia_examples.patch
deleted file mode 100644
index a73dec2..0000000
--- a/debian/patches/ftbfs_multimedia_examples.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix multimediakit examples link failure (undefined reference to pulseaudio functions)
-
-QT_CFLAGS_PULSEAUDIO and QT_LIBS_PULSEAUDIO are defined by Qt's configure.
-Qt Mobility's confgure should defined them.
-As a workaround, define a 'standard' value.
-
-Author: Fathi Boudra <fabo at debian.org>
-
---- a/src/multimedia/effects/effects.pri
-+++ b/src/multimedia/effects/effects.pri
-@@ -5,8 +5,8 @@ unix:!mac:!symbian {
-         DEFINES += QT_MULTIMEDIA_PULSEAUDIO
-         PRIVATE_HEADERS += effects/qsoundeffect_pulse_p.h
-         SOURCES += effects/qsoundeffect_pulse_p.cpp
--        QMAKE_CXXFLAGS += $$QT_CFLAGS_PULSEAUDIO
--        LIBS += $$QT_LIBS_PULSEAUDIO
-+        QMAKE_CXXFLAGS += -D_REENTRANT
-+        LIBS += -lpulse
-     } else {
-         DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER
-         PRIVATE_HEADERS += effects/qsoundeffect_qmedia_p.h
diff --git a/debian/patches/qmf_2010w36_support.patch b/debian/patches/qmf_2010w36_support.patch
deleted file mode 100644
index 0ce7e77..0000000
--- a/debian/patches/qmf_2010w36_support.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: fix build with QMF >= 2010w36
-Author: Fathi Boudra <fabo at debian.org>
---- a/plugins/declarative/messaging/messaging.pro
-+++ b/plugins/declarative/messaging/messaging.pro
-@@ -35,9 +35,9 @@ INSTALLS += qmldir
- simulator|contains(qmf_enabled, yes) {
-     mac {
-         QMAKE_LFLAGS += -F$$(QMF_LIBDIR)
--        LIBS += -framework qtopiamail
-+        LIBS += -framework qmfclient
-     } else {
--        LIBS += -L$$(QMF_LIBDIR) -l$$qtLibraryTarget(qtopiamail)
-+        LIBS += -L$$(QMF_LIBDIR) -l$$qtLibraryTarget(qmfclient)
-     }
- }
- 

-- 
Qt Mobility packaging