[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.9.1+dfsg-10-274-g3eecf80

Sat Sep 23 17:39:17 UTC 2017

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

The following commit has been merged in the ubuntu+1 branch:
commit ae595fe6bd5b47cc855ee47bd71d21562c1fdbcc
Merge: 51340fa114e4c0d75c64a81f4533e002653f2f19 bf9c481104a5fd34914bb25156b8d595c6103a6b
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Sep 23 20:32:57 2017 +0300

    Merge branch 'master' into ubuntu+1.

 debian/changelog                   |   54 ++
 debian/control                     |    6 +-
 debian/libqt5core5a.symbols        |   16 +-
 debian/libqt5dbus5.symbols         |   11 +-
 debian/libqt5gui5.maintscript      |    1 +
 debian/libqt5gui5.symbols          | 1616 ++++++++++++++++++------------------
 debian/libqt5network5.symbols      |   42 +-
 debian/libqt5opengl5.symbols       |    2 +-
 debian/libqt5printsupport5.symbols |   36 +-
 debian/libqt5sql5.symbols          |   18 +-
 debian/libqt5test5.symbols         |   14 +-
 debian/libqt5widgets5.symbols      |  504 ++++++-----
 debian/libqt5xml5.symbols          |   22 +-
 debian/rules                       |   20 +-
 14 files changed, 1198 insertions(+), 1164 deletions(-)

diff --cc debian/changelog
index 2b92bd9,c50758c..568c48e

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,50 -1,47 +1,104 @@@
++qtbase-opensource-src (5.9.1+dfsg-10ubuntu1) UNRELEASED; urgency=medium
++
++  * Merge with Debian unstable, remaining changes:
++    - Compile without firebird support.
++    - Depend on libssl1.0.0 instead of libssl1.0.2.
++    - Enable tests for amd64, armhf, and i386.
++    - Add arm64 to the architectures that GLES is enabled on.
++
++ -- Dmitry Shachnev <mitya57 at ubuntu.com>  Sat, 23 Sep 2017 20:13:55 +0300
++
+ qtbase-opensource-src (5.9.1+dfsg-10) unstable; urgency=medium
+ 
+   [ Dmitry Shachnev ]
+   * Add a maintscript to ensure that the obsolete 90qt5-opengl conffile
+     is removed on upgrade (closes: #873788).
+   * Bump Standards-Version to 4.1.0, stop using deprecated Priority: extra.
+   * Update symbols files from kfreebsd-i386 log.
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * debian/rules: include /usr/share/dpkg/architecture.mk instead of defining
+     DEB_HOST_* variables. Thanks Helmut Grohne!
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 23 Sep 2017 17:57:53 +0300
+ 
+ qtbase-opensource-src (5.9.1+dfsg-9) unstable; urgency=medium
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Remove missing symbol in libqt5network5.symbols. I clearly missed it while
+     editing them.
+ 
+   [ Dmitry Shachnev ]
+   * Stop using the gold linker on all architectures, because of bug #852035.
+   * Update symbols files from buildds’ logs.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 20 Aug 2017 19:13:27 +0300
+ 
+ qtbase-opensource-src (5.9.1+dfsg-8) unstable; urgency=medium
+ 
+   * Update symbols files with buildds' logs.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Wed, 16 Aug 2017 09:31:28 -0300
+ 
+ qtbase-opensource-src (5.9.1+dfsg-7) unstable; urgency=medium
+ 
+   * Brown paper bag upload to unstable. Actually start the transition :-)
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Tue, 15 Aug 2017 20:50:02 -0300
+ 
+ qtbase-opensource-src (5.9.1+dfsg-6) experimental; urgency=medium
+ 
+   * Update symbols files for GCC 7 symbols changes.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Tue, 15 Aug 2017 20:45:42 -0300
+ 
 +qtbase-opensource-src (5.9.1+dfsg-5ubuntu2) artful; urgency=medium
 +
 +  * Refresh symbols from build logs to fix FTBFS with GCC 7.
 +
 + -- Simon Quigley <tsimonq2 at ubuntu.com>  Sat, 05 Aug 2017 05:26:32 -0500
 +
 +qtbase-opensource-src (5.9.1+dfsg-5ubuntu1) artful; 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 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-5) experimental; urgency=medium
  
    * Build with large file support by adding LFS_CFLAGS to build flags.
diff --cc debian/rules
index 52c6aeb,5bc3797..4fed8e1
--- a/debian/rules
+++ b/debian/rules
@@@ -51,16 -43,6 +43,9 @@@ ifeq ($(DEB_HOST_ARCH_CPU),i386
  	cpu_opt = -no-sse2 -no-pch
  endif
  
 +# Run tests only on archs known to pass in the past
 +testrun_architectures := amd64 armhf i386
 +
- # https://bugs.debian.org/842304
- nogoldlinker_architectures := powerpc armhf amd64 ppc64el arm64 i386
- 
- ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(nogoldlinker_architectures)))
- 	extra_configure_opts += -no-use-gold-linker
- endif
- 
  ifeq ($(DEB_HOST_ARCH_OS),linux)
    ifneq (,$(filter $(DEB_HOST_ARCH),alpha ia64 mips64 mips64el arm64))
  	platform_arg = linux-g++

-- 
qtbase packaging

