[SCM] Qt Mobility packaging branch, master, updated. debian/1.0.1-2-5-geee947b

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 379be2c9ce3f387aa5552eee0c67e5a0107cdffb
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Jul 20 17:54:25 2010 +0300

    Disable Qt Mobility Bearer management module. It is merged in Qt as Qt
    Network Bearer management module after Qt 4.7.0 beta 2 release.
---
 debian/changelog                   |    2 ++
 debian/control                     |   11 -----------
 debian/qtmobility-dev.install      |    8 --------
 debian/qtmobility-examples.install |    5 -----
 debian/rules                       |    3 ++-
 5 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 074673e..9a36a52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtmobility (1.0.1-3) UNRELEASED; urgency=low
 
+  * Disable Qt Mobility Bearer management module. It is merged in Qt as Qt
+    Network Bearer management module after Qt 4.7.0 beta 2 release.
   * Update debian/control:
     - add libgstreamer-plugins-base0.10-dev build dependency.
 
diff --git a/debian/control b/debian/control
index f0c04b5..e66e1fb 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Package: qtmobility-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libqtbearer1 (= ${binary:Version}),
  libqtcontacts1 (= ${binary:Version}),
  libqtlocation1 (= ${binary:Version}),
  libqtmessaging1 (= ${binary:Version}),
@@ -33,15 +32,6 @@ Description: APIs for mobile device functionality - development files
  This package contains the development files needed to build Qt applications
  using Qt Mobility libraries.
 
-Package: libqtbearer1
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: qtmobility-l10n
-Description: Qt Mobility Bearer Management module
- Qt Mobility delivers a set of new APIs for mobile device functionality.
- .
- This package contains an API to control the system's connectivity state.
-
 Package: libqtcontacts1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -177,7 +167,6 @@ Priority: extra
 Architecture: any
 Section: debug
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libqtbearer1 (= ${binary:Version}),
  libqtcontacts1 (= ${binary:Version}),
  libqtlocation1 (= ${binary:Version}),
  libqtmessaging1 (= ${binary:Version}),
diff --git a/debian/qtmobility-dev.install b/debian/qtmobility-dev.install
index 0ef0be0..f4a9998 100644
--- a/debian/qtmobility-dev.install
+++ b/debian/qtmobility-dev.install
@@ -4,12 +4,6 @@ usr/bin/servicedbgen
 usr/bin/servicefw
 usr/bin/servicexmlgen
 usr/bin/vsexplorer
-usr/include/QtBearer/QNetworkConfiguration
-usr/include/QtBearer/QNetworkConfigurationManager
-usr/include/QtBearer/QNetworkSession
-usr/include/QtBearer/qnetworkconfigmanager.h
-usr/include/QtBearer/qnetworkconfiguration.h
-usr/include/QtBearer/qnetworksession.h
 usr/include/QtContacts/QContact
 usr/include/QtContacts/QContactAbstractRequest
 usr/include/QtContacts/QContactAddress
@@ -379,8 +373,6 @@ usr/include/QtVersit/qversitreader.h
 usr/include/QtVersit/qversitresourcehandler.h
 usr/include/QtVersit/qversitwriter.h
 usr/include/qmobilityglobal.h
-usr/lib/libQtBearer.prl
-usr/lib/libQtBearer.so
 usr/lib/libQtContacts.prl
 usr/lib/libQtContacts.so
 usr/lib/libQtLocation.prl
diff --git a/debian/qtmobility-examples.install b/debian/qtmobility-examples.install
index 1f23e6a..f501a39 100644
--- a/debian/qtmobility-examples.install
+++ b/debian/qtmobility-examples.install
@@ -5,14 +5,10 @@ usr/bin/audioinput
 usr/bin/audiooutput
 usr/bin/audiorecorder
 usr/bin/battery-publisher
-usr/bin/bearercloud
-usr/bin/bearermonitor
 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
 usr/bin/orientation
@@ -41,7 +37,6 @@ usr/bin/slideshow
 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
diff --git a/debian/rules b/debian/rules
index c8cedef..7ea8cf2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,8 @@ override_dh_auto_configure:
 	    -libdir "/usr/lib" \
 	    -bindir "/usr/bin" \
 	    -plugindir "/usr/lib/qt4/plugins" \
-	    -examples
+	    -examples \
+	    -modules "location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors"
 
 override_dh_auto_clean:
 	dh_auto_clean

-- 
Qt Mobility packaging