[SCM] qtbase packaging branch, experimental, updated. debian/5.6.1+dfsg-2-5-ga9629c4

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit a9629c47a40d483590aa6e1691d5b2bd6f364abc
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jun 18 12:17:28 2016 +0300

    Update for upstream GTK+ 3 port.
    
    - Build-depend on libgtk-3-dev.
    - Rename libqt5libqgtk2 to qt5-gtk-platformtheme.
    - Make it a recommendation of libqt5gui5 rather than a suggestion.
---
 debian/changelog                     |  4 ++++
 debian/control                       | 14 ++++++--------
 debian/libqt5libqgtk2.install        |  1 -
 debian/qt5-gtk-platformtheme.install |  1 +
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a76221a..8590ed4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ qtbase-opensource-src (5.7.0+dfsg-1) UNRELEASED; urgency=medium
   * Drop lib/fonts/* from excluded files, these are no longer shipped
     (since upstream commit c5ceabb9a1caf6b9).
   * Refresh patches for the new release.
+  * Update for upstream GTK+ 3 port:
+    - Build-depend on libgtk-3-dev.
+    - Rename libqt5libqgtk2 to qt5-gtk-platformtheme.
+    - Make it a recommendation of libqt5gui5 rather than a suggestion.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 18 Jun 2016 11:38:32 +0300
 
diff --git a/debian/control b/debian/control
index 0c4213b..2df70af 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends: debhelper (>= 9),
                libglu1-mesa-dev | libglu-dev,
                libgstreamer-plugins-base1.0-dev,
                libgstreamer1.0-dev,
-               libgtk2.0-dev,
+               libgtk-3-dev,
                libharfbuzz-dev,
                libicu-dev,
                libinput-dev [linux-any],
@@ -93,30 +93,28 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: fontconfig, mesa-utils, ${misc:Depends}, ${shlibs:Depends}
-Recommends: libqt5svg5
+Recommends: libqt5svg5, qt5-gtk-platformtheme
 Breaks: libqt5egldeviceintegration5 (<< 5.6.0~beta+dfsg-5~),
         libqt5xcbqpa5 (<< 5.6.0~beta+dfsg-5~)
 Replaces: libqt5egldeviceintegration5 (<< 5.6.0~beta+dfsg-5~),
           libqt5xcbqpa5 (<< 5.6.0~beta+dfsg-5~)
-Suggests: libqt5libqgtk2, qt5-image-formats-plugins, qtwayland5
+Suggests: qt5-image-formats-plugins, qtwayland5
 Description: Qt 5 GUI module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
  The QtGui module extends QtCore with GUI functionality.
 
-Package: libqt5libqgtk2
+Package: qt5-gtk-platformtheme
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libqt5gui5 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Breaks: libqt5gui5 (<< 5.4.1+dfsg-3~)
-Replaces: libqt5gui5 (<< 5.4.1+dfsg-3~)
-Description: Qt 5 GTK2 platform theme
+Description: Qt 5 GTK+ 3 platform theme
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This package provides the GTK2 platform theme, which makes Qt use
+ This package provides the GTK+ 3 platform theme, which makes Qt use
  native icon themes, fonts, and dialogs on GTK-based environments.
 
 Package: libqt5network5
diff --git a/debian/libqt5libqgtk2.install b/debian/libqt5libqgtk2.install
deleted file mode 100644
index 2ce6d35..0000000
--- a/debian/libqt5libqgtk2.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/qt5/plugins/platformthemes/libqgtk2.so
diff --git a/debian/qt5-gtk-platformtheme.install b/debian/qt5-gtk-platformtheme.install
new file mode 100644
index 0000000..034dcd8
--- /dev/null
+++ b/debian/qt5-gtk-platformtheme.install
@@ -0,0 +1 @@
+usr/lib/*/qt5/plugins/platformthemes/libqgtk3.so

-- 
qtbase packaging