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

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 77f20aa1cf0bf2a74507f9f604d95ea632d969f4
Author: Fathi Boudra <fabo at debian.org>
Date:   Sun Jun 19 21:04:29 2011 +0300

    Restore icheck and conflicts against icheck package.
---
 debian/changelog              |    1 +
 debian/control                |    1 +
 debian/qtmobility-dev.install |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bc8b7b3..2aa348a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtmobility (1.2.0-1) unstable; urgency=low
 
   * New upstream release.
   * Drop revert_QTMOBILITY-614.patch.
+  * Restore icheck and conflicts against icheck package.
 
  -- Fathi Boudra <fabo at debian.org>  Sun, 19 Jun 2011 14:49:12 +0300
 
diff --git a/debian/control b/debian/control
index 9d686e2..438797b 100644
--- a/debian/control
+++ b/debian/control
@@ -44,6 +44,7 @@ Depends: libqtconnectivity1 (= ${binary:Version}),
          servicefw,
          ${misc:Depends},
          ${shlibs:Depends}
+Conflicts: icheck
 Description: APIs for mobile device functionality - development files
  Qt Mobility delivers a set of new APIs for mobile device functionality.
  .
diff --git a/debian/qtmobility-dev.install b/debian/qtmobility-dev.install
index 4272aa4..7d903b0 100644
--- a/debian/qtmobility-dev.install
+++ b/debian/qtmobility-dev.install
@@ -1,3 +1,4 @@
+usr/bin/icheck
 usr/bin/qcrmlgen
 usr/bin/servicedbgen
 usr/bin/servicexmlgen

-- 
Qt Mobility packaging