Commit 29e8e00e authored by Lisandro Damián Nicanor Pérez Meyer's avatar Lisandro Damián Nicanor Pérez Meyer
Browse files

Revert part of the mkspecs movements between packages.

parent c9f8ac70

debian/changelog

+5 −0
Original line number Diff line number Diff line 
qtbase-opensource-src (5.11.3+dfsg-5) UNRELEASED; urgency=medium



  [ Lisandro Damián Nicanor Pérez Meyer ]

  * Revert part of the mkspecs movements between packages. The private ones

    where put into qtbase5-private-dev, but it seems that they are not ready

    for that (Closes: #921930).



 -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 10 Feb 2019 10:28:27 -0300



qtbase-opensource-src (5.11.3+dfsg-4) unstable; urgency=medium

debian/control

+2 −2
Original line number Diff line number Diff line
@@ -340,8 +340,8 @@ Suggests: default-libmysqlclient-dev, 
          libpq-dev,

          libsqlite3-dev,

          unixodbc-dev

Breaks: qt5-qmake (<< 5.11.3+dfsg-3~)

Replaces: qt5-qmake (<< 5.11.3+dfsg-3~)

Breaks: qt5-qmake (<< 5.11.3+dfsg-3~), qtbase5-private-dev (<< 5.11.3+dfsg-4)

Replaces: qt5-qmake (<< 5.11.3+dfsg-3~), qtbase5-private-dev (<< 5.11.3+dfsg-4)

Description: Qt 5 base development files

 Qt is a cross-platform C++ application framework. Qt's primary feature

 is its rich set of widgets that provide standard GUI functionality.

debian/qtbase5-dev.install

+31 −0
Original line number Diff line number Diff line
@@ -1753,3 +1753,34 @@ usr/share/qt5/doc/global/template/style/offline-simple.css 
usr/share/qt5/doc/global/template/style/offline.css

usr/share/qt5/doc/global/template/style/online.css

usr/share/qt5/doc/global/template/style/theqtcompany.png

[!armel !armhf] usr/lib/*/qt5/mkspecs/modules/qt_lib_glx_support_private.pri

[kfreebsd-any linux-any] usr/lib/*/qt5/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri

[kfreebsd-any linux-any] usr/lib/*/qt5/mkspecs/modules/qt_lib_eglfsdeviceintegration_private.pri

[kfreebsd-any linux-any] usr/lib/*/qt5/mkspecs/modules/qt_lib_kms_support_private.pri

[linux-any] usr/lib/*/qt5/mkspecs/modules/qt_lib_input_support_private.pri

[linux-any] usr/lib/*/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_concurrent_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_core_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_dbus_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_edid_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_egl_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_fb_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_fontdatabase_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_gui_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_network_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_opengl_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_printsupport_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_service_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_sql_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_testlib_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_theme_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_widgets_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_xml_private.pri

debian/qtbase5-private-dev.install

+0 −31
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
[!armel !armhf] usr/include/*/qt5/QtGlxSupport/qtglxsupportversion.h

[!armel !armhf] usr/lib/*/libQt5GlxSupport.a

[!armel !armhf] usr/lib/*/libQt5GlxSupport.prl

[!armel !armhf] usr/lib/*/qt5/mkspecs/modules/qt_lib_glx_support_private.pri

[kfreebsd-any linux-any] usr/include/*/qt5/QtEglFSDeviceIntegration/5.*/*

[kfreebsd-any linux-any] usr/include/*/qt5/QtEglFSDeviceIntegration/QtEglFSDeviceIntegration

[kfreebsd-any linux-any] usr/include/*/qt5/QtEglFSDeviceIntegration/QtEglFSDeviceIntegrationDepends
@@ -19,9 +18,6 @@ 
[kfreebsd-any linux-any] usr/include/*/qt5/QtKmsSupport/qtkmssupportversion.h

[kfreebsd-any linux-any] usr/lib/*/libQt5KmsSupport.a

[kfreebsd-any linux-any] usr/lib/*/libQt5KmsSupport.prl

[kfreebsd-any linux-any] usr/lib/*/qt5/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri

[kfreebsd-any linux-any] usr/lib/*/qt5/mkspecs/modules/qt_lib_eglfsdeviceintegration_private.pri

[kfreebsd-any linux-any] usr/lib/*/qt5/mkspecs/modules/qt_lib_kms_support_private.pri

[linux-any] usr/include/*/qt5/QtInputSupport/5.*/*

[linux-any] usr/include/*/qt5/QtInputSupport/QIntegrityHIDManager

[linux-any] usr/include/*/qt5/QtInputSupport/QtInputSupport
@@ -38,8 +34,6 @@ 
[linux-any] usr/lib/*/libQt5InputSupport.prl

[linux-any] usr/lib/*/libQt5VulkanSupport.a

[linux-any] usr/lib/*/libQt5VulkanSupport.prl

[linux-any] usr/lib/*/qt5/mkspecs/modules/qt_lib_input_support_private.pri

[linux-any] usr/lib/*/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri

usr/include/*/qt5/QtAccessibilitySupport/5.*/*

usr/include/*/qt5/QtAccessibilitySupport/QtAccessibilitySupport

usr/include/*/qt5/QtAccessibilitySupport/QtAccessibilitySupportDepends
@@ -127,28 +121,3 @@ usr/lib/*/libQt5ServiceSupport.a 
usr/lib/*/libQt5ServiceSupport.prl

usr/lib/*/libQt5ThemeSupport.a

usr/lib/*/libQt5ThemeSupport.prl
 
usr/lib/*/qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_concurrent_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_core_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_dbus_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_edid_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_egl_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_fb_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_fontdatabase_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_gui_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_network_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_opengl_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_printsupport_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_service_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_sql_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_testlib_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_theme_support_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_widgets_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri

usr/lib/*/qt5/mkspecs/modules/qt_lib_xml_private.pri