[SCM] qtbase packaging branch, experimental, updated. debian/5.6.0-beta+dfsg-5-14-gf34bfee

Dmitry Shachnev mitya57 at moszumanska.debian.org
Thu Mar 3 20:00:10 UTC 2016 

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

The following commit has been merged in the experimental branch:
commit 2b65eed9cc77070853cf0fe372eff7c396db6037
Merge: 45af17fa5420f5dca8e34e008e3eb5d6123d0be2 f16123848853b072681aa240224136ed6e8c674d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Mar 3 22:56:23 2016 +0300

    Merge branch 'master' into experimental

 debian/changelog                                   |  28 ++
 debian/control                                     |   6 +-
 debian/copyright                                   |   4 +-
 debian/generateTLDs.sh                             |   2 +
 ...-falsely-reported-style-for-fallback-font.patch |  50 +++
 ...fer-QT_PLUGIN_PATH-over-compiled-in-paths.patch |  65 ++++
 ...orical-4-padding-in-QFontEngine-alphaMapF.patch |  40 +++
 debian/patches/dbusmenu_fixes.diff                 | 364 +++++++++++++++++++++
 debian/patches/dbustray_fixes.diff                 |  80 +++++
 debian/patches/series                              |   6 +
 ...-another-crash-when-screens-are-disconnec.patch |  32 ++
 debian/rules                                       |   2 +-
 12 files changed, 673 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index c63f191,b45ec35..72c81e4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,110 -1,31 +1,138 @@@
 +qtbase-opensource-src (5.6.0~beta+dfsg-5) experimental; urgency=medium
 +
 +  * Fix URLs pointing to our "How to package Qt based stuff" page
 +    (Closes: #810282). Thanks Jakob Haufe for the pointer.
 +  * Merge 5.5.1+dfsg-13's changes into the experimental branch.
 +    - Bump libqt5gui5's Breaks+Replaces so that users who installed
 +      the experimental version have a proper package update.
 +  * Remove the transitional package libqt5xcbqpa5, their only rdeps
 +    lived in sid/testing and already removed it.
 +  * Merge 5.5.1+dfsg-14 from master, importing fix_not_delivering_focus.patch.
 +
 + -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Mon, 15 Feb 2016 15:49:42 -0300
 +
 +qtbase-opensource-src (5.6.0~beta+dfsg-4) experimental; urgency=medium
 +
 +  * Drop unused dbus build-dependency.
 +  * Stop running pkgkde-mark-qt5-private-symbols script during build. The new
 +    way is that the maintainers run it themselves after each symbols update.
 +  * Make sure dh_installchangelogs is called even when upstream changelog is
 +    not present.
 +  * Use wildcards instead of hardcoded ABI versions in Lintian overrides files.
 +  * Merge 5.5.1+dfsg-11 and 5.5.1+dfsg-12 unstable uploads.
 +    - Refresh patches.
 +  * When merging install files, take DEB_HOST_ARCH_CPU into account, instead of
 +    DEB_HOST_ARCH. This is much more useful for us, because it allows us not to
 +    ship identical files for i386, hurd-i386 and kfreebsd-i386.
 +  * Exclude qdoc documentation from debian/qtbase5-doc-html.install (moved to
 +    qttools module).
 +  * Remove qdoc mention from qtbase5-dev-tools package description.
 +  * Re-enable building the documentation.
 +    - Add libqt5sql5-sqlite and qttools5-dev-tools to Build-Depends-Indep.
 +  * README.source:
 +    - Update the section on marking the private symbols.
 +    - Add a new section about bootstrapping the docs packages.
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 08 Jan 2016 10:21:22 +0300
 +
 +qtbase-opensource-src (5.6.0~beta+dfsg-3) experimental; urgency=medium
 +
 +  * Add qt_functions_missing_eval.diff to make qmake generate proper code for
 +    custom plugin paths. This change is needed to make qtimageformats tests
 +    success.
 +  * Small updates to debian/copyright.
 +  * Drop debian/source/lintian-overrides, the only override there is no longer
 +    needed.
 +  * Update the symbols files for kfreebsd-i386.
 +  * Remove sparc references from the symbols files, sparc is dead.
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 03 Jan 2016 21:03:01 +0300
 +
 +qtbase-opensource-src (5.6.0~beta+dfsg-2) experimental; urgency=medium
 +
 +  [ Lisandro Damián Nicanor Pérez Meyer ]
 +  * Add meta-information to symbols files in order to make sure that the
 +    dependency generated is at least as strict as the version of qtbase5-dev
 +    used during the compilation. This should avoid parts of the Qt stack
 +    (or any other app) migrating to testing before qtbase itself due to it
 +    using only symbols present in older versions.
 +
 +  [ Dmitry Shachnev ]
 +  * Bump qtbase-abi version to 5-6-0.
 +  * Add qnativesocketengine_freebsd.diff to fix the build failure on kFreeBSD.
 +  * Update symbols files from buildds’ logs.
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 30 Dec 2015 09:48:18 +0300
 +
 +qtbase-opensource-src (5.6.0~beta+dfsg-1) experimental; urgency=medium
 +
 +  [ Dmitry Shachnev ]
 +  * New upstream beta release.
 +  * Update debian/watch to track experimental releases (needs to be reverted
 +    before uploading 5.6.0 final).
 +  * Drop the following patches, all are applied upstream:
 +    - set_positionautomatic.diff
 +    - set_WA_OutsideWSRange_for_native_widgets.patch
 +    - bsd_volumeinfo.diff
 +    - hurd_forkfd.diff
 +    - mips_no_atomic.diff
 +    - detect_64bit_atomic.diff
 +    - qnetworkreply_abort_socket.diff
 +    - qnetworkaccessmanager_accessibility.diff
 +    - uic_qvalidator_qtgui.diff
 +    - Fix-crash-on-exit-caused-by-QStringLiterals.patch
 +  * Refresh debian/patches/gnukfreebsd.diff.
 +  * Add a new script (debian/scripts/migrate-symbols.py) to help with migrating
 +    the symbols files to a new upstream symbols versioning scheme (Qt_5 or
 +    Qt_5_PRIVATE_API as the version part).
 +  * Update the symbols files using the script, and with build logs for amd64
 +    and i386.
 +  * Use the new pkgkde-mark-qt5-private-symbols script (which takes upstream
 +    version tags into account) from pkg-kde-tools ≥ 0.15.20.
 +  * Add a patch to remove useless check for D-Bus presense on configure time.
 +
 +  [ Diane Trout ]
 +  * Disable building docs. Upstream moved qdoc to qttools source, so we
 +    will re-enable building them when we get qttools 5.6 built.
 +  * Add guard for no new upstream changelog.
 +  * Add new headers.
 +  * Remove MetaType headers.
 +  * Remove missing pkg-config files.
 +  * Add new documentation resources.
 +  * Remove qatomic_mips.h header, dropped upstream.
 +  * Remove qdoc from qtbase5-dev-tools.install as it appears to be missing.
 +  * Add fixqt4headers.pl to qtbase5-dev-tools.install.
 +
 + -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 29 Dec 2015 22:29:25 +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-14) unstable; urgency=medium
  
    * Backport fix_not_delivering_focus.patch to fix not delivering focusIn event
diff --cc debian/control
index bf37a24,c8a1065..3d8290b
--- a/debian/control
+++ b/debian/control
@@@ -63,13 -63,11 +63,13 @@@ Build-Depends: debhelper (>= 9)
                 publicsuffix,
                 unixodbc-dev,
                 zlib1g-dev
 +Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.0~),
 +                     qttools5-dev-tools (>= 5.6.0~)
  Build-Conflicts: libmariadbclient-dev
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.7
  Homepage: http://qt-project.org/
- Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtbase.git
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/qt/qtbase.git
+ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtbase.git
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/qt/qtbase.git
  
  Package: libqt5core5a
  Architecture: any
diff --cc debian/patches/series
index 7e30bb0,1c71482..0dc6edc
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,18 +1,13 @@@
 -# Backported stuff
 -set_positionautomatic.diff
 -set_WA_OutsideWSRange_for_native_widgets.patch
 -bsd_volumeinfo.diff
 -hurd_forkfd.diff
 +# Backported from upstream
+ xcb-fix-yet-another-crash-when-screens-are-disconnec.patch
+ Prefer-QT_PLUGIN_PATH-over-compiled-in-paths.patch
+ Fix-falsely-reported-style-for-fallback-font.patch
+ Remove-historical-4-padding-in-QFontEngine-alphaMapF.patch
 -mips_no_atomic.diff
 -detect_64bit_atomic.diff
 -qnetworkreply_abort_socket.diff
 -qnetworkaccessmanager_accessibility.diff
 -uic_qvalidator_qtgui.diff
 -Fix-crash-on-exit-caused-by-QStringLiterals.patch
++dbusmenu_fixes.diff
++dbustray_fixes.diff
 +no_dbus_dependency.diff
 +qnativesocketengine_freebsd.diff
 +qt_functions_missing_eval.diff
  multiscreen.diff
  xcb_dont_select_XInput_events_on_root_window.patch
  xcb_fix_drag_and_drop_when_window_is_hidden.patch

-- 
qtbase packaging

More information about the pkg-kde-commits mailing list