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

[Fathi Boudra]

The following commit has been merged in the master branch:
commit e84a82f1e7450ce80631cf25c66a3ebcf47baeb2
Merge: adc4c00f21fde3f9d4fbf9e5572ebc8e3d56649a 2d157dddaadbf5d2f3cf784c6bd92c022697b762
Author: Fathi Boudra <fabo at debian.org>
Date:   Sat Sep 11 19:13:56 2010 +0300

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-kde/qt/qtmobility
    
    Conflicts:
    	debian/changelog

 debian/changelog |    6 ++++++
 debian/control   |    8 +++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 96e6e2e,706deb8..c08952a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,11 +1,14 @@@
 -qtmobility (1.0.2-2) UNRELEASED; urgency=low
 +qtmobility (1.0.2-2) experimental; urgency=low
 +
++  [ Fathi Boudra ]
 +  * Split servicefw in his own package.
  
+   [ Pino Toscano ]
+   * Update debian/control:
+     - limit the libasound2-dev, libbluetooth-dev and network-manager-dev build
+       dependencies to linux-any (as they are Linux-specific).
+ 
 - -- Fathi Boudra <fabo at debian.org>  Mon, 06 Sep 2010 09:57:43 +0200
 + -- Fathi Boudra <fabo at debian.org>  Tue, 07 Sep 2010 12:37:57 +0300
  
  qtmobility (1.0.2-1) experimental; urgency=low
  
diff --cc debian/control
index 1c35eb1,53eaad8..5fe5cd0
--- a/debian/control
+++ b/debian/control
@@@ -4,9 -4,10 +4,11 @@@ Maintainer: Debian Qt/KDE Maintainers <
  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~rc1), libqt4-opengl-dev (>= 4:4.7.0~rc1),
-  libqtwebkit-dev (>= 2.0~week27), libasound2-dev, libbluetooth-dev,
-  libgstreamer-plugins-base0.10-dev, libpulse-dev, libx11-dev, libxext-dev,
-  libxv-dev, network-manager-dev, qmf-dev (>= 1.0~2010w35)
+  libqtwebkit-dev (>= 2.0~week27), libgstreamer-plugins-base0.10-dev,
+  libpulse-dev, libx11-dev, libxext-dev, libxv-dev, qmf-dev (>= 1.0~2010w35),
 - libasound2-dev [linux-any], libbluetooth-dev [linux-any],
++ libasound2-dev [linux-any],
++ libbluetooth-dev [linux-any],
+  network-manager-dev [linux-any]
  Standards-Version: 3.9.1
  Section: libs
  Homepage: http://labs.trolltech.com/page/Projects/QtMobility

-- 
Qt Mobility packaging