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

Fathi Boudra fabo at alioth.debian.org
Wed Jun 30 07:22:09 UTC 2010 

The following commit has been merged in the master branch:
commit fd01ec0add4a0781f98b47d4be23af21ebff0745
Author: Fathi Boudra <fabo at debian.org>
Date:   Wed Jun 30 10:20:27 2010 +0300

    Disable MultiMediaKit until Qt is built with -no-multimedia
---
 debian/changelog                                   |    2 +-
 debian/control                                     |   41 +--
 ...plesdir_and_-demosdir_options_to_configure.diff |  389 ++++++++++++++++++++
 debian/patches/series                              |    2 +
 debian/qtmobility-dev.install                      |  228 ++++++------
 debian/qtmobility-examples.install                 |   18 +-
 debian/rules                                       |    3 +-
 7 files changed, 536 insertions(+), 147 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6813165..1179160 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ qtmobility (1.0.1-1) experimental; urgency=low
 
   * Initial release (Closes: #585012)
 
- -- Fathi Boudra <fabo at debian.org>  Tue, 08 Jun 2010 11:39:08 +0300
+ -- Fathi Boudra <fabo at debian.org>  Wed, 30 Jun 2010 09:17:43 +0300
diff --git a/debian/control b/debian/control
index 598c6d3..7293c31 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,9 @@ 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), 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,
+ libasound2-dev, libbluetooth-dev, libpulse-dev, libx11-dev,
  network-manager-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Section: libs
 Homepage: http://labs.trolltech.com/page/Projects/QtMobility
 Vcs-Git: git://git.debian.org/pkg-kde/qtmobility.git
@@ -22,7 +19,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  libqtbearer1 (= ${binary:Version}),
  libqtcontacts1 (= ${binary:Version}),
  libqtlocation1 (= ${binary:Version}),
- libqtmultimediakit1 (= ${binary:Version}),
+# libqtmultimediakit1 (= ${binary:Version}),
  libqtpublishsubscribe1 (= ${binary:Version}),
  libqtsensors1 (= ${binary:Version}),
  libqtserviceframework1 (= ${binary:Version}),
@@ -60,14 +57,14 @@ 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: libqtmultimediakit1
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt Mobility MultimediaKit module
- Qt Mobility delivers a set of new APIs for mobile device functionality.
- .
- This package contains a set of APIs to play and record media, and manage a
- collection of media content.
+#Package: libqtmultimediakit1
+#Architecture: any
+#Depends: ${shlibs:Depends}, ${misc:Depends}
+#Description: Qt Mobility MultimediaKit module
+# Qt Mobility delivers a set of new APIs for mobile device functionality.
+# .
+# This package contains a set of APIs to play and record media, and manage a
+# collection of media content.
 
 Package: libqtpublishsubscribe1
 Architecture: any
@@ -113,13 +110,13 @@ Description: Qt Mobility Versit module
  .
  This package contains an API to manage Versit documents.
 
-Package: libdeclarative-multimedia
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt Mobility Multimedia QML plugin
- Qt Mobility delivers a set of new APIs for mobile device functionality.
- .
- This package contains the Multimedia QML plugin for QtDeclarative.
+#Package: libdeclarative-multimedia
+#Architecture: any
+#Depends: ${shlibs:Depends}, ${misc:Depends}
+#Description: Qt Mobility Multimedia QML plugin
+# Qt Mobility delivers a set of new APIs for mobile device functionality.
+# .
+# This package contains the Multimedia QML plugin for QtDeclarative.
 
 Package: libdeclarative-publishsubscribe
 Architecture: any
@@ -154,7 +151,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  libqtbearer1 (= ${binary:Version}),
  libqtcontacts1 (= ${binary:Version}),
  libqtlocation1 (= ${binary:Version}),
- libqtmultimediakit1 (= ${binary:Version}),
+# libqtmultimediakit1 (= ${binary:Version}),
  libqtpublishsubscribe1 (= ${binary:Version}),
  libqtsensors1 (= ${binary:Version}),
  libqtserviceframework1 (= ${binary:Version}),
diff --git a/debian/patches/0003_adds_-examplesdir_and_-demosdir_options_to_configure.diff b/debian/patches/0003_adds_-examplesdir_and_-demosdir_options_to_configure.diff
new file mode 100644
index 0000000..b1d853e
--- /dev/null
+++ b/debian/patches/0003_adds_-examplesdir_and_-demosdir_options_to_configure.diff
@@ -0,0 +1,389 @@
+From ccb423e04fc349dc8fa72a9537ec8a14627b3ed0 Mon Sep 17 00:00:00 2001
+From: Alex <qt-info at nokia.com>
+Date: Tue, 22 Jun 2010 13:45:47 +1000
+Subject: [PATCH] add support for -examplesdir and -demosdir configure option
+
+Task-number: QTMOBILITY-320
+---
+ configure                                          |   38 +++++++++++++++-
+ configure.bat                                      |   38 +++++++++++++--
+ demos/demos.pri                                    |   10 ++++
+ demos/lightmaps/lightmaps.pro                      |    2 +-
+ demos/player/player.pro                            |    2 +-
+ demos/qmlcontacts/qmlcontacts.pro                  |    2 +-
+ demos/serviceactions/serviceactions.pro            |    2 +-
+ .../small_screen_sensors/small_screen_sensors.pro  |    2 +-
+ demos/weatherinfo/weatherinfo.pro                  |    2 +-
+ examples/examples.pri                              |   47 +------------------
+ features/basic_examples_setup.prf                  |   49 ++++++++++++++++++++
+ 11 files changed, 137 insertions(+), 57 deletions(-)
+ create mode 100644 demos/demos.pri
+ create mode 100644 features/basic_examples_setup.prf
+
+diff --git a/configure b/configure
+index 6c714d6..c56bb89 100755
+--- a/configure
++++ b/configure
+@@ -86,6 +86,8 @@ QT_MOBILITY_INCLUDE=
+ QT_MOBILITY_LIB=
+ QT_MOBILITY_BIN=
+ QT_MOBILITY_PLUGINS=
++QT_MOBILITY_EXAMPLES=
++QT_MOBILITY_DEMOS=
+ BUILD_UNITTESTS=
+ BUILD_EXAMPLES=
+ BUILD_DEMOS=
+@@ -123,6 +125,10 @@ usage()
+     echo "                    (default PREFIX/bin)"
+     echo "-plugindir <dir> .. Plug-ins will be installed to <dir>"
+     echo "                    (default PREFIX/plugins)"
++    echo "-demosdir <dir> ... Demos will be installed to <dir>"
++    echo "                    (default PREFIX/bin)"
++    echo "-examplesdir <dir>  Examples will be installed to <dir>"
++    echo "                    (default PREFIX/bin)"
+     echo "-debug ............ Build with debugging symbols"
+     echo "-release .......... Build without debugging symbols"
+     echo "-silent ........... Reduces build output"
+@@ -143,7 +149,7 @@ usage()
+     echo "                    will automatically be enabled."
+     echo "-maemo6 ........... Build Qt Mobility for Maemo6 (Harmattan)."
+     echo "-maemo5 ........... Build Qt Mobility for Maemo5 (Freemantle)."
+-    echo "-sdk <sdk>..........Build using Apple provided SDK <path/to/sdk>."
++    echo "-sdk <sdk>......... Build using Apple provided SDK <path/to/sdk>."
+     echo "                    example: -sdk /Developer/SDKs/MacOSX10.6.sdk"
+     echo
+     
+@@ -180,6 +186,14 @@ while [ "$#" -gt 0 ]; do
+             QT_MOBILITY_PLUGINS="$2"
+             shift
+             ;;
++        -examplesdir)
++            QT_MOBILITY_EXAMPLES="$2"
++            shift
++            ;;
++        -demosdir)
++            QT_MOBILITY_DEMOS="$2"
++            shift
++            ;;
+         -tests)
+             BUILD_UNITTESTS="yes"
+             ;;
+@@ -367,6 +381,28 @@ else
+ fi
+ echo "QT_MOBILITY_PLUGINS = $QT_MOBILITY_PLUGINS" >> "$CONFIG_IN"
+ 
++#process examples path
++if [ -z "$QT_MOBILITY_EXAMPLES" ]; then
++    QT_MOBILITY_EXAMPLES="$QT_MOBILITY_PREFIX/$BIN_PATH"
++else
++    QT_MOBILITY_EXAMPLES=`absPath $QT_MOBILITY_EXAMPLES $LINUX_TARGET`
++    if [ "$?" -eq "1" ]; then
++        exit 1
++    fi
++fi
++echo "QT_MOBILITY_EXAMPLES = $QT_MOBILITY_EXAMPLES" >> "$CONFIG_IN"
++
++#process demos path
++if [ -z "$QT_MOBILITY_DEMOS" ]; then
++    QT_MOBILITY_DEMOS="$QT_MOBILITY_PREFIX/$BIN_PATH"
++else
++    QT_MOBILITY_DEMOS=`absPath $QT_MOBILITY_DEMOS $LINUX_TARGET`
++    if [ "$?" -eq "1" ]; then
++        exit 1
++    fi
++fi
++echo "QT_MOBILITY_DEMOS = $QT_MOBILITY_DEMOS" >> "$CONFIG_IN"
++
+ 
+ echo "QT_MOBILITY_SOURCE_TREE = $relpath" >> "$QMAKE_CACHE"
+ echo "QT_MOBILITY_BUILD_TREE = $shadowpath" >> "$QMAKE_CACHE"
+diff --git a/configure.bat b/configure.bat
+index d2eee4c..5a544c2 100644
+--- a/configure.bat
++++ b/configure.bat
+@@ -82,6 +82,8 @@ if "%1" == "-libdir"            goto libTag
+ if "%1" == "-bindir"            goto binTag
+ if "%1" == "-headerdir"         goto headerTag
+ if "%1" == "-plugindir"         goto pluginTag
++if "%1" == "-examplesdir"       goto examplesDirTag
++if "%1" == "-demosdir"          goto demosDirTag
+ if "%1" == "-tests"             goto testTag
+ if "%1" == "-examples"          goto exampleTag
+ if "%1" == "-demos"             goto demosTag
+@@ -117,6 +119,10 @@ echo Usage: configure.bat [-prefix (dir)] [headerdir (dir)] [libdir (dir)]
+     echo                     (default PREFIX/bin)
+     echo -plugindir (dir) .. Plug-ins will be installed to dir
+     echo                     (default PREFIX/plugins)
++    echo -examplesdir (dir)  Examples will be installed to dir
++    echo                     (default PREFIX/bin)
++    echo -demosdir (dir) ... Demos will be installed to dir
++    echo                     (default PREFIX/bin)
+     echo -debug ............ Build with debugging symbols
+     echo -release .......... Build without debugging symbols
+     echo -silent ........... Reduces build output
+@@ -194,6 +200,20 @@ shift
+ echo
+ goto cmdline_parsing
+ 
++:examplesDirTag
++shift
++echo QT_MOBILITY_EXAMPLES = %1 >> %PROJECT_CONFIG%
++shift
++echo
++goto cmdline_parsing
++
++:demosDirTag
++shift
++echo QT_MOBILITY_DEMOS =%1 >> %PROJECT_CONFIG%
++shift
++echo
++goto cmdline_parsing
++
+ :unfrozenTag
+ REM Should never be used in release builds
+ REM Some SDK's seem to exclude Q_AUTOTEST_EXPORT symbols if the
+@@ -354,6 +374,8 @@ echo !symbian:isEmpty($$QT_MOBILITY_INCLUDE):QT_MOBILITY_INCLUDE=$$QT_MOBILITY_P
+ echo isEmpty($$QT_MOBILITY_LIB):QT_MOBILITY_LIB=$$QT_MOBILITY_PREFIX/lib >> %PROJECT_CONFIG%
+ echo isEmpty($$QT_MOBILITY_BIN):QT_MOBILITY_BIN=$$QT_MOBILITY_PREFIX/bin >> %PROJECT_CONFIG%
+ echo isEmpty($$QT_MOBILITY_PLUGINS):QT_MOBILITY_PLUGINS=$$QT_MOBILITY_PREFIX/plugins >> %PROJECT_CONFIG%
++echo isEmpty($$QT_MOBILITY_EXAMPLES):QT_MOBILITY_EXAMPLES=$$QT_MOBILITY_PREFIX/bin >> %PROJECT_CONFIG%
++echo isEmpty($$QT_MOBILITY_DEMOS):QT_MOBILITY_DEMOS=$$QT_MOBILITY_PREFIX/bin >> %PROJECT_CONFIG%
+ 
+ echo mobility_modules = %MOBILITY_MODULES%  >> %PROJECT_CONFIG%
+ REM no Sysinfo support on Maemo yet
+@@ -599,9 +621,11 @@ set QT_PATH=
+ set SOURCE_PATH=
+ set MOBILITY_MODULES=
+ set MOBILITY_MODULES_UNPARSED=
+-SET REMAINING=
+-SET FIRST=
+-SET MODULES_TEMP=
++set REMAINING=
++set FIRST=
++set MODULES_TEMP=
++set QT_MOBILITY_EXAMPLES=
++set QT_MOBILITY_DEMOS=
+ exit /b 1
+ 
+ :exitTag
+@@ -616,7 +640,9 @@ set QT_PATH=
+ set SOURCE_PATH=
+ set MOBILITY_MODULES=
+ set MOBILITY_MODULES_UNPARSED=
+-SET REMAINING=
+-SET FIRST=
+-SET MODULES_TEMP=
++set REMAINING=
++set FIRST=
++set MODULES_TEMP=
++set QT_MOBILITY_EXAMPLES=
++set QT_MOBILITY_DEMOS=
+ exit /b 0
+diff --git a/demos/demos.pri b/demos/demos.pri
+new file mode 100644
+index 0000000..211abbb
+--- /dev/null
++++ b/demos/demos.pri
+@@ -0,0 +1,10 @@
++load(basic_examples_setup)
++
++!plugin {
++    target.path=$$QT_MOBILITY_DEMOS
++} else {
++    target.path = $${QT_MOBILITY_PLUGINS}/$${PLUGIN_TYPE}
++}
++INSTALLS += target
++
++
+diff --git a/demos/lightmaps/lightmaps.pro b/demos/lightmaps/lightmaps.pro
+index f8c53e8..01efa85 100644
+--- a/demos/lightmaps/lightmaps.pro
++++ b/demos/lightmaps/lightmaps.pro
+@@ -15,7 +15,7 @@ INCLUDEPATH += ../../src/global \
+                 ../../examples/satellitedialog \
+                 ../../examples/flickrdemo
+ 
+-include(../../examples/examples.pri)
++include(../demos.pri)
+ 
+ CONFIG += mobility
+ MOBILITY = location bearer
+diff --git a/demos/player/player.pro b/demos/player/player.pro
+index 549d13f..03114d0 100644
+--- a/demos/player/player.pro
++++ b/demos/player/player.pro
+@@ -5,7 +5,7 @@ QT += network \
+ 
+ INCLUDEPATH += ../../src/multimedia ../../src/multimedia/audio
+ 
+-include(../../examples/examples.pri)
++include(../demos.pri)
+ CONFIG += mobility
+ MOBILITY = multimedia
+ 
+diff --git a/demos/qmlcontacts/qmlcontacts.pro b/demos/qmlcontacts/qmlcontacts.pro
+index baa40b8..ade0b1f 100644
+--- a/demos/qmlcontacts/qmlcontacts.pro
++++ b/demos/qmlcontacts/qmlcontacts.pro
+@@ -27,4 +27,4 @@ OTHER_FILES += example.qml \
+     ScrollBar.qml
+ symbian::TARGET.CAPABILITY = ReadUserData \
+     WriteUserData
+-include(../../examples/examples.pri)
++include(../demos.pri)
+diff --git a/demos/serviceactions/serviceactions.pro b/demos/serviceactions/serviceactions.pro
+index 9d53fc6..c52e833 100644
+--- a/demos/serviceactions/serviceactions.pro
++++ b/demos/serviceactions/serviceactions.pro
+@@ -3,7 +3,7 @@ TARGET = serviceactions
+ 
+ QT += gui
+ 
+-include(../../examples/examples.pri)
++include(../demos.pri)
+ 
+ CONFIG += mobility
+ MOBILITY = messaging
+diff --git a/demos/small_screen_sensors/small_screen_sensors.pro b/demos/small_screen_sensors/small_screen_sensors.pro
+index f55008d..9dfa2bc 100644
+--- a/demos/small_screen_sensors/small_screen_sensors.pro
++++ b/demos/small_screen_sensors/small_screen_sensors.pro
+@@ -1,7 +1,7 @@
+ TARGET = smallsensors
+ TEMPLATE = app
+ 
+-include(../../examples/examples.pri)
++include(../demos.pri)
+ 
+ QT=core gui
+ CONFIG+=mobility
+diff --git a/demos/weatherinfo/weatherinfo.pro b/demos/weatherinfo/weatherinfo.pro
+index a28e320..05ed3a1 100644
+--- a/demos/weatherinfo/weatherinfo.pro
++++ b/demos/weatherinfo/weatherinfo.pro
+@@ -10,7 +10,7 @@ SOURCES = weatherinfo.cpp \
+ RESOURCES = weatherinfo.qrc
+ QT += network svg
+ 
+-include(../../examples/examples.pri)
++include(../demos.pri)
+ 
+ CONFIG += mobility
+ MOBILITY = location bearer
+diff --git a/examples/examples.pri b/examples/examples.pri
+index 3402160..adced09 100644
+--- a/examples/examples.pri
++++ b/examples/examples.pri
+@@ -1,51 +1,10 @@
+-include(../staticconfig.pri)
+-        
+-#!contains(build_examples, yes):error(Please use the -examples configure switch to enable building of examples)
+-
+-win32:contains(CONFIG_WIN32,build_all):Win32DebugAndRelease=yes
+-mac | contains(Win32DebugAndRelease,yes) {
+-    #due to different debug/release library names we have to comply with 
+-    #whatever Qt does
+-    !contains(QT_CONFIG,debug)|!contains(QT_CONFIG,release) {
+-        CONFIG -= debug_and_release debug release
+-        contains(QT_CONFIG,debug): CONFIG+=debug
+-        contains(QT_CONFIG,release): CONFIG+=release
+-    }
+-}
+-
+-CONFIG(debug, debug|release) {
+-    SUBDIRPART=Debug
+-} else {
+-    SUBDIRPART=Release
+-}
+-
+-OUTPUT_DIR = $$QT_MOBILITY_BUILD_TREE
+-MOC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/moc
+-RCC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/rcc
+-UI_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/ui
+-OBJECTS_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET
+-mac:LIBS+= -F$$OUTPUT_DIR/lib
+-LIBS+= -L$$OUTPUT_DIR/lib
+-QMAKE_RPATHDIR+=$$OUTPUT_DIR/lib
+-INCLUDEPATH+= $$QT_MOBILITY_SOURCE_TREE/src/global
++load(basic_examples_setup)
+ 
+ !plugin {
+-    target.path=$$QT_MOBILITY_PREFIX/bin
++    target.path=$$QT_MOBILITY_EXAMPLES
+ } else {
+     target.path = $${QT_MOBILITY_PLUGINS}/$${PLUGIN_TYPE}
+ }
+ INSTALLS += target
+ 
+-maemo6 {
+-    DEFINES+= Q_WS_MAEMO_6
+-    DEFINES+= QTM_EXAMPLES_SMALL_SCREEN
+-    DEFINES+= QTM_EXAMPLES_PREFER_LANDSCAPE
+-}
+-maemo5 {
+-    DEFINES+= Q_WS_MAEMO_5
+-    DEFINES+= QTM_EXAMPLES_SMALL_SCREEN
+-    DEFINES+= QTM_EXAMPLES_PREFER_LANDSCAPE
+-}
+-symbian {
+-    DEFINES+= QTM_EXAMPLES_SMALL_SCREEN
+-}
++
+diff --git a/features/basic_examples_setup.prf b/features/basic_examples_setup.prf
+new file mode 100644
+index 0000000..48cb563
+--- /dev/null
++++ b/features/basic_examples_setup.prf
+@@ -0,0 +1,49 @@
++include(../staticconfig.pri)
++
++win32:contains(CONFIG_WIN32,build_all):Win32DebugAndRelease=yes
++mac | contains(Win32DebugAndRelease,yes) {
++    #due to different debug/release library names we have to comply with 
++    #whatever Qt does
++    !contains(QT_CONFIG,debug)|!contains(QT_CONFIG,release) {
++        CONFIG -= debug_and_release debug release
++        contains(QT_CONFIG,debug): CONFIG+=debug
++        contains(QT_CONFIG,release): CONFIG+=release
++    }
++}
++
++CONFIG(debug, debug|release) {
++    SUBDIRPART=Debug
++} else {
++    SUBDIRPART=Release
++}
++
++OUTPUT_DIR = $$QT_MOBILITY_BUILD_TREE
++MOC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/moc
++RCC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/rcc
++UI_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/ui
++OBJECTS_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET
++mac:LIBS+= -F$$OUTPUT_DIR/lib
++LIBS+= -L$$OUTPUT_DIR/lib
++QMAKE_RPATHDIR+=$$QT_MOBILITY_LIB
++INCLUDEPATH+= $$QT_MOBILITY_SOURCE_TREE/src/global
++
++!plugin {
++    target.path=$$QT_MOBILITY_EXAMPLES
++} else {
++    target.path = $${QT_MOBILITY_PLUGINS}/$${PLUGIN_TYPE}
++}
++INSTALLS += target
++
++maemo6 {
++    DEFINES+= Q_WS_MAEMO_6
++    DEFINES+= QTM_EXAMPLES_SMALL_SCREEN
++    DEFINES+= QTM_EXAMPLES_PREFER_LANDSCAPE
++}
++maemo5 {
++    DEFINES+= Q_WS_MAEMO_5
++    DEFINES+= QTM_EXAMPLES_SMALL_SCREEN
++    DEFINES+= QTM_EXAMPLES_PREFER_LANDSCAPE
++}
++symbian {
++    DEFINES+= QTM_EXAMPLES_SMALL_SCREEN
++}
+-- 
+1.6.1
+
diff --git a/debian/patches/series b/debian/patches/series
index f699b01..ea69fc0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,7 @@
 0001_rename_smallsensors.diff
 0002_rename_sysinfo.diff
+# merged for 1.0.2
+# 0003_adds_-examplesdir_and_-demosdir_options_to_configure.diff
 01_fix_ftbfs_incorrect_copy2build_output_value.diff
 02_no_rpath.diff
 03_ftbfs_multimedia_plugin.diff
diff --git a/debian/qtmobility-dev.install b/debian/qtmobility-dev.install
index 71e700e..0d70e90 100644
--- a/debian/qtmobility-dev.install
+++ b/debian/qtmobility-dev.install
@@ -143,118 +143,118 @@ usr/include/QtLocation/qgeopositioninfosource.h
 usr/include/QtLocation/qgeosatelliteinfo.h
 usr/include/QtLocation/qgeosatelliteinfosource.h
 usr/include/QtLocation/qnmeapositioninfosource.h
-usr/include/QtMultimediaKit/QAbstractAudioDeviceInfo
-usr/include/QtMultimediaKit/QAbstractAudioInput
-usr/include/QtMultimediaKit/QAbstractAudioOutput
-usr/include/QtMultimediaKit/QAbstractVideoBuffer
-usr/include/QtMultimediaKit/QAbstractVideoSurface
-usr/include/QtMultimediaKit/QAudioCaptureSource
-usr/include/QtMultimediaKit/QAudioDeviceInfo
-usr/include/QtMultimediaKit/QAudioEncoderControl
-usr/include/QtMultimediaKit/QAudioEncoderSettings
-usr/include/QtMultimediaKit/QAudioEndpointSelector
-usr/include/QtMultimediaKit/QAudioFormat
-usr/include/QtMultimediaKit/QAudioInput
-usr/include/QtMultimediaKit/QAudioOutput
-usr/include/QtMultimediaKit/QAudioSystemPlugin
-usr/include/QtMultimediaKit/QGraphicsVideoItem
-usr/include/QtMultimediaKit/QImageEncoderControl
-usr/include/QtMultimediaKit/QImageEncoderSettings
-usr/include/QtMultimediaKit/QLocalMediaPlaylistProvider
-usr/include/QtMultimediaKit/QMediaBindableInterface
-usr/include/QtMultimediaKit/QMediaContainerControl
-usr/include/QtMultimediaKit/QMediaContent
-usr/include/QtMultimediaKit/QMediaControl
-usr/include/QtMultimediaKit/QMediaImageViewer
-usr/include/QtMultimediaKit/QMediaObject
-usr/include/QtMultimediaKit/QMediaPlayer
-usr/include/QtMultimediaKit/QMediaPlayerControl
-usr/include/QtMultimediaKit/QMediaPlaylist
-usr/include/QtMultimediaKit/QMediaPlaylistControl
-usr/include/QtMultimediaKit/QMediaPlaylistIOPlugin
-usr/include/QtMultimediaKit/QMediaPlaylistNavigator
-usr/include/QtMultimediaKit/QMediaPlaylistProvider
-usr/include/QtMultimediaKit/QMediaPlaylistReader
-usr/include/QtMultimediaKit/QMediaPlaylistSourceControl
-usr/include/QtMultimediaKit/QMediaPlaylistWriter
-usr/include/QtMultimediaKit/QMediaRecorder
-usr/include/QtMultimediaKit/QMediaRecorderControl
-usr/include/QtMultimediaKit/QMediaResource
-usr/include/QtMultimediaKit/QMediaService
-usr/include/QtMultimediaKit/QMediaServiceProvider
-usr/include/QtMultimediaKit/QMediaServiceProviderHint
-usr/include/QtMultimediaKit/QMediaServiceProviderPlugin
-usr/include/QtMultimediaKit/QMediaStreamsControl
-usr/include/QtMultimediaKit/QMediaTimeInterval
-usr/include/QtMultimediaKit/QMediaTimeRange
-usr/include/QtMultimediaKit/QMetaDataReaderControl
-usr/include/QtMultimediaKit/QMetaDataWriterControl
-usr/include/QtMultimediaKit/QRadioTuner
-usr/include/QtMultimediaKit/QRadioTunerControl
-usr/include/QtMultimediaKit/QVideoDeviceControl
-usr/include/QtMultimediaKit/QVideoEncoderControl
-usr/include/QtMultimediaKit/QVideoEncoderSettings
-usr/include/QtMultimediaKit/QVideoFrame
-usr/include/QtMultimediaKit/QVideoRendererControl
-usr/include/QtMultimediaKit/QVideoSurfaceFormat
-usr/include/QtMultimediaKit/QVideoWidget
-usr/include/QtMultimediaKit/QVideoWidgetControl
-usr/include/QtMultimediaKit/QVideoWindowControl
-usr/include/QtMultimediaKit/qabstractvideobuffer.h
-usr/include/QtMultimediaKit/qabstractvideobuffer_p.h
-usr/include/QtMultimediaKit/qabstractvideosurface.h
-usr/include/QtMultimediaKit/qabstractvideosurface_p.h
-usr/include/QtMultimediaKit/qaudio.h
-usr/include/QtMultimediaKit/qaudiocapturesource.h
-usr/include/QtMultimediaKit/qaudiodeviceinfo.h
-usr/include/QtMultimediaKit/qaudioencodercontrol.h
-usr/include/QtMultimediaKit/qaudioendpointselector.h
-usr/include/QtMultimediaKit/qaudioformat.h
-usr/include/QtMultimediaKit/qaudioinput.h
-usr/include/QtMultimediaKit/qaudiooutput.h
-usr/include/QtMultimediaKit/qaudiosystem.h
-usr/include/QtMultimediaKit/qaudiosystemplugin.h
-usr/include/QtMultimediaKit/qgraphicsvideoitem.h
-usr/include/QtMultimediaKit/qimageencodercontrol.h
-usr/include/QtMultimediaKit/qimagevideobuffer_p.h
-usr/include/QtMultimediaKit/qlocalmediaplaylistprovider.h
-usr/include/QtMultimediaKit/qmediabindableinterface.h
-usr/include/QtMultimediaKit/qmediacontainercontrol.h
-usr/include/QtMultimediaKit/qmediacontent.h
-usr/include/QtMultimediaKit/qmediacontrol.h
-usr/include/QtMultimediaKit/qmediaencodersettings.h
-usr/include/QtMultimediaKit/qmediaimageviewer.h
-usr/include/QtMultimediaKit/qmediaobject.h
-usr/include/QtMultimediaKit/qmediaplayer.h
-usr/include/QtMultimediaKit/qmediaplayercontrol.h
-usr/include/QtMultimediaKit/qmediaplaylist.h
-usr/include/QtMultimediaKit/qmediaplaylistcontrol.h
-usr/include/QtMultimediaKit/qmediaplaylistioplugin.h
-usr/include/QtMultimediaKit/qmediaplaylistnavigator.h
-usr/include/QtMultimediaKit/qmediaplaylistprovider.h
-usr/include/QtMultimediaKit/qmediaplaylistsourcecontrol.h
-usr/include/QtMultimediaKit/qmediarecorder.h
-usr/include/QtMultimediaKit/qmediarecordercontrol.h
-usr/include/QtMultimediaKit/qmediaresource.h
-usr/include/QtMultimediaKit/qmediaservice.h
-usr/include/QtMultimediaKit/qmediaserviceprovider.h
-usr/include/QtMultimediaKit/qmediaserviceproviderplugin.h
-usr/include/QtMultimediaKit/qmediastreamscontrol.h
-usr/include/QtMultimediaKit/qmediatimerange.h
-usr/include/QtMultimediaKit/qmemoryvideobuffer_p.h
-usr/include/QtMultimediaKit/qmetadatareadercontrol.h
-usr/include/QtMultimediaKit/qmetadatawritercontrol.h
-usr/include/QtMultimediaKit/qradiotuner.h
-usr/include/QtMultimediaKit/qradiotunercontrol.h
-usr/include/QtMultimediaKit/qtmedianamespace.h
-usr/include/QtMultimediaKit/qvideodevicecontrol.h
-usr/include/QtMultimediaKit/qvideoencodercontrol.h
-usr/include/QtMultimediaKit/qvideoframe.h
-usr/include/QtMultimediaKit/qvideorenderercontrol.h
-usr/include/QtMultimediaKit/qvideosurfaceformat.h
-usr/include/QtMultimediaKit/qvideowidget.h
-usr/include/QtMultimediaKit/qvideowidgetcontrol.h
-usr/include/QtMultimediaKit/qvideowindowcontrol.h
+#usr/include/QtMultimediaKit/QAbstractAudioDeviceInfo
+#usr/include/QtMultimediaKit/QAbstractAudioInput
+#usr/include/QtMultimediaKit/QAbstractAudioOutput
+#usr/include/QtMultimediaKit/QAbstractVideoBuffer
+#usr/include/QtMultimediaKit/QAbstractVideoSurface
+#usr/include/QtMultimediaKit/QAudioCaptureSource
+#usr/include/QtMultimediaKit/QAudioDeviceInfo
+#usr/include/QtMultimediaKit/QAudioEncoderControl
+#usr/include/QtMultimediaKit/QAudioEncoderSettings
+#usr/include/QtMultimediaKit/QAudioEndpointSelector
+#usr/include/QtMultimediaKit/QAudioFormat
+#usr/include/QtMultimediaKit/QAudioInput
+#usr/include/QtMultimediaKit/QAudioOutput
+#usr/include/QtMultimediaKit/QAudioSystemPlugin
+#usr/include/QtMultimediaKit/QGraphicsVideoItem
+#usr/include/QtMultimediaKit/QImageEncoderControl
+#usr/include/QtMultimediaKit/QImageEncoderSettings
+#usr/include/QtMultimediaKit/QLocalMediaPlaylistProvider
+#usr/include/QtMultimediaKit/QMediaBindableInterface
+#usr/include/QtMultimediaKit/QMediaContainerControl
+#usr/include/QtMultimediaKit/QMediaContent
+#usr/include/QtMultimediaKit/QMediaControl
+#usr/include/QtMultimediaKit/QMediaImageViewer
+#usr/include/QtMultimediaKit/QMediaObject
+#usr/include/QtMultimediaKit/QMediaPlayer
+#usr/include/QtMultimediaKit/QMediaPlayerControl
+#usr/include/QtMultimediaKit/QMediaPlaylist
+#usr/include/QtMultimediaKit/QMediaPlaylistControl
+#usr/include/QtMultimediaKit/QMediaPlaylistIOPlugin
+#usr/include/QtMultimediaKit/QMediaPlaylistNavigator
+#usr/include/QtMultimediaKit/QMediaPlaylistProvider
+#usr/include/QtMultimediaKit/QMediaPlaylistReader
+#usr/include/QtMultimediaKit/QMediaPlaylistSourceControl
+#usr/include/QtMultimediaKit/QMediaPlaylistWriter
+#usr/include/QtMultimediaKit/QMediaRecorder
+#usr/include/QtMultimediaKit/QMediaRecorderControl
+#usr/include/QtMultimediaKit/QMediaResource
+#usr/include/QtMultimediaKit/QMediaService
+#usr/include/QtMultimediaKit/QMediaServiceProvider
+#usr/include/QtMultimediaKit/QMediaServiceProviderHint
+#usr/include/QtMultimediaKit/QMediaServiceProviderPlugin
+#usr/include/QtMultimediaKit/QMediaStreamsControl
+#usr/include/QtMultimediaKit/QMediaTimeInterval
+#usr/include/QtMultimediaKit/QMediaTimeRange
+#usr/include/QtMultimediaKit/QMetaDataReaderControl
+#usr/include/QtMultimediaKit/QMetaDataWriterControl
+#usr/include/QtMultimediaKit/QRadioTuner
+#usr/include/QtMultimediaKit/QRadioTunerControl
+#usr/include/QtMultimediaKit/QVideoDeviceControl
+#usr/include/QtMultimediaKit/QVideoEncoderControl
+#usr/include/QtMultimediaKit/QVideoEncoderSettings
+#usr/include/QtMultimediaKit/QVideoFrame
+#usr/include/QtMultimediaKit/QVideoRendererControl
+#usr/include/QtMultimediaKit/QVideoSurfaceFormat
+#usr/include/QtMultimediaKit/QVideoWidget
+#usr/include/QtMultimediaKit/QVideoWidgetControl
+#usr/include/QtMultimediaKit/QVideoWindowControl
+#usr/include/QtMultimediaKit/qabstractvideobuffer.h
+#usr/include/QtMultimediaKit/qabstractvideobuffer_p.h
+#usr/include/QtMultimediaKit/qabstractvideosurface.h
+#usr/include/QtMultimediaKit/qabstractvideosurface_p.h
+#usr/include/QtMultimediaKit/qaudio.h
+#usr/include/QtMultimediaKit/qaudiocapturesource.h
+#usr/include/QtMultimediaKit/qaudiodeviceinfo.h
+#usr/include/QtMultimediaKit/qaudioencodercontrol.h
+#usr/include/QtMultimediaKit/qaudioendpointselector.h
+#usr/include/QtMultimediaKit/qaudioformat.h
+#usr/include/QtMultimediaKit/qaudioinput.h
+#usr/include/QtMultimediaKit/qaudiooutput.h
+#usr/include/QtMultimediaKit/qaudiosystem.h
+#usr/include/QtMultimediaKit/qaudiosystemplugin.h
+#usr/include/QtMultimediaKit/qgraphicsvideoitem.h
+#usr/include/QtMultimediaKit/qimageencodercontrol.h
+#usr/include/QtMultimediaKit/qimagevideobuffer_p.h
+#usr/include/QtMultimediaKit/qlocalmediaplaylistprovider.h
+#usr/include/QtMultimediaKit/qmediabindableinterface.h
+#usr/include/QtMultimediaKit/qmediacontainercontrol.h
+#usr/include/QtMultimediaKit/qmediacontent.h
+#usr/include/QtMultimediaKit/qmediacontrol.h
+#usr/include/QtMultimediaKit/qmediaencodersettings.h
+#usr/include/QtMultimediaKit/qmediaimageviewer.h
+#usr/include/QtMultimediaKit/qmediaobject.h
+#usr/include/QtMultimediaKit/qmediaplayer.h
+#usr/include/QtMultimediaKit/qmediaplayercontrol.h
+#usr/include/QtMultimediaKit/qmediaplaylist.h
+#usr/include/QtMultimediaKit/qmediaplaylistcontrol.h
+#usr/include/QtMultimediaKit/qmediaplaylistioplugin.h
+#usr/include/QtMultimediaKit/qmediaplaylistnavigator.h
+#usr/include/QtMultimediaKit/qmediaplaylistprovider.h
+#usr/include/QtMultimediaKit/qmediaplaylistsourcecontrol.h
+#usr/include/QtMultimediaKit/qmediarecorder.h
+#usr/include/QtMultimediaKit/qmediarecordercontrol.h
+#usr/include/QtMultimediaKit/qmediaresource.h
+#usr/include/QtMultimediaKit/qmediaservice.h
+#usr/include/QtMultimediaKit/qmediaserviceprovider.h
+#usr/include/QtMultimediaKit/qmediaserviceproviderplugin.h
+#usr/include/QtMultimediaKit/qmediastreamscontrol.h
+#usr/include/QtMultimediaKit/qmediatimerange.h
+#usr/include/QtMultimediaKit/qmemoryvideobuffer_p.h
+#usr/include/QtMultimediaKit/qmetadatareadercontrol.h
+#usr/include/QtMultimediaKit/qmetadatawritercontrol.h
+#usr/include/QtMultimediaKit/qradiotuner.h
+#usr/include/QtMultimediaKit/qradiotunercontrol.h
+#usr/include/QtMultimediaKit/qtmedianamespace.h
+#usr/include/QtMultimediaKit/qvideodevicecontrol.h
+#usr/include/QtMultimediaKit/qvideoencodercontrol.h
+#usr/include/QtMultimediaKit/qvideoframe.h
+#usr/include/QtMultimediaKit/qvideorenderercontrol.h
+#usr/include/QtMultimediaKit/qvideosurfaceformat.h
+#usr/include/QtMultimediaKit/qvideowidget.h
+#usr/include/QtMultimediaKit/qvideowidgetcontrol.h
+#usr/include/QtMultimediaKit/qvideowindowcontrol.h
 usr/include/QtPublishSubscribe/QValueSpacePublisher
 usr/include/QtPublishSubscribe/QValueSpaceSubscriber
 usr/include/QtPublishSubscribe/qvaluespace.h
@@ -348,8 +348,8 @@ usr/lib/libQtContacts.prl
 usr/lib/libQtContacts.so
 usr/lib/libQtLocation.prl
 usr/lib/libQtLocation.so
-usr/lib/libQtMultimediaKit.prl
-usr/lib/libQtMultimediaKit.so
+#usr/lib/libQtMultimediaKit.prl
+#usr/lib/libQtMultimediaKit.so
 usr/lib/libQtPublishSubscribe.prl
 usr/lib/libQtPublishSubscribe.so
 usr/lib/libQtSensors.prl
diff --git a/debian/qtmobility-examples.install b/debian/qtmobility-examples.install
index 797f590..d7e738a 100644
--- a/debian/qtmobility-examples.install
+++ b/debian/qtmobility-examples.install
@@ -1,9 +1,9 @@
 usr/bin/accel
 usr/bin/arrowkeys
-usr/bin/audiodevices
-usr/bin/audioinput
-usr/bin/audiooutput
-usr/bin/audiorecorder
+#usr/bin/audiodevices
+#usr/bin/audioinput
+#usr/bin/audiooutput
+#usr/bin/audiorecorder
 usr/bin/battery-publisher
 usr/bin/bearercloud
 usr/bin/bearermonitor
@@ -15,11 +15,11 @@ usr/bin/lightmaps_with_location
 usr/bin/logfilepositionsource
 usr/bin/metadata
 usr/bin/orientation
-usr/bin/player
+#usr/bin/player
 usr/bin/publish-subscribe
 usr/bin/qmlcontacts
 usr/bin/qsysinfo
-usr/bin/radio
+#usr/bin/radio
 usr/bin/reading_perf
 usr/bin/samplephonebook
 usr/bin/satellitedialog
@@ -34,10 +34,10 @@ usr/bin/show_orientation
 usr/bin/show_proximity
 usr/bin/show_rotation
 usr/bin/show_tap
-usr/bin/slideshow
+#usr/bin/slideshow
 usr/bin/smallsensors
-usr/bin/videographicsitem
-usr/bin/videowidget
+#usr/bin/videographicsitem
+#usr/bin/videowidget
 usr/bin/weatherinfo_with_location
 usr/lib/qt4/plugins/sensors/libqtsensors_grueplugin.so
 usr/lib/qt4/plugins/serviceframework/libserviceframework_bluetoothtransferplugin.so
diff --git a/debian/rules b/debian/rules
index 8a137ad..46a2b3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,8 @@ override_dh_auto_configure:
 	    -libdir "/usr/lib" \
 	    -bindir "/usr/bin" \
 	    -plugindir "/usr/lib/qt4/plugins" \
-	    -examples
+	    -examples \
+	    -modules "bearer location contacts publishsubscribe versit systeminfo serviceframework sensors"
 
 override_dh_auto_clean:
 	dh_auto_clean

-- 
Qt Mobility packaging

More information about the pkg-kde-commits mailing list