Headers in m-a path, -dev is now m-a: same.

3 files changed, 49 insertions, 46 deletions

diff --git a/debian/changelog b/debian/changelog
index 6b11110..ccc2dd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ qtwebkit-opensource-src (5.3.0+dfsg-1) UNRELEASED; urgency=medium
   * Remove fix_ftbfs_in_archs_without_jit_support.patch and
     dont_pollute_pri_and_pc_with_private_deps.patch, applied upstream.
   * Refresh no_gc_sections.diff.
+  * Install headers in their new multi-arch qualified path. Marhe the
+    development package as Multi-Arch: same.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sat, 17 May 2014 23:25:31 -0300
 
diff --git a/debian/control b/debian/control
index 463ef09..ee3e83b 100644
--- a/debian/control
+++ b/debian/control
@@ -45,6 +45,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qt5webkit.git;a=summ
 Package: libqt5webkit5-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: libqt5webkit5 (= ${binary:Version}),
          qtbase5-dev,
diff --git a/debian/libqt5webkit5-dev.install b/debian/libqt5webkit5-dev.install
index ce23ae7..38caf83 100644
--- a/debian/libqt5webkit5-dev.install
+++ b/debian/libqt5webkit5-dev.install
@@ -1,49 +1,49 @@
-usr/include/qt5/QtWebKit/QWebDatabase
-usr/include/qt5/QtWebKit/QWebElement
-usr/include/qt5/QtWebKit/QWebElementCollection
-usr/include/qt5/QtWebKit/QWebFullScreenVideoHandler
-usr/include/qt5/QtWebKit/QWebHapticFeedbackPlayer
-usr/include/qt5/QtWebKit/QWebHistory
-usr/include/qt5/QtWebKit/QWebHistoryInterface
-usr/include/qt5/QtWebKit/QWebHistoryItem
-usr/include/qt5/QtWebKit/QWebKitPlatformPlugin
-usr/include/qt5/QtWebKit/QWebNotificationData
-usr/include/qt5/QtWebKit/QWebNotificationPresenter
-usr/include/qt5/QtWebKit/QWebPluginFactory
-usr/include/qt5/QtWebKit/QWebSecurityOrigin
-usr/include/qt5/QtWebKit/QWebSelectData
-usr/include/qt5/QtWebKit/QWebSelectMethod
-usr/include/qt5/QtWebKit/QWebSettings
-usr/include/qt5/QtWebKit/QWebSpellChecker
-usr/include/qt5/QtWebKit/QWebTouchModifier
-usr/include/qt5/QtWebKit/QtWebKit
-usr/include/qt5/QtWebKit/QtWebKitDepends
-usr/include/qt5/QtWebKit/QtWebKitVersion
-usr/include/qt5/QtWebKit/qtwebkitversion.h
-usr/include/qt5/QtWebKit/qwebdatabase.h
-usr/include/qt5/QtWebKit/qwebelement.h
-usr/include/qt5/QtWebKit/qwebhistory.h
-usr/include/qt5/QtWebKit/qwebhistoryinterface.h
-usr/include/qt5/QtWebKit/qwebkitglobal.h
-usr/include/qt5/QtWebKit/qwebkitplatformplugin.h
-usr/include/qt5/QtWebKit/qwebpluginfactory.h
-usr/include/qt5/QtWebKit/qwebsecurityorigin.h
-usr/include/qt5/QtWebKit/qwebsettings.h
-usr/include/qt5/QtWebKitWidgets/QGraphicsWebView
-usr/include/qt5/QtWebKitWidgets/QWebFrame
-usr/include/qt5/QtWebKitWidgets/QWebHitTestResult
-usr/include/qt5/QtWebKitWidgets/QWebInspector
-usr/include/qt5/QtWebKitWidgets/QWebPage
-usr/include/qt5/QtWebKitWidgets/QWebView
-usr/include/qt5/QtWebKitWidgets/QtWebKitWidgets
-usr/include/qt5/QtWebKitWidgets/QtWebKitWidgetsDepends
-usr/include/qt5/QtWebKitWidgets/QtWebKitWidgetsVersion
-usr/include/qt5/QtWebKitWidgets/qgraphicswebview.h
-usr/include/qt5/QtWebKitWidgets/qtwebkitwidgetsversion.h
-usr/include/qt5/QtWebKitWidgets/qwebframe.h
-usr/include/qt5/QtWebKitWidgets/qwebinspector.h
-usr/include/qt5/QtWebKitWidgets/qwebpage.h
-usr/include/qt5/QtWebKitWidgets/qwebview.h
+usr/include/*/qt5/QtWebKit/QWebDatabase
+usr/include/*/qt5/QtWebKit/QWebElement
+usr/include/*/qt5/QtWebKit/QWebElementCollection
+usr/include/*/qt5/QtWebKit/QWebFullScreenVideoHandler
+usr/include/*/qt5/QtWebKit/QWebHapticFeedbackPlayer
+usr/include/*/qt5/QtWebKit/QWebHistory
+usr/include/*/qt5/QtWebKit/QWebHistoryInterface
+usr/include/*/qt5/QtWebKit/QWebHistoryItem
+usr/include/*/qt5/QtWebKit/QWebKitPlatformPlugin
+usr/include/*/qt5/QtWebKit/QWebNotificationData
+usr/include/*/qt5/QtWebKit/QWebNotificationPresenter
+usr/include/*/qt5/QtWebKit/QWebPluginFactory
+usr/include/*/qt5/QtWebKit/QWebSecurityOrigin
+usr/include/*/qt5/QtWebKit/QWebSelectData
+usr/include/*/qt5/QtWebKit/QWebSelectMethod
+usr/include/*/qt5/QtWebKit/QWebSettings
+usr/include/*/qt5/QtWebKit/QWebSpellChecker
+usr/include/*/qt5/QtWebKit/QWebTouchModifier
+usr/include/*/qt5/QtWebKit/QtWebKit
+usr/include/*/qt5/QtWebKit/QtWebKitDepends
+usr/include/*/qt5/QtWebKit/QtWebKitVersion
+usr/include/*/qt5/QtWebKit/qtwebkitversion.h
+usr/include/*/qt5/QtWebKit/qwebdatabase.h
+usr/include/*/qt5/QtWebKit/qwebelement.h
+usr/include/*/qt5/QtWebKit/qwebhistory.h
+usr/include/*/qt5/QtWebKit/qwebhistoryinterface.h
+usr/include/*/qt5/QtWebKit/qwebkitglobal.h
+usr/include/*/qt5/QtWebKit/qwebkitplatformplugin.h
+usr/include/*/qt5/QtWebKit/qwebpluginfactory.h
+usr/include/*/qt5/QtWebKit/qwebsecurityorigin.h
+usr/include/*/qt5/QtWebKit/qwebsettings.h
+usr/include/*/qt5/QtWebKitWidgets/QGraphicsWebView
+usr/include/*/qt5/QtWebKitWidgets/QWebFrame
+usr/include/*/qt5/QtWebKitWidgets/QWebHitTestResult
+usr/include/*/qt5/QtWebKitWidgets/QWebInspector
+usr/include/*/qt5/QtWebKitWidgets/QWebPage
+usr/include/*/qt5/QtWebKitWidgets/QWebView
+usr/include/*/qt5/QtWebKitWidgets/QtWebKitWidgets
+usr/include/*/qt5/QtWebKitWidgets/QtWebKitWidgetsDepends
+usr/include/*/qt5/QtWebKitWidgets/QtWebKitWidgetsVersion
+usr/include/*/qt5/QtWebKitWidgets/qgraphicswebview.h
+usr/include/*/qt5/QtWebKitWidgets/qtwebkitwidgetsversion.h
+usr/include/*/qt5/QtWebKitWidgets/qwebframe.h
+usr/include/*/qt5/QtWebKitWidgets/qwebinspector.h
+usr/include/*/qt5/QtWebKitWidgets/qwebpage.h
+usr/include/*/qt5/QtWebKitWidgets/qwebview.h
 usr/lib/*/cmake/Qt5WebKit/Qt5WebKitConfig.cmake
 usr/lib/*/cmake/Qt5WebKit/Qt5WebKitConfigVersion.cmake
 usr/lib/*/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfig.cmake