[SCM] Qt Mobility packaging branch, master, updated. debian/1.0.1-1-1-g0605e39

Fathi Boudra fabo at alioth.debian.org
Tue Jul 13 06:50:05 UTC 2010


The following commit has been merged in the master branch:
commit 0605e3901bc36bf89542dbac6dc4fed58b13321f
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Jul 13 09:49:08 2010 +0300

    enable Qt Mobility MultimediaKit module
---
 debian/changelog                   |    8 ++
 debian/control                     |   36 +++---
 debian/qtmobility-dev.install      |  228 ++++++++++++++++++------------------
 debian/qtmobility-examples.install |   18 ++--
 debian/rules                       |    3 +-
 5 files changed, 150 insertions(+), 143 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1179160..58d3905 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qtmobility (1.0.1-2) experimental; urgency=low
+
+  * Update debian/control:
+    - enable Qt Mobility MultimediaKit module.
+    - build depends on Qt 4.7.0~beta2.
+
+ -- Fathi Boudra <fabo at debian.org>  Tue, 13 Jul 2010 09:40:30 +0300
+
 qtmobility (1.0.1-1) experimental; urgency=low
 
   * Initial release (Closes: #585012)
diff --git a/debian/control b/debian/control
index 5b11384..f92e2db 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ 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), pkg-kde-tools (>= 0.6.4),
- libqt4-dev (>= 4:4.7.0~beta1), libqt4-opengl-dev (>= 4:4.7.0~beta1),
+ libqt4-dev (>= 4:4.7.0~beta2), libqt4-opengl-dev (>= 4:4.7.0~beta2),
  libasound2-dev, libbluetooth-dev, libpulse-dev, libx11-dev,
  network-manager-dev, qmf-dev
 Standards-Version: 3.9.0
@@ -20,7 +20,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  libqtcontacts1 (= ${binary:Version}),
  libqtlocation1 (= ${binary:Version}),
  libqtmessaging1 (= ${binary:Version}),
-# libqtmultimediakit1 (= ${binary:Version}),
+ libqtmultimediakit1 (= ${binary:Version}),
  libqtpublishsubscribe1 (= ${binary:Version}),
  libqtsensors1 (= ${binary:Version}),
  libqtserviceframework1 (= ${binary:Version}),
@@ -67,14 +67,14 @@ Description: Qt Mobility Messaging module
  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}
-#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
@@ -120,13 +120,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
@@ -162,7 +162,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  libqtcontacts1 (= ${binary:Version}),
  libqtlocation1 (= ${binary:Version}),
  libqtmessaging1 (= ${binary:Version}),
-# libqtmultimediakit1 (= ${binary:Version}),
+ libqtmultimediakit1 (= ${binary:Version}),
  libqtpublishsubscribe1 (= ${binary:Version}),
  libqtsensors1 (= ${binary:Version}),
  libqtserviceframework1 (= ${binary:Version}),
diff --git a/debian/qtmobility-dev.install b/debian/qtmobility-dev.install
index 2697b06..0ef0be0 100644
--- a/debian/qtmobility-dev.install
+++ b/debian/qtmobility-dev.install
@@ -180,118 +180,118 @@ 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
-#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
@@ -387,8 +387,8 @@ 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/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 dde60ff..959ae54 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
@@ -16,12 +16,12 @@ 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/querymessages
-#usr/bin/radio
+usr/bin/radio
 usr/bin/reading_perf
 usr/bin/samplephonebook
 usr/bin/satellitedialog
@@ -37,10 +37,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/bin/writemessage
 usr/lib/qt4/plugins/sensors/libqtsensors_grueplugin.so
diff --git a/debian/rules b/debian/rules
index fc524c1..c8cedef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,8 +17,7 @@ override_dh_auto_configure:
 	    -libdir "/usr/lib" \
 	    -bindir "/usr/bin" \
 	    -plugindir "/usr/lib/qt4/plugins" \
-	    -examples \
-	    -modules "bearer location contacts publishsubscribe versit messaging systeminfo serviceframework sensors"
+	    -examples
 
 override_dh_auto_clean:
 	dh_auto_clean

-- 
Qt Mobility packaging



More information about the pkg-kde-commits mailing list