[SCM] qtbase packaging branch, ubuntu, updated. ubuntu/5.4.2+dfsg-2ubuntu1-61-g57b01f0

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 57b01f061153c979541dd0e515a639e38e860682
Merge: 207c1f21d7d1375c25b4665873e98a9c62bf7527 b8f6c277edb7ae3695d9492ccafa46f18e58e3f2
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jul 7 05:38:54 2015 +0000

    Merge branch 'experimental' into ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/patches/series

 debian/changelog                                   |  23 +-
 debian/control                                     |   9 +-
 debian/copyright                                   |  99 +++--
 debian/libqt5concurrent5.lintian-overrides         |   2 +-
 debian/libqt5core5a.lintian-overrides              |   2 +-
 debian/libqt5dbus5.lintian-overrides               |   2 +-
 debian/libqt5egldeviceintegration5.install         |   1 +
 ... libqt5egldeviceintegration5.lintian-overrides} |   2 +-
 debian/libqt5egldeviceintegration5.symbols         | 200 ++++++++++
 debian/libqt5gui5.install-common                   |   1 -
 debian/libqt5gui5.install-linux                    |   1 -
 debian/libqt5gui5.lintian-overrides                |   2 +-
 debian/libqt5network5.lintian-overrides            |   2 +-
 debian/libqt5opengl5.lintian-overrides             |   2 +-
 debian/libqt5printsupport5.lintian-overrides       |   2 +-
 debian/libqt5sql5.lintian-overrides                |   2 +-
 debian/libqt5test5.lintian-overrides               |   2 +-
 debian/libqt5widgets5.lintian-overrides            |   2 +-
 debian/libqt5xcbqpa5.install                       |   1 +
 ...n-overrides => libqt5xcbqpa5.lintian-overrides} |   2 +-
 debian/libqt5xcbqpa5.symbols                       | 422 +++++++++++++++++++++
 debian/libqt5xml5.lintian-overrides                |   2 +-
 debian/patches/series                              |   2 +-
 23 files changed, 737 insertions(+), 48 deletions(-)

diff --cc debian/changelog
index 1f7fe0e,c794c35..db9de87
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,4 +1,17 @@@
 +qtbase-opensource-src (5.5.0-0ubuntu1) 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.
-   * debian/patches/Fix-compile-error-on-big-endian.patch:
-     - Fix FTBFS on powerpc.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Tue, 24 Mar 2015 13:56:14 +0000
 +
- qtbase-opensource-src (5.5.0+dfsg-1) UNRELEASED; urgency=medium
+ qtbase-opensource-src (5.5.0+dfsg-1) experimental; urgency=medium
  
    [ Lisandro Damián Nicanor Pérez Meyer ]
    * New upstream release.
diff --cc debian/patches/series
index 6e04295,b286b71..1bcf0d0
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,5 +1,6 @@@
  # Backported stuff
 +Add-environment-variable-support-for-testability-lib.patch
+ Fix-compile-error-on-big-endian.patch
  
  # Debian specific.
  gnukfreebsd.diff
@@@ -7,12 -7,3 +8,11 @@@
  no_htmlinfo_example.diff
  remove_privacy_breachs.diff
  hurd-forkfd.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
- Fix-compile-error-on-big-endian.patch

-- 
qtbase packaging