[SCM] qtbase packaging branch, ubuntu+1, updated. debian/5.6.0-beta+dfsg-5-90-g1748c86

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu+1 branch:
commit 1748c86f8efee0217e411c49cea30aef0977a07a
Merge: 856d7c740fa5676f222d38601a810c71a9270830 45af17fa5420f5dca8e34e008e3eb5d6123d0be2
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Feb 17 10:02:47 2016 +0000

    Merge branch 'experimental' into ubuntu+1

 debian/changelog                                   |  46 ++-
 debian/control                                     |  37 +-
 debian/libqt5egldeviceintegration5.install         |   3 -
 .../libqt5egldeviceintegration5.lintian-overrides  |   3 -
 debian/libqt5egldeviceintegration5.symbols         | 250 ------------
 debian/libqt5gui5.install-common                   |   3 +
 debian/libqt5gui5.install-linux                    |   3 +
 debian/libqt5gui5.lintian-overrides                |  18 +
 debian/libqt5xcbqpa5.install                       |   3 -
 debian/libqt5xcbqpa5.lintian-overrides             |   3 -
 debian/libqt5xcbqpa5.symbols                       | 421 ---------------------
 debian/patches/fix_not_delivering_focus.patch      |  86 +++++
 debian/patches/series                              |   1 +
 debian/rules                                       |   5 +
 debian/scripts/migrate-symbols.py                  |   9 +-
 15 files changed, 169 insertions(+), 722 deletions(-)

diff --cc debian/changelog
index e2ecce1,c63f191..1e890b3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,16 +1,25 @@@
- qtbase-opensource-src (5.6.0~beta+dfsg-4ubuntu1) UNRELEASED; urgency=medium
- 
-   [ Lisandro Damián Nicanor Pérez Meyer ]
-   * Fix URLs pointing to our "How to package Qt based stuff" page
-     (Closes: #810282). Thanks Jakob Haufe for the pointer.
++qtbase-opensource-src (5.6.0~beta+dfsg-5ubuntu1) 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~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.
@@@ -105,13 -105,33 +114,40 @@@ 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-14) unstable; urgency=medium
+ 
+   * Backport fix_not_delivering_focus.patch to fix not delivering focusIn event
+     on hide/show.
+   * Backport fix_potential_division_by_zero.patch to fix potential division by
+     zero (Closes: #814699).
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Mon, 15 Feb 2016 14:51:51 -0300
+ 
+ qtbase-opensource-src (5.5.1+dfsg-13) unstable; urgency=medium
+ 
+   * Fix URLs pointing to our "How to package Qt based stuff" page
+     (Closes: #810282). Thanks Jakob Haufe for the pointer.
+   * Merge platforms plugins back into libqt5gui5: libqt5egldeviceintegration5
+     and libqt5xcbqpa5(Closes: #796956, #802715, #809172, #809176).
+     - Avoid creating shlibs and symbols files for the private libraries they
+       ship.
+     - Add lintian overrides for the plugins's private libs. See the override's
+       description for more info.
+     - Add proper Breaks+Replaces.
+     - Remove other mentions of them.
+     - Add a transitional dummy package for libqt5xcbqpa5 as it's the only one
+       which has rdeps. We can safely remove it after the rdeps are fixed
+       (they are manually added).
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Wed, 20 Jan 2016 18:06:21 -0300
+ 
 +qtbase-opensource-src (5.5.1+dfsg-12ubuntu1) UNRELEASED; urgency=medium
 +
 +  * Backport XCB patch related to screen disconnection handling QTBUG-42985:
 +    - xcb-fix-yet-another-crash-when-screens-are-disconnec.patch
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 18 Jan 2016 08:36:13 +0000
 +
  qtbase-opensource-src (5.5.1+dfsg-12) unstable; urgency=medium
  
    * Backport xcb_dont_select_XInput_events_on_root_window.patch
diff --cc debian/rules
index 868f189,470424e..220c900
--- a/debian/rules
+++ b/debian/rules
@@@ -385,9 -326,8 +385,14 @@@ override_dh_strip
  	dh_strip --remaining-packages --dbg-package=qtbase5-dbg
  
  override_dh_makeshlibs:
++<<<<<<< HEAD
 +	# Don't uncomment until rid of -gles packages
 +	#dh_makeshlibs -V
 +	dh_makeshlibs
++=======
+ 	dh_makeshlibs -V -plibqt5gui5 -XlibQt5EglDeviceIntegration.so -X libQt5XcbQpa.so
+ 	dh_makeshlibs -V --remaining-packages
++>>>>>>> experimental
  
  override_dh_clean:
  	dh_clean

-- 
qtbase packaging