Merge lp:~mitya57/ubuntu/saucy/qtbase-opensource-src/merge into lp:ubuntu/saucy/qtbase-opensource-src

[Dmitry Shachnev]

This is a merge from Debian, which needs to be done to unblock landing of new qtmultimedia and qtdoc packages.

It's all committed to the bzr branch (though it has 5.1 beta, not 5.0.2).

[Timo Jyrinki (timo-jyrinki)]

Looks good to me, only nitpick being that all of it is yet in ~kubuntu-packaging's branch.

review: Approve

[Timo Jyrinki (timo-jyrinki)]

(ie could be pushed to lp:~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src_5.0.2 while 5.1 is being worked on in the main pkging branch - but the main branch is the same as this one, just adopted to 5.1 work I did earlier)

[Dmitry Shachnev (mitya57)]

@Sebastien: Thanks for uploading this!

@Timo: Sorry, I didn't know that such a branch exists, and my merge was not based on it. I've rebased both branches against my upload now.

=== modified file 'debian/README.source'
--- debian/README.source	2013-05-03 09:40:08 +0000
+++ debian/README.source	2013-06-28 14:52:08 +0000
@@ -13,6 +13,14 @@
 tests/auto/corelib/tools/qbytearray/rfc3252.txt 
 tests/auto/corelib/io/qtextstream/rfc3261.txt
 
+Bootstrapping the documentation
+-------------------------------
+
+To build the documentation you need to first bootstrap the packages. This is
+easily done by first building only arch: any packages of qtbase and qttools.
+Using this packages, rebuild the full source, this time including arch: all
+packages.
+
 Patches to the original source code
 -----------------------------------
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-05-03 09:40:08 +0000
+++ debian/changelog	2013-06-28 14:52:08 +0000
@@ -1,3 +1,77 @@
+qtbase-opensource-src (5.0.2+dfsg1-7ubuntu1) saucy; urgency=low
+
+  * Merge with Debian experimental, remaining changes:
+    - Remove firebird and ibase dependencies
+    - Build-depend on libxkbcommon-dev
+    - Maintainer fields and Vcs-Bzr
+    - Provides: qt-default to qt5-default
+    - Add patches:
+      + make_QColor_understand_AARRGGBB.patch
+      + add_since_52_to_new_QColor_features.patch
+      + disable_overlay_scrollbars.diff
+      + fix_maliit_activation.patch
+      + 0001-Implement-XEmbed-protocol.patch
+      + enable_appmenu_support.diff
+      + inputmethod_fix_focusout.patch
+    - Use our symbols files
+
+ -- Dmitry Shachnev <[e-mail]>  Thu, 27 Jun 2013 16:29:34 +0400
+
+qtbase-opensource-src (5.0.2+dfsg1-7) experimental; urgency=low
+
+  * Mark libgbm-dev as linux-any. Other OSs do not have it.
+  * Add the qkms plugin to the armhf list of files to install.
+  * Update symbols files.
+  * From the armhf build log: "The -arch and -host-arch options are obsolete".
+    Remove the relevant armv6 option from debian/rules.
+  * Add a lintian override for libqt5xml5, which rightfully declares a
+    dependency on qtbase-abi-5-0-2.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <[e-mail]>  Wed, 26 Jun 2013 00:01:03 -0300
+
+qtbase-opensource-src (5.0.2+dfsg1-6) experimental; urgency=low
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Make packages that ship a binary managed by qtchooser depend on it.
+  * Build the documentation shipped with this submodule as a build-indep task:
+    - Add the necessary indep build dependencies:
+      * qttools5-dev-tools to use qhelpgenerator.
+      * libqt5sql5-sqlite to generate qch doc.
+    - Build and create a packages for qch and HTML doc formats.
+    - Document how to bootstrap the packages in order to be able to build the
+      documentation.
+  * Update symbols files.
+  * Add build dependencies to build support for:
+    - ALSA.
+    - PulseAudio.
+    - OpenVG.
+    - GStreamer.
+  * Add libgbm-dev as Build-Dep, necessary for KMS support.
+  * Apply Rename-qAbs-Function-for-timeval.patch taken from upstream to solve
+    FTBFS with GCC 4.8.
+  * Update Standards-Version to 3.9.4. No changes needed.
+  * Make qtbase5-dbg M-A same.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <[e-mail]>  Wed, 19 Jun 2013 19:34:49 -0300
+
+qtbase-opensource-src (5.0.2+dfsg1-5) experimental; urgency=low
+
+  [ Pino Toscano ]
+  * Update symbols files.
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Also ship 5.conf. This makes calls to qtchooser prettier: qtchooser -qt5.
+  * Add lintian overrides for packages that depend on the private API/ABI,
+    it's totally correct for them to do so.
+
+  [ Sune Vuorela ]
+  * Prepare symbol files to track private symbols.
+  * Make libqt5core5 provide a virtual package to track the non-public api/abi.
+  * Create a script to mark symbols as private.
+  * Mark private symbols as private.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <[e-mail]>  Thu, 30 May 2013 17:53:00 -0300
+
 qtbase-opensource-src (5.0.2+dfsg1-4ubuntu1) saucy; urgency=low
 
   [ Ken VanDine ]
 
=== modified file 'debian/control'
--- debian/control	2013-05-03 09:40:08 +0000
+++ debian/control	2013-06-28 14:52:08 +0000
@@ -13,20 +13,27 @@
                dpkg-dev (>= 1.16.1),
                freetds-dev,
                gdb,
+               libasound2-dev,
                libatspi2.0-dev,
                libcups2-dev,
                libdbus-1-dev,
                libfontconfig1-dev,
                libfreetype6-dev,
+               libgbm-dev [linux-any],
                libgl1-mesa-dev | libgl-dev,
                libgles2-mesa-dev [linux-any] | libgles2-dev [linux-any],
                libglib2.0-dev,
                libglu1-mesa-dev | libglu-dev,
+               libgstreamer-plugins-base0.10-dev,
+               libgstreamer0.10-dev,
+               libgtk2.0-dev,
                libicu-dev,
                libjpeg-dev,
                libmysqlclient-dev,
+               libopenvg1-mesa-dev,
                libpng-dev,
                libpq-dev,
+               libpulse-dev,
                libsqlite3-dev,
                libssl-dev,
                libudev-dev [linux-any],
@@ -48,9 +55,9 @@
                libxrender-dev,
                pkg-kde-tools (>= 0.14.2),
                unixodbc-dev,
-               zlib1g-dev,
-               libgtk2.0-dev
-Standards-Version: 3.9.3
+               zlib1g-dev
+Build-Depends-Indep: libqt5sql5-sqlite, qttools5-dev-tools (>= 5.0.2~)
+Standards-Version: 3.9.4
 Homepage: http://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtbase.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qtbase.git;a=summary
@@ -60,6 +67,7 @@
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Provides: qtbase-abi-5-0-2
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: libthai0
 Description: Qt 5 core module
@@ -305,7 +313,7 @@
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: libqt5opengl5 (= ${binary:Version}),
          qtbase5-dev (= ${binary:Version}),
-         ${misc:Depends},
+         ${misc:Depends}
 Description: Qt 5 OpenGL library development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -318,8 +326,7 @@
 Multi-Arch: foreign
 Section: devel
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${perl:Depends}
-Recommends: qtchooser
+Depends: qtchooser, ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Description: Qt 5 base development programs
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -333,8 +340,7 @@
 Multi-Arch: foreign
 Section: devel
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: qtchooser
+Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 5 qmake Makefile generator tool
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -365,6 +371,7 @@
 Package: qtbase5-dbg
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Section: debug
 Depends: libqt5core5 (= ${binary:Version}), ${misc:Depends}
 Description: Qt 5 base library debugging symbols
@@ -401,7 +408,7 @@
 
 Package: qt5-default
 Architecture: any
-Depends: qtchooser, qtbase5-dev, ${misc:Depends}
+Depends: qtbase5-dev, qtchooser, ${misc:Depends}
 Conflicts: qt4-default
 Provides: qt-default
 Suggests: qt5-qmake, qtbase5-dev-tools
@@ -413,3 +420,26 @@
  using development binaries like qmake. It provides a default
  configuration for qtchooser, but does not prevent alternative Qt
  installations from being used.
+
+Package: qtbase5-doc
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 base documentation
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the documentation for the Qt 5 base libraries.
+
+Package: qtbase5-doc-html
+Priority: extra
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 base HTML documentation
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the HTML documentation for the Qt 5 base
+ libraries.
 
=== modified file 'debian/copyright'
--- debian/copyright	2013-05-03 09:40:08 +0000
+++ debian/copyright	2013-06-28 14:52:08 +0000
@@ -33,7 +33,7 @@
 Copyright: 2011 Klarälvdalens Datakonsult AB, a KDAB Group company
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
 
-Files: tests/manual/cocoa/menus/main.cpp src/plugins/platforms/cocoa/qcocoamenubar.mm src/plugins/platforms/cocoa/qcocoamenuitem.mm src/plugins/platforms/cocoa/qcocoamenu.h src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm src/plugins/platforms/cocoa/qcocoasystemtrayicon.h src/plugins/platforms/cocoa/qcocoamenubar.h src/plugins/platforms/cocoa/qcocoamenuitem.h src/plugins/platforms/cocoa/qcocoamenu.mm 
+Files: tests/manual/cocoa/menus/main.cpp src/plugins/platforms/cocoa/qcocoamenubar.mm src/plugins/platforms/cocoa/qcocoamenuitem.mm src/plugins/platforms/cocoa/qcocoamenu.h src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm src/plugins/platforms/cocoa/qcocoasystemtrayicon.h src/plugins/platforms/cocoa/qcocoamenubar.h src/plugins/platforms/cocoa/qcocoamenuitem.h src/plugins/platforms/cocoa/qcocoamenu.mm
 Copyright: 2011 Klarälvdalens Datakonsult AB, a KDAB Group company
            2007-2008 Apple, Inc.
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
@@ -60,7 +60,7 @@
 Copyright: 2012 Jeremy Lain
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
-Files: src/network/doc/snippets/code/src_network_kernel_qdnslookup.cpp examples/network/dnslookup/dnslookup.cpp examples/network/dnslookup/dnslookup.h 
+Files: src/network/doc/snippets/code/src_network_kernel_qdnslookup.cpp examples/network/dnslookup/dnslookup.cpp examples/network/dnslookup/dnslookup.h
 Copyright: 2012 Jeremy Lain
 License: BSD-3-clause
 
@@ -137,11 +137,11 @@
 Copyright: 2011-2012 Olivier Goffart
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
-Files: src/network/ssl/qsslcertificateextension_p.h src/network/ssl/qsslcertificateextension.cpp src/network/ssl/qsslcertificateextension.h 
+Files: src/network/ssl/qsslcertificateextension_p.h src/network/ssl/qsslcertificateextension.cpp src/network/ssl/qsslcertificateextension.h
 Copyright: 2011 Richard J. Moore
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
-Files: tests/benchmarks/corelib/tools/qalgorithms/tst_qalgorithms.cpp tests/benchmarks/corelib/kernel/qcoreapplication/main.cpp 
+Files: tests/benchmarks/corelib/tools/qalgorithms/tst_qalgorithms.cpp tests/benchmarks/corelib/kernel/qcoreapplication/main.cpp
 Copyright: 2011-2012 Robin Burchell
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
@@ -240,7 +240,7 @@
  otherwise to promote the sale, use or other dealings in this Font Software
  without prior written authorization from the Gnome Foundation or Bitstream
  Inc., respectively. For further information, contact: fonts at gnome dot
- org. 
+ org.
  .
  Arev Fonts Copyright
  .
@@ -264,7 +264,7 @@
  the words "Tavmjong Bah" or the word "Arev".
  .
  This License becomes null and void to the extent applicable to Fonts
- or Font Software that has been modified and is distributed under the 
+ or Font Software that has been modified and is distributed under the
  "Tavmjong Bah Arev" names.
  .
  The Font Software may be sold as part of a larger software package but
@@ -306,7 +306,7 @@
 Copyright: -
 License: Public Domain
  A public domain font. Share and enjoy. http://www.X.org
- 
+
 Files: lib/fonts/unifont_160_50.qpf
 Copyright: Roman Czyborra
 License:
@@ -318,7 +318,7 @@
  and have given a quick thought about whether Roman might perhaps be interested
  to read what you did with his stuff. Horizontal rules don't apply.
 
-Files: tests/manual/widgets/itemviews/delegate/example.cpp tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp tests/manual/widgets/qgraphicsview/rubberband/rubberbandtest.cpp tests/benchmarks/gui/itemviews/qheaderview/qheaderviewbench.cpp tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp 
+Files: tests/manual/widgets/itemviews/delegate/example.cpp tests/manual/widgets/itemviews/qheaderview/qheaderviewtest1.cpp tests/manual/widgets/qgraphicsview/rubberband/rubberbandtest.cpp tests/benchmarks/gui/itemviews/qheaderview/qheaderviewbench.cpp tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
 Copyright: 2012 Thorbjørn Lund Martsum
 License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
 
@@ -331,37 +331,37 @@
 License: Unicode, Inc. License Agreement
  COPYRIGHT AND PERMISSION NOTICE
  .
- Copyright © 1991-2012 Unicode, Inc. All rights reserved. 
+ Copyright © 1991-2012 Unicode, Inc. All rights reserved.
  Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
  .
- Permission is hereby granted, free of charge, to any person obtaining a 
- copy of the Unicode data files and any associated documentation (the "Data 
- Files") or Unicode software and any associated documentation (the "Software") 
- to deal in the Data Files or Software without restriction, including without 
- limitation the rights to use, copy, modify, merge, publish, distribute, 
- and/or sell copies of the Data Files or Software, and to permit persons to 
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of the Unicode data files and any associated documentation (the "Data
+ Files") or Unicode software and any associated documentation (the "Software")
+ to deal in the Data Files or Software without restriction, including without
+ limitation the rights to use, copy, modify, merge, publish, distribute,
+ and/or sell copies of the Data Files or Software, and to permit persons to
  whom the Data Files or Software are furnished to do so, provided that (a)
- the above copyright notice(s) and this permission notice appear with all 
- copies of the Data Files or Software, (b) both the above copyright 
- notice(s) and this permission notice appear in associated documentation, 
- and (c) there is clear notice in each modified Data File or in the 
- Software as well as in the documentation associated with the Data File(s)  
+ the above copyright notice(s) and this permission notice appear with all
+ copies of the Data Files or Software, (b) both the above copyright
+ notice(s) and this permission notice appear in associated documentation,
+ and (c) there is clear notice in each modified Data File or in the
+ Software as well as in the documentation associated with the Data File(s)
  or Software that the data or software has been modified.
  .
- THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY 
- KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF 
- THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS 
- INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT 
- OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS 
- OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR 
- OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR 
+ THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+ KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+ THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
+ INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
+ OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  PERFORMANCE OF THE DATA FILES OR SOFTWARE.
  .
- Except as contained in this notice, the name of a copyright holder 
- shall not be used in advertising or otherwise to promote the sale, 
- use or other dealings in these Data Files or Software without prior 
- written authorization of the copyright holder. 
+ Except as contained in this notice, the name of a copyright holder
+ shall not be used in advertising or otherwise to promote the sale,
+ use or other dealings in these Data Files or Software without prior
+ written authorization of the copyright holder.
 
 Files: src/gui/text/qharfbuzz_copy_p.h
        src/3rdparty/harfbuzz/*
@@ -924,7 +924,7 @@
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
 License: GFDL-1.3
 
-Files: src/printsupport/kernel/qprinterinfo.cpp 
+Files: src/printsupport/kernel/qprinterinfo.cpp
 Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
 License: GFDL-1.3
 
@@ -939,4 +939,3 @@
  .
  On Debian systems, the complete text of the GFDL-1.3 license can be found in
  `/usr/share/common-licenses/GFDL-1.3`,
-
 
=== added file 'debian/libqt5concurrent5.lintian-overrides'
--- debian/libqt5concurrent5.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/libqt5concurrent5.lintian-overrides	2013-06-28 14:52:08 +0000
@@ -0,0 +1,3 @@
+# This dependency has been added to track external packages building against
+# our private headers. It is ok if internal packages depend on the ABI one.
+libqt5concurrent5: symbols-declares-dependency-on-other-package qtbase-abi-5-0-2
 
=== modified file 'debian/libqt5core5.install'
--- debian/libqt5core5.install	2013-05-03 09:40:08 +0000
+++ debian/libqt5core5.install	2013-06-28 14:52:08 +0000
@@ -1,3 +1,4 @@
 usr/lib/*/libQt5Core.so.*
+usr/lib/*/qtchooser/5.conf
 usr/lib/*/qtchooser/qt5.conf
 usr/share/qtchooser/qt5-*.conf
 
=== added file 'debian/libqt5dbus5.lintian-overrides'
--- debian/libqt5dbus5.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/libqt5dbus5.lintian-overrides	2013-06-28 14:52:08 +0000
@@ -0,0 +1,3 @@
+# This dependency has been added to track external packages building against
+# our private headers. It is ok if internal packages depend on the ABI one.
+libqt5dbus5: symbols-declares-dependency-on-other-package qtbase-abi-5-0-2
 
=== modified file 'debian/libqt5gui5.install-armhf'
--- debian/libqt5gui5.install-armhf	2013-04-20 13:37:32 +0000
+++ debian/libqt5gui5.install-armhf	2013-06-28 14:52:08 +0000
@@ -1,2 +1,3 @@
 usr/lib/*/qt5/plugins/platforms/libqminimalegl.so
 usr/lib/*/qt5/plugins/platforms/libqeglfs.so
+usr/lib/*/qt5/plugins/platforms/libqkms.so
 
=== added file 'debian/libqt5gui5.lintian-overrides'
--- debian/libqt5gui5.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/libqt5gui5.lintian-overrides	2013-06-28 14:52:08 +0000
@@ -0,0 +1,3 @@
+# This dependency has been added to track external packages building against
+# our private headers. It is ok if internal packages depend on the ABI one.
+libqt5gui5: symbols-declares-dependency-on-other-package qtbase-abi-5-0-2
 
=== added file 'debian/libqt5network5.lintian-overrides'
--- debian/libqt5network5.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/libqt5network5.lintian-overrides	2013-06-28 14:52:08 +0000
@@ -0,0 +1,3 @@
+# This dependency has been added to track external packages building against
+# our private headers. It is ok if internal packages depend on the ABI one.
+libqt5network5: symbols-declares-dependency-on-other-package qtbase-abi-5-0-2
 
=== added file 'debian/libqt5opengl5.lintian-overrides'
--- debian/libqt5opengl5.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/libqt5opengl5.lintian-overrides	2013-06-28 14:52:08 +0000
@@ -0,0 +1,3 @@
+# This dependency has been added to track external packages building against
+# our private headers. It is ok if internal packages depend on the ABI one.
+libqt5opengl5: symbols-declares-dependency-on-other-package qtbase-abi-5-0-2
 
=== added file 'debian/libqt5printsupport5.lintian-overrides'
--- debian/libqt5printsupport5.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/libqt5printsupport5.lintian-overrides	2013-06-28 14:52:08 +0000
@@ -0,0 +1,3 @@
+# This dependency has been added to track external packages building against
+# our private headers. It is ok if internal packages depend on the ABI one.
+libqt5printsupport5: symbols-declares-dependency-on-other-package qtbase-abi-5-0-2
 
=== added file 'debian/libqt5sql5.lintian-overrides'
--- debian/libqt5sql5.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/libqt5sql5.lintian-overrides	2013-06-28 14:52:08 +0000
@@ -0,0 +1,3 @@
+# This dependency has been added to track external packages building against
+# our private headers. It is ok if internal packages depend on the ABI one.
+libqt5sql5: symbols-declares-dependency-on-other-package qtbase-abi-5-0-2
 
=== added file 'debian/libqt5test5.lintian-overrides'
--- debian/libqt5test5.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/libqt5test5.lintian-overrides	2013-06-28 14:52:08 +0000
@@ -0,0 +1,3 @@
+# This dependency has been added to track external packages building against
+# our private headers. It is ok if internal packages depend on the ABI one.
+libqt5test5: symbols-declares-dependency-on-other-package qtbase-abi-5-0-2
 
=== added file 'debian/libqt5widgets5.lintian-overrides'
--- debian/libqt5widgets5.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/libqt5widgets5.lintian-overrides	2013-06-28 14:52:08 +0000
@@ -0,0 +1,3 @@
+# This dependency has been added to track external packages building against
+# our private headers. It is ok if internal packages depend on the ABI one.
+libqt5widgets5: symbols-declares-dependency-on-other-package qtbase-abi-5-0-2
 
=== added file 'debian/libqt5xml5.lintian-overrides'
--- debian/libqt5xml5.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/libqt5xml5.lintian-overrides	2013-06-28 14:52:08 +0000
@@ -0,0 +1,3 @@
+# This dependency has been added to track external packages building against
+# our private headers. It is ok if internal packages depend on the ABI one.
+libqt5xml5: symbols-declares-dependency-on-other-package qtbase-abi-5-0-2
 
=== added file 'debian/mark_private_symbols.sh'
--- debian/mark_private_symbols.sh	1970-01-01 00:00:00 +0000
+++ debian/mark_private_symbols.sh	2013-06-28 14:52:08 +0000
@@ -0,0 +1,30 @@
+#! /bin/sh
+
+PRIVATE_HEADERS=qtbase5-private-dev/usr/include
+
+error() {
+	echo $@
+	exit 1
+}
+
+debug() {
+	[ -n "${DEBUG}" ] && echo $@
+}
+
+if [ ! -e "${PRIVATE_HEADERS}" ] 
+then
+	error "Private headers not found"
+fi
+
+grep -rh class qtbase5-private-dev/usr/include | 
+	grep EXPORT | 
+	while read class export classname rest 
+	do
+		echo ${#classname}${classname} 
+	done | 
+	while read privateclass 
+	do
+		debug marking ${privateclass} as private
+		sed -i "s/\(.*${privateclass}[^ ]* *[^ ]*\)$/\1 1/" *.symbols 
+	done 
+
 
=== renamed file 'debian/patches/rename_qabs_function_for_timeval.patch' => 'debian/patches/Rename-qAbs-Function-for-timeval.patch'
--- debian/patches/rename_qabs_function_for_timeval.patch	2013-05-03 09:40:08 +0000
+++ debian/patches/Rename-qAbs-Function-for-timeval.patch	2013-06-28 14:52:08 +0000
@@ -1,4 +1,4 @@
-From 1fa6e7399c9e5cdaac73f358ceb3f6501517e16d Mon Sep 17 00:00:00 2001
+From d9ff510f02bba63dabe7a081a68296056a89ae4c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= <[e-mail]>
 Date: Sat, 23 Feb 2013 23:14:50 -0500
 Subject: [PATCH] Rename qAbs Function for timeval
@@ -8,6 +8,7 @@
 GCC 4.8
 
 Change-Id: I78e02256ffc8b460ca74ae5241e77dfac4e09ba9
+Reviewed-by: Thiago Macieira <[e-mail]>
 ---
  src/corelib/kernel/qtimerinfo_unix.cpp | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
@@ -36,5 +37,5 @@
  
  /*
 -- 
-1.8.1.2
+1.8.3.1
 
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-05-03 09:40:08 +0000
+++ debian/patches/series	2013-06-28 14:52:08 +0000
@@ -5,7 +5,7 @@
 make_QColor_understand_AARRGGBB.patch
 add_since_52_to_new_QColor_features.patch
 inputmethod_fix_focusout.patch
-rename_qabs_function_for_timeval.patch
+Rename-qAbs-Function-for-timeval.patch
 
 # Debian specific.
 build_examples.patch
 
=== added file 'debian/qtbase5-doc-html.install'
--- debian/qtbase5-doc-html.install	1970-01-01 00:00:00 +0000
+++ debian/qtbase5-doc-html.install	2013-06-28 14:52:08 +0000
@@ -0,0 +1,12 @@
+usr/share/qt5/doc/qdoc/
+usr/share/qt5/doc/qtconcurrent/
+usr/share/qt5/doc/qtcore/
+usr/share/qt5/doc/qtdbus/
+usr/share/qt5/doc/qtgui/
+usr/share/qt5/doc/qtnetwork/
+usr/share/qt5/doc/qtopengl/
+usr/share/qt5/doc/qtprintsupport/
+usr/share/qt5/doc/qtsql/
+usr/share/qt5/doc/qttestlib/
+usr/share/qt5/doc/qtwidgets/
+usr/share/qt5/doc/qtxml/
 
=== added file 'debian/qtbase5-doc.install'
--- debian/qtbase5-doc.install	1970-01-01 00:00:00 +0000
+++ debian/qtbase5-doc.install	2013-06-28 14:52:08 +0000
@@ -0,0 +1,12 @@
+usr/share/qt5/doc/qdoc.qch
+usr/share/qt5/doc/qtconcurrent.qch
+usr/share/qt5/doc/qtcore.qch
+usr/share/qt5/doc/qtdbus.qch
+usr/share/qt5/doc/qtgui.qch
+usr/share/qt5/doc/qtnetwork.qch
+usr/share/qt5/doc/qtopengl.qch
+usr/share/qt5/doc/qtprintsupport.qch
+usr/share/qt5/doc/qtsql.qch
+usr/share/qt5/doc/qttestlib.qch
+usr/share/qt5/doc/qtwidgets.qch
+usr/share/qt5/doc/qtxml.qch
 
=== modified file 'debian/rules'
--- debian/rules	2013-05-03 09:40:08 +0000
+++ debian/rules	2013-06-28 14:52:08 +0000
@@ -57,9 +57,6 @@
 ifeq ($(vendor),Ubuntu)
 	armv6_architectures += armel
 endif
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(armv6_architectures)))
-	extra_configure_opts += -arch armv6
-endif
 
 gles2_architectures := armel armhf
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
@@ -211,7 +208,10 @@
 	rm -rf po
 endif
 
-override_dh_auto_install:
+override_dh_auto_build-indep:
+	dh_auto_build -Smakefile -- docs
+
+override_dh_auto_install-arch:
 	dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp/
 
 	# Fix wrong path in pkgconfig files
@@ -223,8 +223,10 @@
 	echo "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin" > $(CURDIR)/debian/tmp/usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf
 	echo "/usr/lib/$(DEB_HOST_MULTIARCH)" >> $(CURDIR)/debian/tmp/usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf
 
-	# Ship qt5.conf for this arch, and a default.conf.
+	# Ship 5.conf and qt5.conf for this arch, and a default.conf.
+	# 5.conf makes calling qtchooser prettier.
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser
+	ln -s /usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/5.conf
 	ln -s /usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/qt5.conf
 	ln -s /usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/default.conf
 
@@ -245,6 +247,9 @@
 		-regex '.*\.\(app\|conf\|cpp\|h\|js\|php\|png\|pro\|xml\|xsl\)$$' \
 		-exec chmod a-x {} \;
 
+override_dh_auto_install-indep:
+	make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
+
 override_dh_install:
 	# Now flush all the .install-* files as .install files.
 	set -e; for pkg in $(pkgs_with_common); do \