[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.6.1+dfsg-3ubuntu2-10-ge76670e

Timo Jyrinki timo at moszumanska.debian.org
Thu Aug 25 06:50:37 UTC 2016


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

The following commit has been merged in the ubuntu branch:
commit 480d1454e49f0b85abec3c492ecd8542c9fd72ee
Merge: 6e1a2d1d9a7b09b3b22c1d316cebafc942c284b3 591ae1f15e782772a4abac3955063e12a651dd3d
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Fri Mar 18 09:32:12 2016 +0000

    Merge branch 'experimental' into ubuntu+1

 debian/90qt5-opengl              | 21 +++++++++++++++++++++
 debian/changelog                 | 29 ++++++++++++++++++++++++++++-
 debian/control                   |  2 +-
 debian/libqt5gui5.install-common |  1 +
 debian/watch                     |  2 +-
 5 files changed, 52 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index dde5947,ba3d59d..3bb6383
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,30 +1,41 @@@
- qtbase-opensource-src (5.6.0~rc+dfsg-1ubuntu1) UNRELEASED; urgency=medium
++qtbase-opensource-src (5.6.0+dfsg-2ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Timo Jyrinki ]
 +  * New upstream release. 
 +  * Migrate symbols using the script to the Qt_5 versioning scheme.
 +  * Update symbols and bump symbols abi.
 +  * Rebase and refresh enable-tests.patch.
 +  * Rebase qnam-ubuntu-fix6.patch.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 18 Jan 2016 10:06:17 +0000
 +
+ qtbase-opensource-src (5.6.0+dfsg-3) UNRELEASED; urgency=medium
+ 
+   * Improve the Xsession.d script so it won't fail if mesa-utils is
+     not installed. Also log why glxinfo is needed for this script.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 17 Mar 2016 09:59:33 -0300
+ 
+ qtbase-opensource-src (5.6.0+dfsg-2) experimental; urgency=medium
+ 
+   * Do not call exit on the Xsession.d script, as it's being sourced.
+   * Add mesa-utils as a libqt5gui5 dependency, needed for the script.
+   * Update symbols files with buildds' logs.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Thu, 17 Mar 2016 09:50:28 -0300
+ 
+ qtbase-opensource-src (5.6.0+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream release.
+     - Update debian/watch to point at official releases again.
+     - Fix division by zero in xcb plugin (Closes: #814729).
+   * Update symbols files with buidds' logs.
+   * Install the 90qt5-opengl script into Xsession.d in order to force
+     software rendering in case the user does not has at least OpenGL 2
+     support (Closes: #811195).
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Wed, 16 Mar 2016 13:02:52 -0300
+ 
  qtbase-opensource-src (5.6.0~rc+dfsg-1) experimental; urgency=medium
  
    [ Dmitry Shachnev ]
diff --cc debian/control
index b794fa6,151ae3e..e147117
--- a/debian/control
+++ b/debian/control
@@@ -93,12 -92,12 +93,12 @@@ Package: libqt5gui
  Architecture: any
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
- Depends: fontconfig, ${misc:Depends}, ${shlibs:Depends}
+ Depends: fontconfig, mesa-utils, ${misc:Depends}, ${shlibs:Depends}
  Recommends: libqt5svg5
 -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~)
 +Breaks: libqt5egldeviceintegration5 (<< 5.5.1+dfsg-13~),
 +        libqt5xcbqpa5 (<< 5.5.1+dfsg-13~)
 +Replaces: libqt5egldeviceintegration5 (<< 5.5.1+dfsg-13~),
 +          libqt5xcbqpa5 (<< 5.5.1+dfsg-13~)
  Suggests: libqt5libqgtk2, qt5-image-formats-plugins, qtwayland5
  Description: Qt 5 GUI module
   Qt is a cross-platform C++ application framework. Qt's primary feature

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list