[SCM] QtWebKit packaging branch, master, updated. debian/2.0-week26-2-1-g54c7740

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 54c77401ffd220c71b78fd1f83d7bddfe51e18cb
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Jul 13 13:30:38 2010 +0300

    Add epoch to avoid conflict with libqt4-dev.
    Update debian/control: build depends on Qt 4.7.0 beta 2.
---
 debian/changelog |    8 ++++++++
 debian/control   |    4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c13f496..73a63e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qtwebkit (1:2.0~week27-1) experimental; urgency=low
+
+  * New upstream release.
+  * Add epoch to avoid conflict with libqt4-dev.
+  * Update debian/control: build depends on Qt 4.7.0 beta 2.
+
+ -- Fathi Boudra <fabo at debian.org>  Tue, 13 Jul 2010 13:24:07 +0300
+
 qtwebkit (2.0~week26-2) experimental; urgency=low
 
   * Fix FTBFS on GNU/kFreeBSD caused by missing strnstr() on glibc systems.
diff --git a/debian/control b/debian/control
index 101ebc4..bd0f50e 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.6.0), libqt4-opengl-dev (>= 4:4.6.0),
+ libqt4-dev (>= 4:4.7.0~beta2), libqt4-opengl-dev (>= 4:4.7.0~beta2),
  libphonon-dev (>= 4:4.6.0), libicu-dev, libsqlite3-dev,
  libxext-dev, libxrender-dev, gperf
 Standards-Version: 3.9.0
@@ -16,7 +16,7 @@ Package: libqtwebkit-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends}, libqtwebkit4 (= ${binary:Version}),
- libqt4-dev (>= 4:4.6.0)
+ libqt4-dev (>= 4:4.7.0~beta2)
 Replaces: libqt4-dev (<= 4:4.7.0~beta1)
 Description: Web content engine library for Qt - development files
  QtWebKit provides a Web browser engine that makes it easy to embed content

-- 
QtWebKit packaging