[SCM] QtWebKit packaging branch, master, updated. debian/2.2.0-5-22-g2c3006e

[Fathi Boudra]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=edeb84c

The following commit has been merged in the master branch:
commit edeb84c898ede8495776480590c929b9ea8be749
Merge: ba3021366da2cb145badd9ee082807502427f0d3 49d809922dc37a5557bf76dee0e74707302f6ecd
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue May 1 15:51:57 2012 +0300

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

 debian/changelog                                   |    7 +++++++
 debian/control                                     |    4 ++--
 debian/libqtwebkit-qmlwebkitplugin.install         |    4 ++--
 .../{glibc_mkspec.diff => glibc_hurd_mkspecs.diff} |   11 ++++++-----
 debian/patches/series                              |    2 +-
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index 310a01c,456f76e..525b2f1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -2,8 -2,14 +2,15 @@@ qtwebkit (2.2.1-2) UNRELEASED; urgency=
  
    * Upload to Sid.
    * Build with -gstabs on armhf instead of -g, like armel.
 +  * Re-add adjust_symbols_visibility_for_webcore.diff.
  
+   [ Pino Toscano ]
+   * glibc_mkspec.diff: rename to glibc_hurd_mkspecs.diff, and extend to
+     apply also to the hurd-g++ mkspec.
+   * Bump Qt build dependency to 4:4.8.1~ (for the change in paths of QML
+     imports).
+     - update debian/libqtwebkit-qmlwebkitplugin.install accordingly
+ 
   -- Fathi Boudra <fabo at debian.org>  Tue, 01 May 2012 15:07:39 +0300
  
  qtwebkit (2.2.1-1) experimental; urgency=low

-- 
QtWebKit packaging