[SCM] Qt Mobility packaging branch, master, updated. debian/1.2.0-beta0+git3174-2-7-g3e3acb5

Fathi Boudra fabo at alioth.debian.org
Sun Jun 19 18:08:43 UTC 2011


The following commit has been merged in the master branch:
commit 621a22a236a720c934856ccad742ebe8857c1738
Author: Fathi Boudra <fabo at debian.org>
Date:   Sun Jun 19 21:06:39 2011 +0300

    Update debian/qtmobility-dev.install: add ndefhandlergen and update
    headers.
---
 debian/changelog                             |    2 ++
 debian/qtmobility-dev.install                |    6 +++++-
 debian/qtmobility-examples.lintian-overrides |   26 --------------------------
 3 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2aa348a..01820ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtmobility (1.2.0-1) unstable; urgency=low
   * New upstream release.
   * Drop revert_QTMOBILITY-614.patch.
   * Restore icheck and conflicts against icheck package.
+  * Update debian/qtmobility-dev.install: add ndefhandlergen and update
+    headers.
 
  -- Fathi Boudra <fabo at debian.org>  Sun, 19 Jun 2011 14:49:12 +0300
 
diff --git a/debian/qtmobility-dev.install b/debian/qtmobility-dev.install
index 7d903b0..19af027 100644
--- a/debian/qtmobility-dev.install
+++ b/debian/qtmobility-dev.install
@@ -1,4 +1,5 @@
 usr/bin/icheck
+usr/bin/ndefhandlergen
 usr/bin/qcrmlgen
 usr/bin/servicedbgen
 usr/bin/servicexmlgen
@@ -16,6 +17,7 @@ usr/include/QtConnectivity/QBluetoothTransferManager
 usr/include/QtConnectivity/QBluetoothTransferReply
 usr/include/QtConnectivity/QBluetoothTransferRequest
 usr/include/QtConnectivity/QBluetoothUuid
+usr/include/QtConnectivity/QDeclarativeNdefRecord
 usr/include/QtConnectivity/QL2capServer
 usr/include/QtConnectivity/QL2capSocket
 usr/include/QtConnectivity/QLlcpServer
@@ -135,6 +137,7 @@ usr/include/QtLocation/QGeoBoundingCircle
 usr/include/QtLocation/QGeoCoordinate
 usr/include/QtLocation/QGeoManeuver
 usr/include/QtLocation/QGeoMapCircleObject
+usr/include/QtLocation/QGeoMapCustomObject
 usr/include/QtLocation/QGeoMapData
 usr/include/QtLocation/QGeoMapGroupObject
 usr/include/QtLocation/QGeoMapObject
@@ -221,7 +224,6 @@ usr/include/QtMessaging/QMessageId
 usr/include/QtMessaging/QMessageManager
 usr/include/QtMessaging/QMessageService
 usr/include/QtMessaging/QMessageSortOrder
-usr/include/QtMessaging/QMessageStore
 usr/include/QtMobility/QLatin1Constant
 usr/include/QtMobility/qlatin1constant.h
 usr/include/QtMobility/qmalgorithms.h
@@ -243,6 +245,8 @@ usr/include/QtMultimediaKit/QAudioInput
 usr/include/QtMultimediaKit/QAudioOutput
 usr/include/QtMultimediaKit/QAudioSystemPlugin
 usr/include/QtMultimediaKit/QCamera
+usr/include/QtMultimediaKit/QCameraCaptureBufferFormatControl
+usr/include/QtMultimediaKit/QCameraCaptureDestinationControl
 usr/include/QtMultimediaKit/QCameraControl
 usr/include/QtMultimediaKit/QCameraExposure
 usr/include/QtMultimediaKit/QCameraExposureControl
diff --git a/debian/qtmobility-examples.lintian-overrides b/debian/qtmobility-examples.lintian-overrides
index 7420f56..f2140c2 100644
--- a/debian/qtmobility-examples.lintian-overrides
+++ b/debian/qtmobility-examples.lintian-overrides
@@ -1,27 +1 @@
 qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/battery-subscriber/content/bubble.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/content-sfw-dialer/call.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/content-sfw-dialer/hangup.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/content-sfw-notes/icons/addIcon.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/content-sfw-notes/icons/deleteIcon.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/content-sfw-notes/icons/nextIcon.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/content-sfw-notes/icons/prevIcon.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/content-sfw-notes/icons/searchIcon.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/flickrmobile/images/gloss.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/flickrmobile/images/lineedit.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/flickrmobile/images/moon.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/flickrmobile/images/quit.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/flickrmobile/images/star.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/flickrmobile/images/stripes.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/flickrmobile/images/sun.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/flickrmobile/images/titlebar.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/flickrmobile/images/toolbutton.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/landmarkmapmobile/images/gloss.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/landmarkmapmobile/images/landmarkstar.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/landmarkmapmobile/images/lineedit.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/landmarkmapmobile/images/moon.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/landmarkmapmobile/images/quit.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/landmarkmapmobile/images/star.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/landmarkmapmobile/images/stripes.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/landmarkmapmobile/images/sun.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/landmarkmapmobile/images/titlebar.png
-qtmobility-examples: image-file-in-usr-lib usr/lib/qtmobility/examples/landmarkmapmobile/images/toolbutton.png

-- 
Qt Mobility packaging



More information about the pkg-kde-commits mailing list