[SCM] QtWebKit packaging branch, master, updated. debian/2.2.0-5-24-gea2063c

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit ea2063c5b151c6e6fc3afb75892febdacde7b7c0
Author: Pino Toscano <pino at debian.org>
Date:   Tue May 1 15:01:54 2012 +0200

    mark libqtwebkit-qmlwebkitplugin as Multi-Arch: same
---
 debian/changelog |    1 +
 debian/control   |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6e03e4d..d80fb78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ qtwebkit (2.2.1-2) UNRELEASED; urgency=low
   * Bump Qt build dependency to 4:4.8.1 (for the change in paths of QML
     imports).
     - update debian/libqtwebkit-qmlwebkitplugin.install accordingly
+    - mark libqtwebkit-qmlwebkitplugin as Multi-Arch: same
   * Remove ${shlibs:Depends} from libqtwebkit4-dbg.
 
  -- Fathi Boudra <fabo at debian.org>  Tue, 01 May 2012 15:07:39 +0300
diff --git a/debian/control b/debian/control
index 6729f5c..860bdf7 100644
--- a/debian/control
+++ b/debian/control
@@ -47,6 +47,7 @@ Description: Web content engine library for Qt
 
 Package: libqtwebkit-qmlwebkitplugin
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt WebKit QML plugin
  QtWebKit provides a Web browser engine that makes it easy to embed content

-- 
QtWebKit packaging