[SCM] qtbase packaging branch, ubuntu, updated. debian/5.5.1+dfsg-6-63-g578e84f

Timo Jyrinki timo at moszumanska.debian.org
Mon Nov 2 09:40:35 UTC 2015


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

The following commit has been merged in the ubuntu branch:
commit 578e84fd8be9e072faec8477030766f5d333bebb
Merge: 0ef4d7dcf718099e9a7ab26d8d66174166e8ea84 1168e3b40c5cccad321c8e71f1b323b7ff21b6f7
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Nov 2 09:40:29 2015 +0000

    Merge branch 'master' into ubuntu

 debian/changelog                                   | 96 ++++++++++++++++++++--
 debian/control                                     | 11 ++-
 debian/patches/bsd_volumeinfo.diff                 | 36 ++++++++
 debian/patches/hurd-forkfd.diff                    | 26 ------
 debian/patches/hurd_forkfd.diff                    | 16 ++++
 debian/patches/mips_no_atomic.diff                 | 25 ++++++
 debian/patches/series                              |  9 +-
 .../set_WA_OutsideWSRange_for_native_widgets.patch | 28 +++++++
 debian/patches/set_positionautomatic.diff          | 30 +++++++
 9 files changed, 240 insertions(+), 37 deletions(-)

diff --cc debian/changelog
index 1e3fd98,fc4f13d..2ed6034
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,62 +1,88 @@@
- qtbase-opensource-src (5.5.1+dfsg-1ubuntu1) UNRELEASED; urgency=medium
++qtbase-opensource-src (5.5.1+dfsg-6ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release. (LP: #1437206) (LP: #1450137) (LP: #1474313)
 +    (LP: #1470700) (LP: #1504631) (LP: #1423659) (LP: #1474775)
 +  * Replace load_testability_from_env_var.patch with upstreamed
 +    Add-environment-variable-support-for-testability-lib.patch
 +  * Drop patches in upstream:
 +    - Correct-typo-in-the-Gujarati-openType-identififer.patch
 +  * Rebase enable-tests.patch. Disable one failing QtWidgets test.
 +  * Build depend on GStreamer 1.0 and add a configure option for it.
 +  * Update symbols.
 +  * Mark/unmark private symbols.
 +  * Replace two Ubuntu patches with upstreamed patches:
 +    - Drop disable-generic-plugin-when-others-available.patch, replace with
 +      Add-an-option-to-skip-the-generic-bearer-engine.patch
 +    - Drop qopenglframebufferobject_powervrworkaround.patch, replace with
 +      Blacklist-PowerVR-Rogue-G6200-v1.3-from-supporting-B.patch
 +  * debian/patches/Make-sure-networkAccessibilityChanged-is-emitted.patch:
 +    - Include a network fix from Qt 5.5 branch (merged after 5.5.1)
 +      (LP: #1470700)
 +  * debian/patches/Use-Node-name-if-Node-logicalModuleName-is-empty-for.patch:
 +    - Fix a qdoc issue (LP: #1447182)
 +  * Remove disable_overlay_scrollbars.diff as overlay scrollbars were dropped.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 24 Mar 2015 13:56:14 +0000
 +
+ qtbase-opensource-src (5.5.1+dfsg-6) unstable; urgency=medium
+ 
+   * Drop hurd-forkfd.diff, we do not need to have two patches for the same
+     thing (the second one is hurd_forkfd.diff).
+   * Mark bsd_volumeinfo.diff and hurd_forkfd.diff as applied upstream.
+   * Disable broken MIPS atomics code, let Qt fall back to C++11/GCC atomics
+     (mips_no_atomic.diff).
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Mon, 02 Nov 2015 10:30:14 +0300
+ 
+ qtbase-opensource-src (5.5.1+dfsg-5) unstable; urgency=medium
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Add upstream's set_WA_OutsideWSRange_for_native_widgets.patch
+     to avoid invalidating the backing store (Closes: #798661).
+ 
+   [ Dmitry Shachnev ]
+   * Update symbols files from buildds’ logs.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 28 Oct 2015 16:52:04 +0300
+ 
+ qtbase-opensource-src (5.5.1+dfsg-4) unstable; urgency=medium
+ 
+   * Move libqt5xcbqpa5 from libqt5gui5's recommends to depends. Recommendations
+     do not always get installed when the user is updating the packages, and so
+     most of our users had a bad experience. We can consider to push it back as
+     a recommendation after Stretch maybe (Closes: #802656).
+   * Update symbols files with buildds' logs.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Fri, 23 Oct 2015 13:25:32 -0300
+ 
+ qtbase-opensource-src (5.5.1+dfsg-3) unstable; urgency=medium
+ 
+   [ Dmitry Shachnev ]
+   * Backport upstream patch to set positionAutomatic when using setX/setY
+     (set_positionautomatic.diff; partially fixes the VLC display issues).
+   * Make qtbase5-private-dev depend on libinput-dev and libxkbcommon-dev,
+     as these packages are needed to link to libQt5PlatformSupport.a static
+     library (closes: #802704).
+   * Add a patch to fix QStorageInfo implementation for BSD4 systems
+     (bsd_volumeinfo.diff), to fix the build failure on kfreebsd.
+   * Add a patch to undef HAVE_WAITID if needed constants are not defined
+     (hurd_forkfd.diff), to fix the build failure on hurd.
+   * Update symbols files from buildds’ logs.
+   * Mark four new private symbols in debian/libqt5gui5.symbols.
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Add qtwayland5 as a libqt5gui5 suggestion. We want people trying to
+     use Wayland to have it there. This can be reconsidered later if needed.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 23 Oct 2015 11:49:47 +0300
+ 
+ qtbase-opensource-src (5.5.1+dfsg-2) unstable; urgency=medium
+ 
+   * Upload to unstable.
+   * Update symbols files with buildds' logs.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Wed, 21 Oct 2015 15:18:39 -0300
+ 
  qtbase-opensource-src (5.5.1+dfsg-1) experimental; urgency=medium
  
    [ Sune Vuorela ]
@@@ -174,53 -224,6 +250,61 @@@ qtbase-opensource-src (5.4.2+dfsg-3) ex
  
   -- 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-2ubuntu6) wily; urgency=medium
++
++  * debian/patches/stale-process-lock.patch:
++    - Fix QLockFile not noticing if the lock pid is re-used by unrelated
++      process (LP: #1500444)
++
++ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 29 Sep 2015 07:18:23 +0000
++
 +qtbase-opensource-src (5.4.2+dfsg-2ubuntu5) wily; urgency=medium
 +
 +  * debian/patches/Network-Fix-up-previous-corruption-patch.patch:
 +    - Additional fixes to the QNAM upload corruption problem,
 +      from the 5.4 upstream stable branch. (LP: #1497147)
 +  * debian/patches/enable-tests.patch:
 +    - Disable two unrelated tests that fail likely due to new Mesa 11.0.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Thu, 24 Sep 2015 07:34:12 +0000
 +
 +qtbase-opensource-src (5.4.2+dfsg-2ubuntu3) trusty; urgency=medium
 +
 +  [ Gary Wang ]
 +  * debian/patches/enable_fonts_always_smoothly.patch:
 +    - Workaround a glyph rendering problem by forcing distance field 
 +      rendering (LP: #1462982) (LP: #1475205)
 +
 + -- Timo Jyrinki <timo.jyrinki at iki.fi>  Wed, 05 Aug 2015 11:44:25 +0300
 +
 +qtbase-opensource-src (5.4.2+dfsg-2ubuntu2.1) wily; urgency=medium
 +
 +  * Rebuild for ICU 55.1.
 +
 + -- Matthias Klose <doko at ubuntu.com>  Sat, 18 Jul 2015 12:19:40 +0200
 +
 +qtbase-opensource-src (5.4.2+dfsg-2ubuntu2) wily; urgency=medium
 +
 +  * Rebuild for GCC5 transition.
 +  * Update symbols.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 10 Jul 2015 08:01:23 +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.
diff --cc debian/patches/series
index b544121,48c6d1d..ad06f68
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,19 -1,15 +1,26 @@@
  # 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
 +Make-sure-networkAccessibilityChanged-is-emitted.patch
+ Fix-compile-error-on-big-endian.patch
+ set_positionautomatic.diff
+ set_WA_OutsideWSRange_for_native_widgets.patch
+ bsd_volumeinfo.diff
+ hurd_forkfd.diff
+ 
+ # Will be no longer needed with Qt 5.7
+ mips_no_atomic.diff
  
  # Debian specific.
  gnukfreebsd.diff
  no_htmlinfo_example.diff
  remove_privacy_breachs.diff
- hurd-forkfd.diff
  link_fbclient.diff
 +
 +# Ubuntu specific.
 +qt5-qmake-arm-linux-gnueabihf
 +Add-workaround-for-GL-on-Android-emulator.patch
 +enable-tests.patch
 +enable_fonts_always_smoothly.patch
 +Use-Node-name-if-Node-logicalModuleName-is-empty-for.patch

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list