[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.4.2+dfsg-2ubuntu1-37-ge7607b0

Timo Jyrinki timo at moszumanska.debian.org
Sun Jul 5 12:13:45 UTC 2015 

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

The following commit has been merged in the ubuntu branch:
commit 2bc94a7063a589dbba163f0bf7ec1c29569396d1
Merge: c6f57b449e7bab7a20ac2588b383b6e3ecff6475 e7fcb4b264401384c15ebe93cb179bdfaff638b2
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Sun Jul 5 11:58:48 2015 +0000

    Merge branch 'experimental' into ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

 debian/changelog                                   | 57 ++++++++++++++++++++
 debian/control                                     | 23 ++++++++
 debian/libqt5egldeviceintegration5.install         |  2 +
 debian/libqt5gui5.install-common                   |  1 +
 debian/libqt5gui5.install-linux                    |  4 +-
 debian/libqt5xcbqpa5.install                       |  2 +
 debian/patches/gnukfreebsd.diff                    |  8 +--
 debian/patches/hurd-forkfd.diff                    | 22 ++++++++
 debian/patches/series                              |  6 +--
 ...PS-atomic-support-on-pre-MIPS32-architect.patch | 33 ------------
 ...m_small-improvements-to-the-hurd-g-mkspec.patch | 61 ----------------------
 debian/qtbase5-dev.install-common                  | 18 +++++++
 debian/qtbase5-dev.install-linux                   |  3 ++
 13 files changed, 136 insertions(+), 104 deletions(-)

diff --cc debian/changelog
index 4b18c5c,d0de94a..c9f1d73
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,36 +1,51 @@@
+ qtbase-opensource-src (5.5.0+dfsg-1) UNRELEASED; urgency=medium
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * New upstream release.
+   * Update symbols files with buildd's logs.
+   * Remove backported patches already present in this release:
+     - upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
+     - upstream_small-improvements-to-the-hurd-g-mkspec.patch
+   * Refresh gnukfreebsd.diff.
+   * Update install files for already present packages.
+   * Add the new libqt5xcbqpa5 and libqt5egldeviceintegration5 libraries.
+   * Add two new plugins based on libinput. This are only installed on linux
+     due to libinput not being available on other OSs yet.
+ 
+   [ Pino Toscano ]
+   * Fix build on Hurd, by temporarly disabling waitid() in forkfd code;
+     patch hurd-forkfd.diff.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 29 Jun 2015 14:41:08 +0300
+ 
+ qtbase-opensource-src (5.4.2+dfsg-4) unstable; urgency=medium
+ 
+   * Upload to unstable.
+   * Update symbols files with buildds' logs.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Mon, 22 Jun 2015 23:29:30 -0300
+ 
+ qtbase-opensource-src (5.4.2+dfsg-3) experimental; urgency=medium
+ 
+   * Update symbols files with buildd's logs.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Mon, 22 Jun 2015 09:59:21 -0300
+ 
 +qtbase-opensource-src (5.4.2+dfsg-2ubuntu1) wily; urgency=medium
 +
 +  * New upstream release.
 +  * Drop additional cherry-picked patches now included:
 +    - make-sure-there-s-a-scene.patch
 +    - upstream-gerrit_Handle-SelectionWindowDestroy-in-QXcbClipboard.patch
 +    - upstream_Call-ofono-nm-Registered-delayed-in-constructor-othe.patch
 +    - upstream_xcb-Update-mouse-buttons-from-MotionNotify-events.patch
 +    - upstream_xcb_use_themed_cursor.patch
 +    - enable_pie.patch
 +  * Bump ABI:s in symbols files
 +  * Update symbols from build logs.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Wed, 10 Jun 2015 11:45:56 +0000
 +
  qtbase-opensource-src (5.4.2+dfsg-2) experimental; urgency=medium
  
    * Update symbols files with buildds' logs.
@@@ -401,119 -247,27 +434,143 @@@ qtbase-opensource-src (5.4.0+dfsg-1) ex
  
   -- Dmitry Shachnev <mitya57 at debian.org>  Mon, 15 Dec 2014 16:45:50 +0300
  
++<<<<<<< HEAD
 +qtbase-opensource-src (5.3.2+dfsg-4ubuntu10) vivid; urgency=medium
 +
 +  * control: Drop build-dependency on libopenvg1-mesa-dev which is gone.
 +
 + -- Timo Aaltonen <tjaalton at debian.org>  Fri, 13 Feb 2015 13:20:59 +0200
 +
 +qtbase-opensource-src (5.3.2+dfsg-4ubuntu9) vivid; urgency=medium
 +
 +  [ Dmitry Shachnev ]
 +  * Add a patch to prefer QPA implementation for systemtrayicon, when it
 +    is available. This makes tray icons work on Plasma 5.
 +  * Refresh debian/patches/enable-tests.patch to not patch the same file
 +    twice.
 +
 +  [ Timo Jyrinki ]
 +  * Update Use-a-property-cache-to-cut-down-on-blocking-calls.patch to
 +    not print warnings about using blocking call.
 +  * Add a patch Refactor-networkmanager-QtBearer-backend-to-use-QDBu.patch
 +    (LP: #1404188)
 +
 + -- Dmitry Shachnev <mitya57 at ubuntu.com>  Tue, 27 Jan 2015 16:25:13 +0300
 +
 +qtbase-opensource-src (5.3.2+dfsg-4ubuntu8) vivid; urgency=medium
 +
 +  * Pick up one more DBus fix (LP: #1384776):
 +    - debian/patches/Break-after-handling-the-read-write.patch
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Thu, 27 Nov 2014 13:11:36 +0000
 +
 +qtbase-opensource-src (5.3.2+dfsg-4ubuntu7) vivid; urgency=medium
 +
 +  * Pick up upstream 5.3 branch DBus fixes (LP: #1384776)
 +    - debian/patches/Always-lock-the-DBus-dispatcher-before-dbus_connecti.patch
 +    - debian/patches/Partially-revert-Fix-a-deadlock-introduced-by-the-ra.patch
 +    - debian/patches/QDBusConnection-Merge-the-dispatch-and-the-watch-and.patch
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 24 Nov 2014 09:11:55 +0000
 +
 +qtbase-opensource-src (5.3.2+dfsg-4ubuntu6) vivid; urgency=medium
 +
 +  * Fix qmake-cross configuration path.
 +
 + -- Zoltán Balogh <zoltan at bakter.hu>  Mon, 24 Nov 2014 13:46:28 +0000
 +
 +qtbase-opensource-src (5.3.2+dfsg-4ubuntu5) vivid; urgency=medium
 +
 +  * Rename qt5-qmake-cross-armhf to qt5-qmake-arm-linux-gnueabihf 
 +
 + -- Zoltán Balogh <zoltan at bakter.hu>  Thu, 20 Nov 2014 10:33:16 +0000
 +
 +qtbase-opensource-src (5.3.2+dfsg-4ubuntu4) vivid; urgency=medium
 +
 +  * Pick up the Qt 5.4 network-manager bearer fixes (LP: #1357321)
 +    - debian/patches/disable-generic-plugin-when-others-available.patch
 +      + not merged upstream, would need better runtime detection mechanism
 +    - debian/patches/update-QtBearer-NetworkManager-backend-API.patch
 +    - debian/patches/Reset-QNAM-s-NetworkConfiguration-when-state-changes.patch
 +    - debian/patches/Use-a-property-cache-to-cut-down-on-blocking-calls.patch
 +      + refreshed to match the Qt 5.4 networkmanger bearer directory code
 +        exactly. earlier patches made simpler via this.
 +    - debian/patches/Support-dual-sim-in-QtBearer-s-networkmanager-backen.patch
 +    - debian/patches/QtBearer-networkmanager-make-sure-to-set-flag-Active.patch
 +      + upstream patch set 7
 +  * debian/patches/enable-tests: Disable tests that assume generic plugin 
 +    instead of the network-manager plugin
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Wed, 19 Nov 2014 07:30:27 +0000
 +
 +qtbase-opensource-src (5.3.2+dfsg-4ubuntu3) vivid; urgency=medium
 +
 +  * Add qmake cross-compilation package qt5-qmake-cross-armhf
 +  * debian/patches/qt5-qmake-cross-armhf:
 +    - Add mkspec needed for the cross-qmake
 +  * debian/rules: on amd64+i386, build the second qmake first
 +
 + -- Zoltán Balogh <zoltan at bakter.hu>  Mon, 17 Nov 2014 11:57:56 +0000
 +
 +qtbase-opensource-src (5.3.2+dfsg-4ubuntu2) vivid; urgency=medium
 +
 +  * Fix gles symbols (LP: #1391556)
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 11 Nov 2014 15:46:27 +0000
 +
 +qtbase-opensource-src (5.3.2+dfsg-4ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release
 +  * Sync with Debian, higlights:
 +    - Clear the list of archs that should not use pre compiled headers. 
 +      We've been told that with GCC 4.9 this should not be necessary anymore.
 +      (LP: #1318635)
 +    - Add multitouch protocol translation support.
 +    - Bump qtbase-abi to 5-3-2 because of runtime checks
 +  * Remaining changes from Debian:
 +    - Remove firebird and ibase dependencies
 +    - Maintainer fields and Vcs-Bzr
 +    - No gdb required on ppc64el
 +    - Provides: qt-default to qt5-default
 +    - Additional patches
 +    - Use our symbols files, including supporting gles variant of Qt on x86
 +    - Require OpenGL ES support on all archs
 +    - Differences in debian/rules for keeping tests enabled
 +  * Drop Ubuntu patches:
 +    - debian/patches/xi2-use-master-device.patch
 +      Replaced by a reworked upstream solution
 +      https://codereview.qt-project.org/#/c/88361/
 +  * Rebase patches:
 +    - debian/patches/enable-tests.patch
 +    - debian/patches/load_testability_from_env_var.patch
 +  * Update symbols
 +  * Fix FTBFS on arm64 with -no-pch again (thanks towards Debian)
 +  * Restore gles compatibility to symbols
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 24 Oct 2014 12:49:31 +0000
++=======
+ qtbase-opensource-src (5.3.2+dfsg-5) unstable; urgency=medium
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Remove libopenvg1-mesa-dev as a build dependency because mesa does not
+     build it anymore (Closes: #777341).
+     Thanks Andreas Beckmann for the report.
+ 
+   [ Dmitry Shachnev ]
+   * Fix several DoS vulnerabilities in the image handlers.
+     - CVE-2015-0295, CVE-2015-1858, CVE-2015-1859, CVE-2015-1860.
+     - Closes: #779580.
+   * Fix HTTP upload corruptions when server closes connection.
+   * Use the latest version of debian/mark_private_symbols.sh:
+     - Strip trailing colon from symbols names.
+     - Unmark private symbols before processing them.
+   * Symbols files:
+     - Remove references to ia64 and s390 from the symbols files.
+       Build logs for these architectures are no longer available.
+     - Update for the mark_private_symbols.sh change.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Mon, 27 Apr 2015 11:54:20 +0300
++>>>>>>> experimental
  
  qtbase-opensource-src (5.3.2+dfsg-4) unstable; urgency=medium
  
diff --cc debian/patches/series
index 9042299,46c7375..aa70283
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,19 -1,8 +1,17 @@@
  # Backported stuff
- upstream_small-improvements-to-the-hurd-g-mkspec.patch
- upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
- gnukfreebsd.diff
 +load_testability_from_env_var.patch
  
  # Debian specific.
+ gnukfreebsd.diff
 -revert_upstream_bsymbolic_change.patch
 +#revert_upstream_bsymbolic_change.patch # https://launchpad.net/bugs/1403758
  no_htmlinfo_example.diff
  remove_privacy_breachs.diff
+ hurd-forkfd.diff
 +
 +# Ubuntu specific.
 +disable_overlay_scrollbars.diff
 +qt5-qmake-arm-linux-gnueabihf
 +Add-workaround-for-GL-on-Android-emulator.patch
 +enable-tests.patch
 +qopenglframebufferobject_powervrworkaround.patch
 +disable-generic-plugin-when-others-available.patch
- 

-- 
qtbase packaging

More information about the pkg-kde-commits mailing list