[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.7.0+dfsg-3-182-gd3fca50

Timo Jyrinki timo at moszumanska.debian.org
Thu Aug 25 10:24:21 UTC 2016


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

The following commit has been merged in the ubuntu+1 branch:
commit d3fca508b4e0926543ee5167f78662901857cb67
Merge: e76670e747f032bb62e40c9b9f9740ebed2a6915 85469a404c1464ad6c06438469d49760232024db
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Thu Aug 25 10:24:06 2016 +0000

    Merge branch 'experimental' into ubuntu+1

 debian/changelog                           |   52 +
 debian/control                             |   21 +-
 debian/copyright                           | 2112 ++++++++++++++++++++--------
 debian/libqt5gui5.install-kfreebsd         |    1 +
 debian/libqt5gui5.install-linux            |    1 +
 debian/libqt5gui5.lintian-overrides        |    2 +
 debian/libqt5libqgtk2.install              |    1 -
 debian/patches/armv4.diff                  |   26 +
 debian/patches/gnukfreebsd.diff            |    2 +-
 debian/patches/gnukfreebsd_cloexec.diff    |    2 +-
 debian/patches/no_dbus_dependency.diff     |    6 +-
 debian/patches/qdevicediscovery_dummy.diff |   34 +
 debian/patches/series                      |    2 +
 debian/qt5-gtk-platformtheme.install       |    1 +
 debian/qtbase5-dev.install-common          |   15 +-
 debian/qtbase5-dev.install-kfreebsd        |    2 +
 debian/qtbase5-dev.install-linux           |    2 +
 debian/rules                               |   15 +-
 debian/scripts/migrate-symbols.py          |  108 --
 debian/scripts/update-copyright            |  157 +++
 20 files changed, 1857 insertions(+), 705 deletions(-)

diff --cc debian/changelog
index 9e86724,a887632..e05fb39
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,56 -1,55 +1,108 @@@
+ qtbase-opensource-src (5.7.0+dfsg-4) UNRELEASED; urgency=medium
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Require pkg-kde-tools (>= 0.15.17~) to allow using backported versions.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 16 Jul 2016 21:32:48 -0300
+ 
+ qtbase-opensource-src (5.7.0+dfsg-3) experimental; urgency=medium
+ 
+   * Replace qdevicediscovery_dummy.diff with a proper patch from upstream.
+   * Update debian/libqt5dbus5.symbols once again.
+   * Mark private symbols using pkgkde-mark-qt5-private-symbols.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 05 Jul 2016 21:10:28 +0300
+ 
+ qtbase-opensource-src (5.7.0+dfsg-2) experimental; urgency=medium
+ 
+   * Add a patch (qdevicediscovery_dummy.diff) to fix a linking error on
+     GNU/kFreeBSD.
+   * Add support for ARMv4 architecture, needed to get armel builds working.
+   * Update debian/libqt5dbus5.symbols from buildds’ logs.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 01 Jul 2016 19:59:52 +0300
+ 
+ qtbase-opensource-src (5.7.0+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Drop debian/scripts/migrate-symbols.py, no longer needed.
+   * Drop lib/fonts/* from excluded files, these are no longer shipped
+     (since upstream commit c5ceabb9a1caf6b9).
+   * Refresh patches for the new release.
+   * Update for upstream GTK+ 3 port:
+     - Build-depend on libgtk-3-dev.
+     - Rename libqt5libqgtk2 to qt5-gtk-platformtheme.
+     - Make it a recommendation of libqt5gui5 rather than a suggestion.
+   * Update debian/qtbase5-dev.install-common for the new release.
+   * Install libQt5EglFsKmsSupport library in libqt5gui5, the same way as
+     libQt5EglDeviceIntegration.
+   * Update symbols files from amd64 and i386 build logs.
+   * Merge two dh_makeshlibs calls, so that only one build is needed to get
+     the symbols diffs.
+   * Update debian/copyright:
+     - Libraries code is now licensed under LGPL-3 or GPL-2+.
+     - Tools and tests are now licensed under GPL-3 with exceptions.
+     - Examples and documentation are still licensed under 3-clause BSD.
+   * Add a script to automatically generate some copyright information.
+   * Update clean rules to prevent deleting test data.
+   * Drop obsolete Breaks/Replaces.
+   * Bump qtbase-abi version to 5-7-0.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 29 Jun 2016 09:26:08 +0300
+ 
 +qtbase-opensource-src (5.6.1+dfsg-3ubuntu3) UNRELEASED; urgency=medium
 +
 +  [ Timo Jyrinki ]
 +  * debian/patches/QDBusServer-delay-processing-of-D-Bus-messages.patch:
 +    - Fix DBus message processing (LP: #1608822) 
 +  * debian/patches/xcb-Send-also-text-plain-when-a-text-uri-list-is-dro.patch:
 +    - Fix drag and drop from Qt to skype (LP: #1586857)
 +  * debian/patches/qt5-qmake-arm-linux-gnueabihf:
 +    - Support cross-compilation inside chroot using pkg-config (LP: #1580981)
 +  * debian/patches/Make-sure-connection-is-not-null-before-using-it.patch:
 +    - Fix unity8 crasher (LP: #1612309)
 +
 +  [ Dmitry Shachnev ]
 +  * Backport some upstream patches to add support for D-Bus global menus,
 +    and improve support for D-Bus tray icons (LP: #1612767):
 +    + dbustray_use_separate_connections.diff (fix for multiple tray icons)
 +    + dbusmenu_exclusive_groups.diff (fix for radio actions)
 +    + qplatformmenubar_createmenu.diff (adding a method to QPlatformMenuBar)
 +    + dbusmenu_global_menu.diff (add support for D-Bus global menus)
 +
 + -- Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>  Wed, 17 Aug 2016 09:58:32 +0000
 +
 +qtbase-opensource-src (5.6.1+dfsg-3ubuntu2~1) yakkety; urgency=medium
 +
 +  * Don't use gold linker on powerpc. (LP: #1611227)
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 09 Aug 2016 06:29:25 +0000
 +
 +qtbase-opensource-src (5.6.1+dfsg-3ubuntu1~4) yakkety; urgency=medium
 +
 +  * New upstream release. 
 +  * Migrate symbols using the script to the Qt_5 versioning scheme.
 +  * Update symbols and bump symbols abi.
 +  * Rebase and refresh enable-tests.patch.
 +  * Rebase qnam-ubuntu-fix6.patch.
 +  * Mark private symbols.
 +  * Drop xcb_fix_parent_screen_of_embedded_windows.patch:
 +    - Fixed differently in Qt 5.6.
 +  * Tests enablement for Qt 5.6.
 +  * Add arm64 to gles archs.
 +  * Rebase patches for 5.6.1, and drop the following:
 +    - Blacklist-Mali-T760-Mali-T720-from-supporting-BGRA.patch: upstreamed
 +    - debian/patches/detect-indicator-application.diff: upstreamed
 +    - debian/patches/fix-duplicate-qnam-finished.patch: folded in to the 
 +      remaining parts of qnam-ubuntu-fix6.patch, half of which were upstreamed 
 +      in Qt 5.6.1
 +  * Skip a test related to LP: #1603991
 +  * debian/patches/color-fonts.patch,
 +    debian/patches/fix-scalable-bitmap-factor-caching.patch:
 +    - Add patches required for color font rendering (LP: #1594851)
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 18 Jan 2016 10:06:17 +0000
 +
  qtbase-opensource-src (5.6.1+dfsg-3) unstable; urgency=medium
  
    [ Lisandro Damián Nicanor Pérez Meyer ]
diff --cc debian/control
index bb936d1,021f7ef..eab36a9
--- a/debian/control
+++ b/debian/control
@@@ -60,10 -60,9 +60,10 @@@ Build-Depends: debhelper (>= 9)
                 libxkbcommon-dev,
                 libxkbcommon-x11-dev,
                 libxrender-dev,
-                pkg-kde-tools (>= 0.15.17),
+                pkg-kde-tools (>= 0.15.17~),
                 publicsuffix,
                 unixodbc-dev,
 +               xvfb,
                 zlib1g-dev
  Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.0~),
                       qttools5-dev-tools (>= 5.6.0~)
diff --cc debian/copyright
index 3947578,2597e43..6fef35c
--- a/debian/copyright
+++ b/debian/copyright
@@@ -12,18 -12,23 +12,27 @@@ Files-Excluded: src/3rdparty/zlib/doc/r
                  examples/xml/htmlinfo
  # Removed non-free files:
  # * RFCs (see QTBUG-30544 and QTBUG-30545)
- # * Luxi and Adobe Utopia fonts
  # * htmlinfo example which contains non-free websites snapshots
 +#
 +# Three of the removed non-free files are replaced by public domain text 
 +# content from https://en.wikisource.org/wiki/The_Kalevala/Rune_I to keep 
 +# some of tests working. See debian/patches/enable-tests.patch.
  
+ # Manual rules for The Qt Company copyrights
+ 
  Files: *
- Copyright: 2012-2015 The Qt Company Ltd.
- License: LGPL-2.1-or-3 with Qt-1.1 exception
+ Copyright: 2016 The Qt Company Ltd.
+ License: LGPL-3 or GPL-2+
+ 
+ Files: configure
+        configure.bat
+        qmake/*
+        src/tools/*
+        tests/*
+        tools/*
+        util/*
+ Copyright: 2016 The Qt Company Ltd.
+ License: GPL-3 with Qt-1.0 exception
  
  Files: examples/*
         doc/src/snippets/*
diff --cc debian/patches/series
index 5b0cdac,ce2e1a1..ce7efb5
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -16,12 -7,5 +16,14 @@@ no_htmlinfo_example.dif
  remove_privacy_breachs.diff
  link_fbclient.diff
  gnukfreebsd_cloexec.diff
+ qdevicediscovery_dummy.diff
+ armv4.diff
 +
 +# 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
diff --cc debian/rules
index 1cd9d43,434624d..97f1766
--- a/debian/rules
+++ b/debian/rules
@@@ -230,24 -176,19 +230,26 @@@ override_dh_auto_clean
  	  -o -name .rcc \
  	  -o -name release-shared \
  	  -o -name release-static \
 -	  -o -name .uic \
 -	\) -print0 | xargs -0 rm -rf
 +	  -o -name .uic \) -print \
 +        | xargs rm -rf
  
  	# Leftover files and all symlinks
 +        # Ubuntu diff: tests enablement related
  	find \( -false \
- 	  -o -name \*.a \
+ 	  -o -name lib\*.a \
  	  -o -name Makefile.Debug \
  	  -o -name Makefile.Release \
  	  -o -name \*.o \
  	  -o -name \*.prl \
+ 	  -o -name lib\*.so \
+ 	  -o -type l \
 -	\) -print0 | xargs -0 rm -rf
 +	  -o -name \*.so \
 +	  -o -name \*.so.debug \
- 	  -o -type l \) -print \
++        \) -print \
 +        | grep -v tests/auto/corelib/plugin/qpluginloader/elftest \
 +        | grep -v tests/auto/corelib/io/qdir/types \
 +        | grep -v tests/auto/corelib/plugin/qlibrary/library_path/invalid.so \
 +        | xargs rm -rf
  
  	# Delete all Makefiles, excluding some from src/3rdparty
  	find $(CURDIR) -name Makefile \
@@@ -383,14 -317,7 +385,9 @@@ override_dh_strip
  	dh_strip --remaining-packages --dbg-package=qtbase5-dbg
  
  override_dh_makeshlibs:
 -	dh_makeshlibs -V -XlibQt5EglDeviceIntegration -XlibQt5EglFsKmsSupport -XlibQt5XcbQpa
 +	# Don't uncomment until rid of -gles packages
- 	#dh_makeshlibs -V -plibqt5gui5 -XlibQt5EglDeviceIntegration.so -X libQt5XcbQpa.so
- 	#dh_makeshlibs -V --remaining-packages
- 	dh_makeshlibs -plibqt5gui5 -XlibQt5EglDeviceIntegration.so -X libQt5XcbQpa.so
- 	dh_makeshlibs --remaining-packages
- 
- 	# Check for private symbols not marked as such. Be verbose.
- 	pkgkde-mark-private-symbols debian/qtbase5-private-dev/usr/include
++	#dh_makeshlibs -V -XlibQt5EglDeviceIntegration. -XlibQt5EglFsKmsSupport -XlibQt5XcbQpa
++	dh_makeshlibs -XlibQt5EglDeviceIntegration -XlibQt5EglFsKmsSupport -XlibQt5XcbQpa
  
  override_dh_clean:
  	dh_clean

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list