[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.9.1+dfsg-3-266-g88af00f

Dmitry Shachnev mitya57 at moszumanska.debian.org
Wed Jul 5 09:39:33 UTC 2017


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

The following commit has been merged in the ubuntu+1 branch:
commit fb7944e0b686a5b22c2e0afdd49371c9cc865fab
Merge: 080ade9b56415e6cdce1e7f02cce102fe1179b52 3a697a08109e836203656ea24e321305b9e675bb
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jul 5 12:28:39 2017 +0300

    Merge branch 'experimental' into ubuntu+1.

 debian/changelog                        | 19 ++++++++++++++++++-
 debian/libqt5gui5.symbols               |  4 ++--
 debian/patches/fix_atspi_condition.diff |  3 +--
 debian/patches/nonlinux_utime.diff      | 17 +++++++++++++++++
 debian/patches/series                   |  3 ++-
 5 files changed, 40 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index ec34b0f,4e4dd40..e5138a4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,47 -1,14 +1,58 @@@
- qtbase-opensource-src (5.9.1+dfsg-2ubuntu1) UNRELEASED; urgency=medium
++qtbase-opensource-src (5.9.1+dfsg-3ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Timo Jyrinki ]
 +  * Drop support for twin gles packages.
 +  * Drop Ubuntu specific patches and patches that will be in upstream 5.9.
 +   - Add-workaround-for-GL-on-Android-emulator.patch - 5.9
 +   - qdbus-tray-icon-always-save-icon-in-unity.patch - 5.9
 +   - qdbus-tray-icon-use-runtimedir.patch - 5.9
 +   - qnam-ubuntu-fix6.patch - not submitted upstream, but also might be
 +     outdated
 +   - skip-largefile-test-s390x.patch - likely not needed anymore
 +  * Remove x86 -> armhf cross-compilation qmake, maybe something more generic
 +    can be done on Debian side and then synced to Ubuntu later, if needed.
 +
 +  [ Simon Quigley ]
 +  * Merge from Debian Experimental in Git repo. Remaining changes:
 +    - Compile without firebird support.
 +    - Disable the usage of the gold linker in debian/rules.
 +    - Use libssl-dev instead of libssl1.0-dev.
 +    - Enable tests for amd64, armhf, and i386.
 +    - Add arm64 to the arches that GLES is enabled on.
 +  * Drop patches that were applied upstream in 5.9.0:
 +    - Fix-some-QtDBus-crashes-during-application-destructi.patch
 +    - hurd_tilde.diff
 +    - qsettings_XDG_CONFIG_DIRS.diff
 +    - qsettings_simplify_logic.diff
 +    - vnc_big_endian.diff
 +    - global_menu_shortcuts.diff
 +    - Add-support-for-selecting-the-printer-plugin-via-the.patch
 +    - Merge-the-QDBusMetaType-s-custom-information-to-QDBu.patch
 +  * Remove the following patches from the tree that were not specified in the
 +    series file:
 +    - xcb-Fix-drag-and-drop-to-Emacs.patch
 +    - xcb-Fix-drag-and-drop-to-applications-like-Emacs-and.patch
 +  * Add revert-automatic-code-attribution-docs.patch which reverts a
 +    commit from upstream because it requires a tool introduced in a Qt
 +    Tools version (5.8) that Ubuntu skipped.
 +  * Add arm64 to the arches GLES is built on in qtbase5-private-
 +    dev.install.
 +  * Simplify disabling of gold linker in debian/rules.
 +  * Remove debian/qt5-qmake-arm-linux-gnueabihf.install as it looks obsolete.
 +
 + -- Simon Quigley <tsimonq2 at ubuntu.com>  Thu, 08 Jun 2017 13:48:28 +0300
 +
+ qtbase-opensource-src (5.9.1+dfsg-3) experimental; urgency=medium
+ 
+   * Update headers of debian/patches/fix_atspi_condition.diff.
+   * Add a patch to use UTIME_NOW only if it is defined, to fix build on
+     kFreeBSD and Hurd (nonlinux_utime.diff).
+   * Update debian/libqt5gui5.symbols from buildds’ logs.
+   * Drop the workaround to not use gold on i386, bug #842304 should be
+     fixed now.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 04 Jul 2017 14:18:26 +0300
+ 
  qtbase-opensource-src (5.9.1+dfsg-2) experimental; urgency=medium
  
    * Mark two symbols in debian/libqt5core5a.symbols as optional.
diff --cc debian/patches/series
index a57f9d8,3a414d6..b4483ef
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -8,7 -8,4 +8,8 @@@ remove_privacy_breachs.dif
  link_fbclient.diff
  gnukfreebsd_cloexec.diff
  armv4.diff
+ nonlinux_utime.diff
 +
 +# Ubuntu specific.
 +#enable-tests.patch
 +revert-automatic-code-attribution-docs.patch

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list