[SCM] QtWebKit packaging branch, qt5, updated. debian/2.2.1-5-14-g2d2c3f3

[Pino Toscano]

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

The following commit has been merged in the qt5 branch:
commit 2d2c3f3a147e64d94740434cd4362edb43f34fe3
Author: Pino Toscano <pino at debian.org>
Date:   Sun Apr 21 21:01:35 2013 +0200

    no-op sorting of .install files
---
 debian/libqt5webkit5-dev.install |  145 +++++++++++++++++++-------------------
 debian/libqt5webkit5.install     |    2 +-
 2 files changed, 73 insertions(+), 74 deletions(-)

diff --git a/debian/libqt5webkit5-dev.install b/debian/libqt5webkit5-dev.install
index ea008ac..8246c25 100644
--- a/debian/libqt5webkit5-dev.install
+++ b/debian/libqt5webkit5-dev.install
@@ -1,93 +1,92 @@
-usr/include/qt5/QtWebKit/qwebsettings.h
-usr/include/qt5/QtWebKit/qwebhistoryinterface.h
-usr/include/qt5/QtWebKitWidgets/qgraphicswebview.h
-usr/include/qt5/QtWebKit/QWebSpellChecker
-usr/include/qt5/QtWebKit/qwebelement.h
-usr/include/qt5/QtWebKit/qwebkitglobal.h
-usr/include/qt5/QtWebKitWidgets/QGraphicsWebView
-usr/include/qt5/QtWebKit/qwebhistory.h
-usr/include/qt5/QtWebKit/QWebHapticFeedbackPlayer
-usr/include/qt5/QtWebKit/QWebDatabase
-usr/include/qt5/QtWebKit/QWebSelectData
-usr/include/qt5/QtWebKit/QWebTouchModifier
-usr/include/qt5/QtWebKit/QWebKitPlatformPlugin
-usr/include/qt5/QtWebKit/QWebElement
-usr/include/qt5/QtWebKitWidgets/QWebPage
-usr/include/qt5/QtWebKitWidgets/QtWebKitWidgetsVersion
-usr/include/qt5/QtWebKit/QWebFullScreenVideoHandler
-usr/include/qt5/QtWebKitWidgets/QWebHitTestResult
-usr/include/qt5/QtWebKitWidgets/QWebFrame
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qrawwebview_p_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebpermissionrequest_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebscriptworld.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/bytearraytestdata.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qhttpheader_p.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qquicknetworkreply_p.h
 usr/include/qt5/QtWebKit/*/QtWebKit/private/qquicknetworkrequest_p.h
-usr/include/qt5/QtWebKitWidgets/*/QtWebKitWidgets/private/qwebinspector_p.h
-usr/include/qt5/QtWebKitWidgets/*/QtWebKitWidgets/private/qwebframe_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebpreferences_p_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebplugindatabase_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebiconimageprovider_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qquickwebview_p_p.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qquickurlschemedelegate_p.h
 usr/include/qt5/QtWebKit/*/QtWebKit/private/qquickwebpage_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebdatabase_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/util.h
-usr/include/qt5/QtWebKitWidgets/*/QtWebKitWidgets/private/qwebviewaccessible_p.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qquickwebpage_p_p.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qquickwebview_p.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qquickwebview_p_p.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qrawwebview_p.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qrawwebview_p_p.h
 usr/include/qt5/QtWebKit/*/QtWebKit/private/qtwebsecurityorigin_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/testwindow.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebscriptworld_p.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebdatabase_p.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebdownloaditem_p.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebdownloaditem_p_p.h
 usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebelement_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebnavigationrequest_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebloadrequest_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qquickwebview_p.h
 usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebhistory_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qhttpheader_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebdownloaditem_p_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qquickurlschemedelegate_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebpreferences_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qquickwebpage_p_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebnavigationhistory_p_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qrawwebview_p.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebiconimageprovider_p.h
 usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebkittest_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebsecurityorigin_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qquicknetworkreply_p.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/bytearraytestdata.h
-usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebdownloaditem_p.h
-usr/include/qt5/QtWebKitWidgets/*/QtWebKitWidgets/private/qwebpage_p.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebloadrequest_p.h
 usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebnavigationhistory_p.h
-usr/include/qt5/QtWebKitWidgets/qwebframe.h
-usr/include/qt5/QtWebKitWidgets/QtWebKitWidgets
-usr/include/qt5/QtWebKitWidgets/QWebInspector
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebnavigationhistory_p_p.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebnavigationrequest_p.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebpermissionrequest_p.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebplugindatabase_p.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebpreferences_p.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebpreferences_p_p.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebscriptworld.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebscriptworld_p.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/qwebsecurityorigin_p.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/testwindow.h
+usr/include/qt5/QtWebKit/*/QtWebKit/private/util.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/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/*/QtWebKitWidgets/private/qwebframe_p.h
+usr/include/qt5/QtWebKitWidgets/*/QtWebKitWidgets/private/qwebinspector_p.h
+usr/include/qt5/QtWebKitWidgets/*/QtWebKitWidgets/private/qwebpage_p.h
+usr/include/qt5/QtWebKitWidgets/*/QtWebKitWidgets/private/qwebviewaccessible_p.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/QtWebKit/QWebSecurityOrigin
+usr/include/qt5/QtWebKitWidgets/QtWebKitWidgets
+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/QWebPluginFactory
-usr/include/qt5/QtWebKit/QWebElementCollection
-usr/include/qt5/QtWebKit/QWebHistory
-usr/include/qt5/QtWebKit/QWebSettings
-usr/include/qt5/QtWebKit/QWebHistoryItem
-usr/include/qt5/QtWebKit/qwebkitplatformplugin.h
-usr/include/qt5/QtWebKit/qwebdatabase.h
-usr/include/qt5/QtWebKit/qwebsecurityorigin.h
-usr/include/qt5/QtWebKitWidgets/qtwebkitwidgetsversion.h
-usr/lib/*/libQt5WebKitWidgets.prl
-usr/lib/*/libQt5WebKitWidgets.so
-usr/lib/*/pkgconfig/Qt5WebKitWidgets.pc
-usr/share/qt5/mkspecs/modules/qt_lib_webkitwidgets.pri
-usr/lib/*/libQt5WebKit.so
-usr/share/qt5/mkspecs/modules/qt_lib_webkit.pri
-usr/include/qt5/QtWebKit/QtWebKit
-usr/include/qt5/QtWebKit/QtWebKitVersion
-usr/include/qt5/QtWebKit/qtwebkitversion.h
-usr/lib/*/libQt5WebKit.prl
 usr/lib/*/cmake/Qt5WebKit/Qt5WebKitConfig.cmake
 usr/lib/*/cmake/Qt5WebKit/Qt5WebKitConfigVersion.cmake
-usr/lib/*/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfigVersion.cmake
 usr/lib/*/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfig.cmake
+usr/lib/*/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfigVersion.cmake
+usr/lib/*/libQt5WebKit.prl
+usr/lib/*/libQt5WebKit.so
+usr/lib/*/libQt5WebKitWidgets.prl
+usr/lib/*/libQt5WebKitWidgets.so
 usr/lib/*/pkgconfig/Qt5WebKit.pc
-
+usr/lib/*/pkgconfig/Qt5WebKitWidgets.pc
+usr/share/qt5/mkspecs/modules/qt_lib_webkit.pri
+usr/share/qt5/mkspecs/modules/qt_lib_webkitwidgets.pri
diff --git a/debian/libqt5webkit5.install b/debian/libqt5webkit5.install
index 5ce1a9b..bf7a414 100644
--- a/debian/libqt5webkit5.install
+++ b/debian/libqt5webkit5.install
@@ -1,4 +1,4 @@
-usr/lib/*/libQt5WebKitWidgets.so.*
 usr/lib/*/libQt5WebKit.so.*
+usr/lib/*/libQt5WebKitWidgets.so.*
 usr/lib/*/qt5/libexec/QtWebPluginProcess
 usr/lib/*/qt5/libexec/QtWebProcess

-- 
QtWebKit packaging