[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:58 UTC 2016


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

The following commit has been merged in the ubuntu branch:
commit cc03ca9c33fbd67a0f290b5b2c6369950e1ae72d
Merge: cf22b9c6552cc13581ba0787625838c8193d4155 06611f3dd7d066044ca8e85b2777f135d9b89f5f
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Fri Apr 15 09:44:17 2016 +0000

    Merge branch 'ubuntu' into ubuntu+1

 debian/changelog                                   |  7 ++++
 ...-Mali-T760-Mali-T720-from-supporting-BGRA.patch | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 49 insertions(+)

diff --cc debian/changelog
index 83c95a2,9fe6347..2d2f56a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,176 -1,10 +1,183 @@@
 +qtbase-opensource-src (5.6.0+dfsg-2ubuntu1) UNRELEASED; urgency=medium
 +
 +  * 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.
 +  * Mark private symbols.
 +  * Drop xcb_fix_parent_screen_of_embedded_windows.patch:
 +    - Fixed differently in Qt 5.6.
 +  * Tests enablement for Qt 5.6.
 +
 + -- 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 ]
 +  * New upstream release candidate.
 +  * Merge 5.5.1+dfsg-15 from master.
 +  * Drop the following patches, all applied upstream:
 +    - Fix-falsely-reported-style-for-fallback-font.patch
 +    - Prefer-QT_PLUGIN_PATH-over-compiled-in-paths.patch
 +    - Remove-historical-4-padding-in-QFontEngine-alphaMapF.patch
 +    - multiscreen.diff
 +    - qnativesocketengine_freebsd.diff
 +    - qt_functions_missing_eval.diff
 +    - xcb-fix-yet-another-crash-when-screens-are-disconnec.patch
 +    - xcb_dont_select_XInput_events_on_root_window.patch
 +    - xcb_fix_drag_and_drop_when_window_is_hidden.patch
 +  * Add new build-dependency on libxcb-xinerama0-dev.
 +  * Update symbols files from the build log.
 +
 +  [ Lisandro Damián Nicanor Pérez Meyer ]
 +  * Add fix_alsa_detection.patch to workaround ALSA >= 1.1.0 detection. The
 +    patch is a simple workaround, a proper bug has been opened upstream as
 +    stated in the patch's headers.
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 05 Mar 2016 10:35:53 +0300
 +
 +qtbase-opensource-src (5.6.0~beta+dfsg-5) experimental; urgency=medium
 +
 +  * Fix URLs pointing to our "How to package Qt based stuff" page
 +    (Closes: #810282). Thanks Jakob Haufe for the pointer.
 +  * Merge 5.5.1+dfsg-13's changes into the experimental branch.
 +    - Bump libqt5gui5's Breaks+Replaces so that users who installed
 +      the experimental version have a proper package update.
 +  * Remove the transitional package libqt5xcbqpa5, their only rdeps
 +    lived in sid/testing and already removed it.
 +  * Merge 5.5.1+dfsg-14 from master, importing fix_not_delivering_focus.patch.
 +
 + -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Mon, 15 Feb 2016 15:49:42 -0300
 +
 +qtbase-opensource-src (5.6.0~beta+dfsg-4) experimental; urgency=medium
 +
 +  * Drop unused dbus build-dependency.
 +  * Stop running pkgkde-mark-qt5-private-symbols script during build. The new
 +    way is that the maintainers run it themselves after each symbols update.
 +  * Make sure dh_installchangelogs is called even when upstream changelog is
 +    not present.
 +  * Use wildcards instead of hardcoded ABI versions in Lintian overrides files.
 +  * Merge 5.5.1+dfsg-11 and 5.5.1+dfsg-12 unstable uploads.
 +    - Refresh patches.
 +  * When merging install files, take DEB_HOST_ARCH_CPU into account, instead of
 +    DEB_HOST_ARCH. This is much more useful for us, because it allows us not to
 +    ship identical files for i386, hurd-i386 and kfreebsd-i386.
 +  * Exclude qdoc documentation from debian/qtbase5-doc-html.install (moved to
 +    qttools module).
 +  * Remove qdoc mention from qtbase5-dev-tools package description.
 +  * Re-enable building the documentation.
 +    - Add libqt5sql5-sqlite and qttools5-dev-tools to Build-Depends-Indep.
 +  * README.source:
 +    - Update the section on marking the private symbols.
 +    - Add a new section about bootstrapping the docs packages.
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 08 Jan 2016 10:21:22 +0300
 +
 +qtbase-opensource-src (5.6.0~beta+dfsg-3) experimental; urgency=medium
 +
 +  * Add qt_functions_missing_eval.diff to make qmake generate proper code for
 +    custom plugin paths. This change is needed to make qtimageformats tests
 +    success.
 +  * Small updates to debian/copyright.
 +  * Drop debian/source/lintian-overrides, the only override there is no longer
 +    needed.
 +  * Update the symbols files for kfreebsd-i386.
 +  * Remove sparc references from the symbols files, sparc is dead.
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 03 Jan 2016 21:03:01 +0300
 +
 +qtbase-opensource-src (5.6.0~beta+dfsg-2) experimental; urgency=medium
 +
 +  [ Lisandro Damián Nicanor Pérez Meyer ]
 +  * Add meta-information to symbols files in order to make sure that the
 +    dependency generated is at least as strict as the version of qtbase5-dev
 +    used during the compilation. This should avoid parts of the Qt stack
 +    (or any other app) migrating to testing before qtbase itself due to it
 +    using only symbols present in older versions.
 +
 +  [ Dmitry Shachnev ]
 +  * Bump qtbase-abi version to 5-6-0.
 +  * Add qnativesocketengine_freebsd.diff to fix the build failure on kFreeBSD.
 +  * Update symbols files from buildds’ logs.
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 30 Dec 2015 09:48:18 +0300
 +
 +qtbase-opensource-src (5.6.0~beta+dfsg-1) experimental; urgency=medium
 +
 +  [ Dmitry Shachnev ]
 +  * New upstream beta release.
 +  * Update debian/watch to track experimental releases (needs to be reverted
 +    before uploading 5.6.0 final).
 +  * Drop the following patches, all are applied upstream:
 +    - set_positionautomatic.diff
 +    - set_WA_OutsideWSRange_for_native_widgets.patch
 +    - bsd_volumeinfo.diff
 +    - hurd_forkfd.diff
 +    - mips_no_atomic.diff
 +    - detect_64bit_atomic.diff
 +    - qnetworkreply_abort_socket.diff
 +    - qnetworkaccessmanager_accessibility.diff
 +    - uic_qvalidator_qtgui.diff
 +    - Fix-crash-on-exit-caused-by-QStringLiterals.patch
 +  * Refresh debian/patches/gnukfreebsd.diff.
 +  * Add a new script (debian/scripts/migrate-symbols.py) to help with migrating
 +    the symbols files to a new upstream symbols versioning scheme (Qt_5 or
 +    Qt_5_PRIVATE_API as the version part).
 +  * Update the symbols files using the script, and with build logs for amd64
 +    and i386.
 +  * Use the new pkgkde-mark-qt5-private-symbols script (which takes upstream
 +    version tags into account) from pkg-kde-tools ≥ 0.15.20.
 +  * Add a patch to remove useless check for D-Bus presense on configure time.
 +
 +  [ Diane Trout ]
 +  * Disable building docs. Upstream moved qdoc to qttools source, so we
 +    will re-enable building them when we get qttools 5.6 built.
 +  * Add guard for no new upstream changelog.
 +  * Add new headers.
 +  * Remove MetaType headers.
 +  * Remove missing pkg-config files.
 +  * Add new documentation resources.
 +  * Remove qatomic_mips.h header, dropped upstream.
 +  * Remove qdoc from qtbase5-dev-tools.install as it appears to be missing.
 +  * Add fixqt4headers.pl to qtbase5-dev-tools.install.
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 29 Dec 2015 22:29:25 +0300
 +
+ qtbase-opensource-src (5.5.1+dfsg-16ubuntu8) UNRELEASED; urgency=medium
+ 
+   * debian/patches/Blacklist-Mali-T760-Mali-T720-from-supporting-BGRA.patch
+     - Backport from upstream 5.6 (LP: #1557915) (LP: #1559906)
+ 
+  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 15 Apr 2016 06:52:29 +0000
+ 
  qtbase-opensource-src (5.5.1+dfsg-16ubuntu7) xenial; urgency=medium
  
    [ Dmitry Shachnev ]
diff --cc debian/patches/series
index 01e4d3b,8540156..37e2b07
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,9 -1,37 +1,10 @@@
 -# Backported stuff
 -Add-environment-variable-support-for-testability-lib.patch
 -Add-an-option-to-skip-the-generic-bearer-engine.patch
 -Blacklist-PowerVR-Rogue-G6200-v1.3-from-supporting-B.patch
 -set_positionautomatic.diff
 -set_WA_OutsideWSRange_for_native_widgets.patch
 -bsd_volumeinfo.diff
 -hurd_forkfd.diff
 -Prefer-QT_PLUGIN_PATH-over-compiled-in-paths.patch
 -Fix-falsely-reported-style-for-fallback-font.patch
 -Remove-historical-4-padding-in-QFontEngine-alphaMapF.patch
 -xcb-fix-yet-another-crash-when-screens-are-disconnec.patch
 -Use-Node-name-if-Node-logicalModuleName-is-empty-for.patch
 -mips_no_atomic.diff
 -detect_64bit_atomic.diff
 -qnetworkreply_abort_socket.diff
 -qnetworkaccessmanager_accessibility.diff
 -uic_qvalidator_qtgui.diff
 -Fix-crash-on-exit-caused-by-QStringLiterals.patch
 -Make-UnknownAccessibility-not-block-requests.patch
 -multiscreen.diff
 -xcb_dont_select_XInput_events_on_root_window.patch
 -xcb_fix_drag_and_drop_when_window_is_hidden.patch
 -fix_not_delivering_focus.patch
 -fix_potential_division_by_zero.patch
 -Notify-when-the-primary-screen-changes.patch
 -Xcb-fix-crash-on-screen-power-save.patch
 -xcb-Handle-screen-siblings-in-QXcbVirtualDesktop.patch
 -xcb-Use-a-placeholder-QScreen-when-there-are-no-outp.patch
 +# Backported from upstream
  dbusmenu_fixes.diff
  dbustray_fixes.diff
 -qdoc-Wrap-QML-read-only-and-default-qualifiers-in-br.patch
 +no_dbus_dependency.diff
 +fix_not_delivering_focus.patch
  detect-indicator-application.diff
+ Blacklist-Mali-T760-Mali-T720-from-supporting-BGRA.patch
  
  # Debian specific.
  gnukfreebsd.diff

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list