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


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

The following commit has been merged in the ubuntu branch:
commit 567ba397e51bccd949409e1835ab2f50a48637b6
Merge: 58171380f094c696e7eefef69b33b5b0aed17556 6d54ac3b1fe38b564628bdb82c7a9978ea9b86e5
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Mar 7 09:22:51 2016 +0000

    Merge branch 'experimental' into ubuntu+1

 debian/changelog                              |  61 ++++-
 debian/control                                |   7 +-
 debian/copyright                              |   4 +-
 debian/generateTLDs.sh                        |   2 +
 debian/patches/dbusmenu_fixes.diff            | 364 ++++++++++++++++++++++++++
 debian/patches/dbustray_fixes.diff            |  80 ++++++
 debian/patches/fix_alsa_detection.patch       |  21 ++
 debian/patches/fix_not_delivering_focus.patch |   4 +-
 debian/patches/gnukfreebsd.diff               |   2 +-
 debian/patches/series                         |   3 +
 debian/rules                                  |   2 +-
 11 files changed, 540 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index cf2a542,4550ffb..6013e1b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,28 +1,37 @@@
- qtbase-opensource-src (5.6.0~rc+dfsg-5ubuntu1) UNRELEASED; urgency=medium
++qtbase-opensource-src (5.6.0~rc+dfsg-1ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Timo Jyrinki ]
 +  * New upstream release. 
 +  * Migrate symbols using the script to the Qt_5 versioning scheme.
 +  * Update symbols and bump symbols abi.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 18 Jan 2016 10:06:17 +0000
 +
+ 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
@@@ -114,12 -130,40 +139,46 @@@ qtbase-opensource-src (5.6.0~beta+dfsg-
  
   -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 29 Dec 2015 22:29:25 +0300
  
+ qtbase-opensource-src (5.5.1+dfsg-16) unstable; urgency=medium
+ 
+   * Add fix_alsa_detection.patch to workaround ALSA >= 1.1.0 detection.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Sat, 05 Mar 2016 10:24:48 -0300
+ 
+ qtbase-opensource-src (5.5.1+dfsg-15) unstable; urgency=medium
+ 
+   [ Timo Jyrinki ]
+   * Backport XCB patch related to screen disconnection handling QTBUG-42985:
+     - xcb-fix-yet-another-crash-when-screens-are-disconnec.patch
+   * debian/patches/Prefer-QT_PLUGIN_PATH-over-compiled-in-paths.patch:
+     - Backport. Prefer QT_PLUGIN_PATH over compiled-in paths (LP: #1519927)
+   * Fix Chinese glyph font rendering with new backported upstream patches:
+     - debian/patches/Fix-falsely-reported-style-for-fallback-font.patch
+     - debian/patches/Remove-historical-4-padding-in-QFontEngine-alphaMapF.patch
+       (LP: #1475205)
+ 
+   [ Dmitry Shachnev ]
+   * Backport several upstream dbusmenu/dbustray related fixes from 5.6 branch.
+   * Correct license of japanese_230_50.qpf font in debian/copyright. Thanks to
+     Arnout Vandecappelle for the patch (closes: #815616).
+   * debian/generateTLDs.sh: Set -e to fail when a subcommand fails.
+   * Call generateTLDs.sh with LC_ALL=C.UTF-8, to workaround a bug in grep.
+     See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=22838.
+   * Use https URIs for Vcs fields.
+   * Bump Standards-Version to 3.9.7, no changes needed.
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Remove the transitional package libqt5xcbqpa5, there are no rdeps left in
+     sid or testing.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 03 Mar 2016 20:34:47 +0300
+ 
 +qtbase-opensource-src (5.5.1+dfsg-14ubuntu1) xenial; urgency=medium
 +
 +  * Merge with Debian.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Wed, 17 Feb 2016 09:50:07 +0000
 +
  qtbase-opensource-src (5.5.1+dfsg-14) unstable; urgency=medium
  
    * Backport fix_not_delivering_focus.patch to fix not delivering focusIn event
diff --cc debian/patches/series
index a6d1480,3fb2d79..f2c5efd
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -7,12 -9,4 +9,13 @@@ gnukfreebsd.dif
  no_htmlinfo_example.diff
  remove_privacy_breachs.diff
  link_fbclient.diff
+ fix_alsa_detection.patch
 +
 +# Ubuntu specific.
 +qt5-qmake-arm-linux-gnueabihf
 +Add-workaround-for-GL-on-Android-emulator.patch
 +#enable-tests.patch
 +skip-largefile-test-s390x.patch
 +net-bearer-nm-disconnect-ap-signals7.patch
 +qnam-ubuntu-fix6.patch
 +disable_overlay_scrollbars.diff

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list