[SCM] qtbase packaging branch, master, updated. debian/5.2.0+dfsg-6-3-gdd85a4c

Fri Jan 31 15:35:29 UTC 2014

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

The following commit has been merged in the master branch:
commit 6e19572397fa7d30e2e56e082beafb7fdaf5a37c
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Nov 29 15:34:11 2013 -0300

    Update install files.
---
 debian/changelog                   |  1 +
 debian/qtbase5-dev.install-common  | 35 ++++++++++++++---------------------
 debian/qtbase5-dev.install-linux   |  2 --
 debian/qtbase5-private-dev.install |  1 +
 4 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5daf611..624e6d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtbase-opensource-src (5.2.0~rc1+dfsg-1) UNRELEASED; urgency=low
   * New upstream release.
   * Upstream switched qreal to double for all archs. In Debian's case we will only
     keep armel and sh4 with qreal as float.
+  * Update install files.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 26 Nov 2013 19:31:35 +0400
 
diff --git a/debian/qtbase5-dev.install-common b/debian/qtbase5-dev.install-common
index 5c9f431..badea1d 100644
--- a/debian/qtbase5-dev.install-common
+++ b/debian/qtbase5-dev.install-common
@@ -55,11 +55,11 @@ usr/include/qt5/QtCore/QCharRef
 usr/include/qt5/QtCore/QChildEvent
 usr/include/qt5/QtCore/QCollator
 usr/include/qt5/QtCore/QCollatorSortKey
+usr/include/qt5/QtCore/QCommandLineOption
+usr/include/qt5/QtCore/QCommandLineParser
 usr/include/qt5/QtCore/QContiguousCache
 usr/include/qt5/QtCore/QContiguousCacheData
 usr/include/qt5/QtCore/QContiguousCacheTypedData
-usr/include/qt5/QtCore/QCommandLineOption
-usr/include/qt5/QtCore/QCommandLineParser
 usr/include/qt5/QtCore/QCoreApplication
 usr/include/qt5/QtCore/QCryptographicHash
 usr/include/qt5/QtCore/QDataStream
@@ -137,8 +137,8 @@ usr/include/qt5/QtCore/QList
 usr/include/qt5/QtCore/QListData
 usr/include/qt5/QtCore/QListIterator
 usr/include/qt5/QtCore/QLocale
-usr/include/qt5/QtCore/QLoggingCategory
 usr/include/qt5/QtCore/QLockFile
+usr/include/qt5/QtCore/QLoggingCategory
 usr/include/qt5/QtCore/QMap
 usr/include/qt5/QtCore/QMapData
 usr/include/qt5/QtCore/QMapDataBase
@@ -209,8 +209,8 @@ usr/include/qt5/QtCore/QSaveFile
 usr/include/qt5/QtCore/QScopedArrayPointer
 usr/include/qt5/QtCore/QScopedPointer
 usr/include/qt5/QtCore/QScopedPointerArrayDeleter
-usr/include/qt5/QtCore/QScopedPointerDeleter
 usr/include/qt5/QtCore/QScopedPointerDeleteLater
+usr/include/qt5/QtCore/QScopedPointerDeleter
 usr/include/qt5/QtCore/QScopedPointerObjectDeleteLater
 usr/include/qt5/QtCore/QScopedPointerPodDeleter
 usr/include/qt5/QtCore/QScopedValueRollback
@@ -268,8 +268,6 @@ usr/include/qt5/QtCore/QTimeLine
 usr/include/qt5/QtCore/QTimeZone
 usr/include/qt5/QtCore/QTimer
 usr/include/qt5/QtCore/QTimerEvent
-usr/include/qt5/QtCore/QTracer
-usr/include/qt5/QtCore/QTraceGuard
 usr/include/qt5/QtCore/QTranslator
 usr/include/qt5/QtCore/QTypeInfo
 usr/include/qt5/QtCore/QTypeInfoMerger
@@ -1505,18 +1503,13 @@ usr/lib/*/cmake/Qt5DBus/Qt5DBusMacros.cmake
 usr/lib/*/cmake/Qt5Gui/Qt5GuiConfig.cmake
 usr/lib/*/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake
 usr/lib/*/cmake/Qt5Gui/Qt5GuiConfigVersion.cmake
+usr/lib/*/cmake/Qt5Gui/Qt5Gui_QGifPlugin.cmake
 usr/lib/*/cmake/Qt5Gui/Qt5Gui_QICOPlugin.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake
 usr/lib/*/cmake/Qt5Gui/Qt5Gui_QJpegPlugin.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QGifPlugin.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QEvdevTouchScreenPlugin.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QComposePlatformInputContextPlugin.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake
 usr/lib/*/cmake/Qt5Gui/Qt5Gui_QLinuxFbIntegrationPlugin.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QEvdevTabletPlugin.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake
+usr/lib/*/cmake/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake
+usr/lib/*/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake
+usr/lib/*/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake
 usr/lib/*/cmake/Qt5Network/Qt5NetworkConfig.cmake
 usr/lib/*/cmake/Qt5Network/Qt5NetworkConfigVersion.cmake
 usr/lib/*/cmake/Qt5Network/Qt5Network_QConnmanEnginePlugin.cmake
@@ -1603,6 +1596,12 @@ usr/share/qt5/doc/global/qt-html-templates-online.qdocconf
 usr/share/qt5/doc/global/qt-module-defaults-offline.qdocconf
 usr/share/qt5/doc/global/qt-module-defaults-online.qdocconf
 usr/share/qt5/doc/global/qt-module-defaults.qdocconf
+usr/share/qt5/doc/global/template/images/Qt-dark_gradient.png
+usr/share/qt5/doc/global/template/images/Qt-footer-bg.jpg
+usr/share/qt5/doc/global/template/images/Qt-footer_shadow.png
+usr/share/qt5/doc/global/template/images/Qt-gradient.png
+usr/share/qt5/doc/global/template/images/Qt-header-bg.jpg
+usr/share/qt5/doc/global/template/images/Qt-logo.png
 usr/share/qt5/doc/global/template/images/arrow.png
 usr/share/qt5/doc/global/template/images/arrow_bc.png
 usr/share/qt5/doc/global/template/images/arrow_down.png
@@ -1633,11 +1632,5 @@ usr/share/qt5/doc/global/template/images/page.png
 usr/share/qt5/doc/global/template/images/page_bg.png
 usr/share/qt5/doc/global/template/images/spinner.gif
 usr/share/qt5/doc/global/template/images/sprites-combined.png
-usr/share/qt5/doc/global/template/images/Qt-dark_gradient.png
-usr/share/qt5/doc/global/template/images/Qt-footer-bg.jpg
-usr/share/qt5/doc/global/template/images/Qt-footer_shadow.png
-usr/share/qt5/doc/global/template/images/Qt-gradient.png
-usr/share/qt5/doc/global/template/images/Qt-header-bg.jpg
-usr/share/qt5/doc/global/template/images/Qt-logo.png
 usr/share/qt5/doc/global/template/style/offline.css
 usr/share/qt5/doc/global/template/style/online.css
diff --git a/debian/qtbase5-dev.install-linux b/debian/qtbase5-dev.install-linux
deleted file mode 100644
index 677df4d..0000000
--- a/debian/qtbase5-dev.install-linux
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QEvdevMousePlugin.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QEvdevKeyboardPlugin.cmake
diff --git a/debian/qtbase5-private-dev.install b/debian/qtbase5-private-dev.install
index 2353982..ee4cdae 100644
--- a/debian/qtbase5-private-dev.install
+++ b/debian/qtbase5-private-dev.install
@@ -359,6 +359,7 @@ usr/include/qt5/QtNetwork/*/QtNetwork/private/qnetworkreplydataimpl_p.h
 usr/include/qt5/QtNetwork/*/QtNetwork/private/qnetworkreplyfileimpl_p.h
 usr/include/qt5/QtNetwork/*/QtNetwork/private/qnetworkreplyhttpimpl_p.h
 usr/include/qt5/QtNetwork/*/QtNetwork/private/qnetworkreplyimpl_p.h
+usr/include/qt5/QtNetwork/*/QtNetwork/private/qnetworkreplynsurlconnectionimpl_p.h
 usr/include/qt5/QtNetwork/*/QtNetwork/private/qnetworkrequest_p.h
 usr/include/qt5/QtNetwork/*/QtNetwork/private/qnetworksession_p.h
 usr/include/qt5/QtNetwork/*/QtNetwork/private/qsharednetworksession_p.h

-- 
qtbase packaging

