[SCM] qtbase packaging branch, ubuntu, updated. debian/5.5.0+dfsg-4-41-g02638e3

Timo Jyrinki timo at moszumanska.debian.org
Thu Sep 3 09:55:41 UTC 2015


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

The following commit has been merged in the ubuntu branch:
commit 02638e3d149c6bd977ca94c74b8cdaa6ca32b7f6
Merge: f2bf9d410152abd783a5fe27e4a58ad7041db687 c299a21bc8c875e2a6d517605049547f375edd80
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Sep 3 09:55:35 2015 +0000

    Merge branch 'experimental' into ubuntu

 debian/changelog                                 |  57 +++++-
 debian/control                                   |  16 +-
 debian/copyright                                 | 231 +++++++++++++++++++----
 debian/generateTLDs.sh                           |  50 +++++
 debian/libqt5xcbqpa5.install                     |   2 +-
 debian/patches/gnukfreebsd_processNameByPid.diff |  49 +++++
 debian/patches/link_fbclient.diff                |  23 +++
 debian/patches/series                            |   2 +
 debian/rules                                     |  13 +-
 debian/source/lintian-overrides                  |   4 -
 10 files changed, 402 insertions(+), 45 deletions(-)

diff --cc debian/changelog
index 4916042,c9d31e7..71744b3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,46 +1,61 @@@
- qtbase-opensource-src (5.5.0+dfsg-1ubuntu1) UNRELEASED; urgency=medium
++qtbase-opensource-src (5.5.0+dfsg-4ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +    (LP: #1437206) (LP: #1450137)
 +  * 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.
 +  * Build depend on GStreamer 1.0 and add a configure option for it.
 +  * Update symbols.
 +  * Mark/unmark private symbols.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 24 Mar 2015 13:56:14 +0000
 +
+ qtbase-opensource-src (5.5.0+dfsg-5) UNRELEASED; urgency=medium
+ 
+   [ Dmitry Shachnev ]
+   * Update debian/copyright for 5.5.0.
+   * Make libqt5gui5 recommend libqt5xcbqpa5, as it is the default
+     QPA platform.
+   * Update symbols files from buildds’ logs.
+   * Make libqt5libqgtk2 package description more verbose.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 14 Aug 2015 19:37:52 +0300
+ 
+ qtbase-opensource-src (5.5.0+dfsg-4) experimental; urgency=medium
+ 
+   * Update symbols files with buildds logs.
+   * Build firebird plugin on all Linux and kFreeBSD architectures.
+     - Resurrect libqt5sql5-ibase binary package.
+     - Copy patch from qt4-x11 to link ibase sql plugin against firebird
+       (link_fbclient.diff).
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 14 Aug 2015 10:37:08 +0300
+ 
+ qtbase-opensource-src (5.5.0+dfsg-3) experimental; urgency=medium
+ 
+   * Update symbols files with buildds logs.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Mon, 03 Aug 2015 10:59:00 +0300
+ 
+ qtbase-opensource-src (5.5.0+dfsg-2) experimental; urgency=medium
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Bootstrap coreutils in order to be able to rebuild some pregenerated stuff.
+     - Rebuild the TLD names list.
+ 
+   [ Dmitry Shachnev ]
+   * Update symbols files with buildds’ logs.
+   * Merge 5.4.2+dfsg-5 unstable upload.
+   * Add processNameByPid implementation for GNU/kFreeBSD
+     (gnukfreebsd_processNameByPid.diff).
+   * Remove symbols missing with GCC 5.
+   * Drop unused outdated-autotools-helper-file Lintian overrides.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 02 Aug 2015 18:33:39 +0300
+ 
  qtbase-opensource-src (5.5.0+dfsg-1) experimental; urgency=medium
  
    [ Lisandro Damián Nicanor Pérez Meyer ]
diff --cc debian/control
index d43c35f,c87c930..7215942
--- a/debian/control
+++ b/debian/control
@@@ -60,8 -60,8 +60,9 @@@ Build-Depends: debhelper (>= 9)
                 libxkbcommon-x11-dev,
                 libxrender-dev,
                 pkg-kde-tools (>= 0.15.17),
+                publicsuffix,
                 unixodbc-dev,
 +               xvfb,
                 zlib1g-dev
  Build-Conflicts: libmariadbclient-dev
  Standards-Version: 3.9.6
@@@ -89,7 -89,7 +90,8 @@@ Package: libqt5gui
  Architecture: any
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
 -Depends: fontconfig, libqt5xcbqpa5, ${misc:Depends}, ${shlibs:Depends}
 +Depends: fontconfig, ${misc:Depends}, ${shlibs:Depends}
++Recommends: libqt5xcbqpa5
  Suggests: libqt5libqgtk2
  Description: Qt 5 GUI module
   Qt is a cross-platform C++ application framework. Qt's primary feature
diff --cc debian/patches/series
index 4625d5d,148b172..ed743cf
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -7,12 -6,5 +7,14 @@@ gnukfreebsd.dif
  no_htmlinfo_example.diff
  remove_privacy_breachs.diff
  hurd-forkfd.diff
+ gnukfreebsd_processNameByPid.diff
+ link_fbclient.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
 +enable_fonts_always_smoothly.patch

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list