Merge lp:~mitya57/ubuntu/saucy/qtbase-opensource-src/merge into lp:ubuntu/saucy/qtbase-opensource-src
- Saucy (13.10)
- merge
- Merge into saucy
Proposed by
Dmitry Shachnev
Status: | Merged |
---|---|
Merged at revision: | 8 |
Proposed branch: | lp:~mitya57/ubuntu/saucy/qtbase-opensource-src/merge |
Merge into: | lp:ubuntu/saucy/qtbase-opensource-src |
Diff against target: |
626 lines (+254/-51) 22 files modified
debian/README.source (+8/-0) debian/changelog (+74/-0) debian/control (+39/-9) debian/copyright (+33/-34) debian/libqt5concurrent5.lintian-overrides (+3/-0) debian/libqt5core5.install (+1/-0) debian/libqt5dbus5.lintian-overrides (+3/-0) debian/libqt5gui5.install-armhf (+1/-0) debian/libqt5gui5.lintian-overrides (+3/-0) debian/libqt5network5.lintian-overrides (+3/-0) debian/libqt5opengl5.lintian-overrides (+3/-0) debian/libqt5printsupport5.lintian-overrides (+3/-0) debian/libqt5sql5.lintian-overrides (+3/-0) debian/libqt5test5.lintian-overrides (+3/-0) debian/libqt5widgets5.lintian-overrides (+3/-0) debian/libqt5xml5.lintian-overrides (+3/-0) debian/mark_private_symbols.sh (+30/-0) debian/patches/Rename-qAbs-Function-for-timeval.patch (+3/-2) debian/patches/series (+1/-1) debian/qtbase5-doc-html.install (+12/-0) debian/qtbase5-doc.install (+12/-0) debian/rules (+10/-5) |
To merge this branch: | bzr merge lp:~mitya57/ubuntu/saucy/qtbase-opensource-src/merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Timo Jyrinki | Approve | ||
Ubuntu branches | Pending | ||
Review via email: mp+172053@code.launchpad.net |
Commit message
Description of the change
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).
To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote : | # |
(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)
Revision history for this message
Dmitry Shachnev (mitya57) wrote : | # |
@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.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/README.source' |
2 | --- debian/README.source 2013-05-03 09:40:08 +0000 |
3 | +++ debian/README.source 2013-06-28 14:52:08 +0000 |
4 | @@ -13,6 +13,14 @@ |
5 | tests/auto/corelib/tools/qbytearray/rfc3252.txt |
6 | tests/auto/corelib/io/qtextstream/rfc3261.txt |
7 | |
8 | +Bootstrapping the documentation |
9 | +------------------------------- |
10 | + |
11 | +To build the documentation you need to first bootstrap the packages. This is |
12 | +easily done by first building only arch: any packages of qtbase and qttools. |
13 | +Using this packages, rebuild the full source, this time including arch: all |
14 | +packages. |
15 | + |
16 | Patches to the original source code |
17 | ----------------------------------- |
18 | |
19 | |
20 | === modified file 'debian/changelog' |
21 | --- debian/changelog 2013-05-03 09:40:08 +0000 |
22 | +++ debian/changelog 2013-06-28 14:52:08 +0000 |
23 | @@ -1,3 +1,77 @@ |
24 | +qtbase-opensource-src (5.0.2+dfsg1-7ubuntu1) saucy; urgency=low |
25 | + |
26 | + * Merge with Debian experimental, remaining changes: |
27 | + - Remove firebird and ibase dependencies |
28 | + - Build-depend on libxkbcommon-dev |
29 | + - Maintainer fields and Vcs-Bzr |
30 | + - Provides: qt-default to qt5-default |
31 | + - Add patches: |
32 | + + make_QColor_understand_AARRGGBB.patch |
33 | + + add_since_52_to_new_QColor_features.patch |
34 | + + disable_overlay_scrollbars.diff |
35 | + + fix_maliit_activation.patch |
36 | + + 0001-Implement-XEmbed-protocol.patch |
37 | + + enable_appmenu_support.diff |
38 | + + inputmethod_fix_focusout.patch |
39 | + - Use our symbols files |
40 | + |
41 | + -- Dmitry Shachnev <mitya57@ubuntu.com> Thu, 27 Jun 2013 16:29:34 +0400 |
42 | + |
43 | +qtbase-opensource-src (5.0.2+dfsg1-7) experimental; urgency=low |
44 | + |
45 | + * Mark libgbm-dev as linux-any. Other OSs do not have it. |
46 | + * Add the qkms plugin to the armhf list of files to install. |
47 | + * Update symbols files. |
48 | + * From the armhf build log: "The -arch and -host-arch options are obsolete". |
49 | + Remove the relevant armv6 option from debian/rules. |
50 | + * Add a lintian override for libqt5xml5, which rightfully declares a |
51 | + dependency on qtbase-abi-5-0-2. |
52 | + |
53 | + -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Wed, 26 Jun 2013 00:01:03 -0300 |
54 | + |
55 | +qtbase-opensource-src (5.0.2+dfsg1-6) experimental; urgency=low |
56 | + |
57 | + [ Lisandro Damián Nicanor Pérez Meyer ] |
58 | + * Make packages that ship a binary managed by qtchooser depend on it. |
59 | + * Build the documentation shipped with this submodule as a build-indep task: |
60 | + - Add the necessary indep build dependencies: |
61 | + * qttools5-dev-tools to use qhelpgenerator. |
62 | + * libqt5sql5-sqlite to generate qch doc. |
63 | + - Build and create a packages for qch and HTML doc formats. |
64 | + - Document how to bootstrap the packages in order to be able to build the |
65 | + documentation. |
66 | + * Update symbols files. |
67 | + * Add build dependencies to build support for: |
68 | + - ALSA. |
69 | + - PulseAudio. |
70 | + - OpenVG. |
71 | + - GStreamer. |
72 | + * Add libgbm-dev as Build-Dep, necessary for KMS support. |
73 | + * Apply Rename-qAbs-Function-for-timeval.patch taken from upstream to solve |
74 | + FTBFS with GCC 4.8. |
75 | + * Update Standards-Version to 3.9.4. No changes needed. |
76 | + * Make qtbase5-dbg M-A same. |
77 | + |
78 | + -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Wed, 19 Jun 2013 19:34:49 -0300 |
79 | + |
80 | +qtbase-opensource-src (5.0.2+dfsg1-5) experimental; urgency=low |
81 | + |
82 | + [ Pino Toscano ] |
83 | + * Update symbols files. |
84 | + |
85 | + [ Lisandro Damián Nicanor Pérez Meyer ] |
86 | + * Also ship 5.conf. This makes calls to qtchooser prettier: qtchooser -qt5. |
87 | + * Add lintian overrides for packages that depend on the private API/ABI, |
88 | + it's totally correct for them to do so. |
89 | + |
90 | + [ Sune Vuorela ] |
91 | + * Prepare symbol files to track private symbols. |
92 | + * Make libqt5core5 provide a virtual package to track the non-public api/abi. |
93 | + * Create a script to mark symbols as private. |
94 | + * Mark private symbols as private. |
95 | + |
96 | + -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Thu, 30 May 2013 17:53:00 -0300 |
97 | + |
98 | qtbase-opensource-src (5.0.2+dfsg1-4ubuntu1) saucy; urgency=low |
99 | |
100 | [ Ken VanDine ] |
101 | |
102 | === modified file 'debian/control' |
103 | --- debian/control 2013-05-03 09:40:08 +0000 |
104 | +++ debian/control 2013-06-28 14:52:08 +0000 |
105 | @@ -13,20 +13,27 @@ |
106 | dpkg-dev (>= 1.16.1), |
107 | freetds-dev, |
108 | gdb, |
109 | + libasound2-dev, |
110 | libatspi2.0-dev, |
111 | libcups2-dev, |
112 | libdbus-1-dev, |
113 | libfontconfig1-dev, |
114 | libfreetype6-dev, |
115 | + libgbm-dev [linux-any], |
116 | libgl1-mesa-dev | libgl-dev, |
117 | libgles2-mesa-dev [linux-any] | libgles2-dev [linux-any], |
118 | libglib2.0-dev, |
119 | libglu1-mesa-dev | libglu-dev, |
120 | + libgstreamer-plugins-base0.10-dev, |
121 | + libgstreamer0.10-dev, |
122 | + libgtk2.0-dev, |
123 | libicu-dev, |
124 | libjpeg-dev, |
125 | libmysqlclient-dev, |
126 | + libopenvg1-mesa-dev, |
127 | libpng-dev, |
128 | libpq-dev, |
129 | + libpulse-dev, |
130 | libsqlite3-dev, |
131 | libssl-dev, |
132 | libudev-dev [linux-any], |
133 | @@ -48,9 +55,9 @@ |
134 | libxrender-dev, |
135 | pkg-kde-tools (>= 0.14.2), |
136 | unixodbc-dev, |
137 | - zlib1g-dev, |
138 | - libgtk2.0-dev |
139 | -Standards-Version: 3.9.3 |
140 | + zlib1g-dev |
141 | +Build-Depends-Indep: libqt5sql5-sqlite, qttools5-dev-tools (>= 5.0.2~) |
142 | +Standards-Version: 3.9.4 |
143 | Homepage: http://qt-project.org/ |
144 | Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtbase.git |
145 | Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qtbase.git;a=summary |
146 | @@ -60,6 +67,7 @@ |
147 | Architecture: any |
148 | Multi-Arch: same |
149 | Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends} |
150 | +Provides: qtbase-abi-5-0-2 |
151 | Depends: ${misc:Depends}, ${shlibs:Depends} |
152 | Suggests: libthai0 |
153 | Description: Qt 5 core module |
154 | @@ -305,7 +313,7 @@ |
155 | Pre-Depends: dpkg (>= 1.15.6~) |
156 | Depends: libqt5opengl5 (= ${binary:Version}), |
157 | qtbase5-dev (= ${binary:Version}), |
158 | - ${misc:Depends}, |
159 | + ${misc:Depends} |
160 | Description: Qt 5 OpenGL library development files |
161 | Qt is a cross-platform C++ application framework. Qt's primary feature |
162 | is its rich set of widgets that provide standard GUI functionality. |
163 | @@ -318,8 +326,7 @@ |
164 | Multi-Arch: foreign |
165 | Section: devel |
166 | Pre-Depends: dpkg (>= 1.15.6~) |
167 | -Depends: ${misc:Depends}, ${shlibs:Depends}, ${perl:Depends} |
168 | -Recommends: qtchooser |
169 | +Depends: qtchooser, ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends} |
170 | Description: Qt 5 base development programs |
171 | Qt is a cross-platform C++ application framework. Qt's primary feature |
172 | is its rich set of widgets that provide standard GUI functionality. |
173 | @@ -333,8 +340,7 @@ |
174 | Multi-Arch: foreign |
175 | Section: devel |
176 | Pre-Depends: dpkg (>= 1.15.6~) |
177 | -Depends: ${misc:Depends}, ${shlibs:Depends} |
178 | -Recommends: qtchooser |
179 | +Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends} |
180 | Description: Qt 5 qmake Makefile generator tool |
181 | Qt is a cross-platform C++ application framework. Qt's primary feature |
182 | is its rich set of widgets that provide standard GUI functionality. |
183 | @@ -365,6 +371,7 @@ |
184 | Package: qtbase5-dbg |
185 | Priority: extra |
186 | Architecture: any |
187 | +Multi-Arch: same |
188 | Section: debug |
189 | Depends: libqt5core5 (= ${binary:Version}), ${misc:Depends} |
190 | Description: Qt 5 base library debugging symbols |
191 | @@ -401,7 +408,7 @@ |
192 | |
193 | Package: qt5-default |
194 | Architecture: any |
195 | -Depends: qtchooser, qtbase5-dev, ${misc:Depends} |
196 | +Depends: qtbase5-dev, qtchooser, ${misc:Depends} |
197 | Conflicts: qt4-default |
198 | Provides: qt-default |
199 | Suggests: qt5-qmake, qtbase5-dev-tools |
200 | @@ -413,3 +420,26 @@ |
201 | using development binaries like qmake. It provides a default |
202 | configuration for qtchooser, but does not prevent alternative Qt |
203 | installations from being used. |
204 | + |
205 | +Package: qtbase5-doc |
206 | +Priority: extra |
207 | +Architecture: all |
208 | +Section: doc |
209 | +Depends: ${misc:Depends} |
210 | +Description: Qt 5 base documentation |
211 | + Qt is a cross-platform C++ application framework. Qt's primary feature |
212 | + is its rich set of widgets that provide standard GUI functionality. |
213 | + . |
214 | + This package contains the documentation for the Qt 5 base libraries. |
215 | + |
216 | +Package: qtbase5-doc-html |
217 | +Priority: extra |
218 | +Architecture: all |
219 | +Section: doc |
220 | +Depends: ${misc:Depends} |
221 | +Description: Qt 5 base HTML documentation |
222 | + Qt is a cross-platform C++ application framework. Qt's primary feature |
223 | + is its rich set of widgets that provide standard GUI functionality. |
224 | + . |
225 | + This package contains the HTML documentation for the Qt 5 base |
226 | + libraries. |
227 | |
228 | === modified file 'debian/copyright' |
229 | --- debian/copyright 2013-05-03 09:40:08 +0000 |
230 | +++ debian/copyright 2013-06-28 14:52:08 +0000 |
231 | @@ -33,7 +33,7 @@ |
232 | Copyright: 2011 Klarälvdalens Datakonsult AB, a KDAB Group company |
233 | License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 |
234 | |
235 | -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 |
236 | +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 |
237 | Copyright: 2011 Klarälvdalens Datakonsult AB, a KDAB Group company |
238 | 2007-2008 Apple, Inc. |
239 | License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 |
240 | @@ -60,7 +60,7 @@ |
241 | Copyright: 2012 Jeremy Lain |
242 | License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 |
243 | |
244 | -Files: src/network/doc/snippets/code/src_network_kernel_qdnslookup.cpp examples/network/dnslookup/dnslookup.cpp examples/network/dnslookup/dnslookup.h |
245 | +Files: src/network/doc/snippets/code/src_network_kernel_qdnslookup.cpp examples/network/dnslookup/dnslookup.cpp examples/network/dnslookup/dnslookup.h |
246 | Copyright: 2012 Jeremy Lain |
247 | License: BSD-3-clause |
248 | |
249 | @@ -137,11 +137,11 @@ |
250 | Copyright: 2011-2012 Olivier Goffart |
251 | License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 |
252 | |
253 | -Files: src/network/ssl/qsslcertificateextension_p.h src/network/ssl/qsslcertificateextension.cpp src/network/ssl/qsslcertificateextension.h |
254 | +Files: src/network/ssl/qsslcertificateextension_p.h src/network/ssl/qsslcertificateextension.cpp src/network/ssl/qsslcertificateextension.h |
255 | Copyright: 2011 Richard J. Moore |
256 | License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 |
257 | |
258 | -Files: tests/benchmarks/corelib/tools/qalgorithms/tst_qalgorithms.cpp tests/benchmarks/corelib/kernel/qcoreapplication/main.cpp |
259 | +Files: tests/benchmarks/corelib/tools/qalgorithms/tst_qalgorithms.cpp tests/benchmarks/corelib/kernel/qcoreapplication/main.cpp |
260 | Copyright: 2011-2012 Robin Burchell |
261 | License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 |
262 | |
263 | @@ -240,7 +240,7 @@ |
264 | otherwise to promote the sale, use or other dealings in this Font Software |
265 | without prior written authorization from the Gnome Foundation or Bitstream |
266 | Inc., respectively. For further information, contact: fonts at gnome dot |
267 | - org. |
268 | + org. |
269 | . |
270 | Arev Fonts Copyright |
271 | . |
272 | @@ -264,7 +264,7 @@ |
273 | the words "Tavmjong Bah" or the word "Arev". |
274 | . |
275 | This License becomes null and void to the extent applicable to Fonts |
276 | - or Font Software that has been modified and is distributed under the |
277 | + or Font Software that has been modified and is distributed under the |
278 | "Tavmjong Bah Arev" names. |
279 | . |
280 | The Font Software may be sold as part of a larger software package but |
281 | @@ -306,7 +306,7 @@ |
282 | Copyright: - |
283 | License: Public Domain |
284 | A public domain font. Share and enjoy. http://www.X.org |
285 | - |
286 | + |
287 | Files: lib/fonts/unifont_160_50.qpf |
288 | Copyright: Roman Czyborra |
289 | License: |
290 | @@ -318,7 +318,7 @@ |
291 | and have given a quick thought about whether Roman might perhaps be interested |
292 | to read what you did with his stuff. Horizontal rules don't apply. |
293 | |
294 | -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 |
295 | +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 |
296 | Copyright: 2012 Thorbjørn Lund Martsum |
297 | License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3 |
298 | |
299 | @@ -331,37 +331,37 @@ |
300 | License: Unicode, Inc. License Agreement |
301 | COPYRIGHT AND PERMISSION NOTICE |
302 | . |
303 | - Copyright © 1991-2012 Unicode, Inc. All rights reserved. |
304 | + Copyright © 1991-2012 Unicode, Inc. All rights reserved. |
305 | Distributed under the Terms of Use in http://www.unicode.org/copyright.html. |
306 | . |
307 | - Permission is hereby granted, free of charge, to any person obtaining a |
308 | - copy of the Unicode data files and any associated documentation (the "Data |
309 | - Files") or Unicode software and any associated documentation (the "Software") |
310 | - to deal in the Data Files or Software without restriction, including without |
311 | - limitation the rights to use, copy, modify, merge, publish, distribute, |
312 | - and/or sell copies of the Data Files or Software, and to permit persons to |
313 | + Permission is hereby granted, free of charge, to any person obtaining a |
314 | + copy of the Unicode data files and any associated documentation (the "Data |
315 | + Files") or Unicode software and any associated documentation (the "Software") |
316 | + to deal in the Data Files or Software without restriction, including without |
317 | + limitation the rights to use, copy, modify, merge, publish, distribute, |
318 | + and/or sell copies of the Data Files or Software, and to permit persons to |
319 | whom the Data Files or Software are furnished to do so, provided that (a) |
320 | - the above copyright notice(s) and this permission notice appear with all |
321 | - copies of the Data Files or Software, (b) both the above copyright |
322 | - notice(s) and this permission notice appear in associated documentation, |
323 | - and (c) there is clear notice in each modified Data File or in the |
324 | - Software as well as in the documentation associated with the Data File(s) |
325 | + the above copyright notice(s) and this permission notice appear with all |
326 | + copies of the Data Files or Software, (b) both the above copyright |
327 | + notice(s) and this permission notice appear in associated documentation, |
328 | + and (c) there is clear notice in each modified Data File or in the |
329 | + Software as well as in the documentation associated with the Data File(s) |
330 | or Software that the data or software has been modified. |
331 | . |
332 | - THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY |
333 | - KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |
334 | - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF |
335 | - THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS |
336 | - INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT |
337 | - OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS |
338 | - OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR |
339 | - OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR |
340 | + THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY |
341 | + KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |
342 | + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF |
343 | + THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS |
344 | + INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT |
345 | + OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS |
346 | + OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR |
347 | + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR |
348 | PERFORMANCE OF THE DATA FILES OR SOFTWARE. |
349 | . |
350 | - Except as contained in this notice, the name of a copyright holder |
351 | - shall not be used in advertising or otherwise to promote the sale, |
352 | - use or other dealings in these Data Files or Software without prior |
353 | - written authorization of the copyright holder. |
354 | + Except as contained in this notice, the name of a copyright holder |
355 | + shall not be used in advertising or otherwise to promote the sale, |
356 | + use or other dealings in these Data Files or Software without prior |
357 | + written authorization of the copyright holder. |
358 | |
359 | Files: src/gui/text/qharfbuzz_copy_p.h |
360 | src/3rdparty/harfbuzz/* |
361 | @@ -924,7 +924,7 @@ |
362 | Copyright: 2012 Digia Plc and/or its subsidiary(-ies). |
363 | License: GFDL-1.3 |
364 | |
365 | -Files: src/printsupport/kernel/qprinterinfo.cpp |
366 | +Files: src/printsupport/kernel/qprinterinfo.cpp |
367 | Copyright: 2012 Digia Plc and/or its subsidiary(-ies). |
368 | License: GFDL-1.3 |
369 | |
370 | @@ -939,4 +939,3 @@ |
371 | . |
372 | On Debian systems, the complete text of the GFDL-1.3 license can be found in |
373 | `/usr/share/common-licenses/GFDL-1.3`, |
374 | - |
375 | |
376 | === added file 'debian/libqt5concurrent5.lintian-overrides' |
377 | --- debian/libqt5concurrent5.lintian-overrides 1970-01-01 00:00:00 +0000 |
378 | +++ debian/libqt5concurrent5.lintian-overrides 2013-06-28 14:52:08 +0000 |
379 | @@ -0,0 +1,3 @@ |
380 | +# This dependency has been added to track external packages building against |
381 | +# our private headers. It is ok if internal packages depend on the ABI one. |
382 | +libqt5concurrent5: symbols-declares-dependency-on-other-package qtbase-abi-5-0-2 |
383 | |
384 | === modified file 'debian/libqt5core5.install' |
385 | --- debian/libqt5core5.install 2013-05-03 09:40:08 +0000 |
386 | +++ debian/libqt5core5.install 2013-06-28 14:52:08 +0000 |
387 | @@ -1,3 +1,4 @@ |
388 | usr/lib/*/libQt5Core.so.* |
389 | +usr/lib/*/qtchooser/5.conf |
390 | usr/lib/*/qtchooser/qt5.conf |
391 | usr/share/qtchooser/qt5-*.conf |
392 | |
393 | === added file 'debian/libqt5dbus5.lintian-overrides' |
394 | --- debian/libqt5dbus5.lintian-overrides 1970-01-01 00:00:00 +0000 |
395 | +++ debian/libqt5dbus5.lintian-overrides 2013-06-28 14:52:08 +0000 |
396 | @@ -0,0 +1,3 @@ |
397 | +# This dependency has been added to track external packages building against |
398 | +# our private headers. It is ok if internal packages depend on the ABI one. |
399 | +libqt5dbus5: symbols-declares-dependency-on-other-package qtbase-abi-5-0-2 |
400 | |
401 | === modified file 'debian/libqt5gui5.install-armhf' |
402 | --- debian/libqt5gui5.install-armhf 2013-04-20 13:37:32 +0000 |
403 | +++ debian/libqt5gui5.install-armhf 2013-06-28 14:52:08 +0000 |
404 | @@ -1,2 +1,3 @@ |
405 | usr/lib/*/qt5/plugins/platforms/libqminimalegl.so |
406 | usr/lib/*/qt5/plugins/platforms/libqeglfs.so |
407 | +usr/lib/*/qt5/plugins/platforms/libqkms.so |
408 | |
409 | === added file 'debian/libqt5gui5.lintian-overrides' |
410 | --- debian/libqt5gui5.lintian-overrides 1970-01-01 00:00:00 +0000 |
411 | +++ debian/libqt5gui5.lintian-overrides 2013-06-28 14:52:08 +0000 |
412 | @@ -0,0 +1,3 @@ |
413 | +# This dependency has been added to track external packages building against |
414 | +# our private headers. It is ok if internal packages depend on the ABI one. |
415 | +libqt5gui5: symbols-declares-dependency-on-other-package qtbase-abi-5-0-2 |
416 | |
417 | === added file 'debian/libqt5network5.lintian-overrides' |
418 | --- debian/libqt5network5.lintian-overrides 1970-01-01 00:00:00 +0000 |
419 | +++ debian/libqt5network5.lintian-overrides 2013-06-28 14:52:08 +0000 |
420 | @@ -0,0 +1,3 @@ |
421 | +# This dependency has been added to track external packages building against |
422 | +# our private headers. It is ok if internal packages depend on the ABI one. |
423 | +libqt5network5: symbols-declares-dependency-on-other-package qtbase-abi-5-0-2 |
424 | |
425 | === added file 'debian/libqt5opengl5.lintian-overrides' |
426 | --- debian/libqt5opengl5.lintian-overrides 1970-01-01 00:00:00 +0000 |
427 | +++ debian/libqt5opengl5.lintian-overrides 2013-06-28 14:52:08 +0000 |
428 | @@ -0,0 +1,3 @@ |
429 | +# This dependency has been added to track external packages building against |
430 | +# our private headers. It is ok if internal packages depend on the ABI one. |
431 | +libqt5opengl5: symbols-declares-dependency-on-other-package qtbase-abi-5-0-2 |
432 | |
433 | === added file 'debian/libqt5printsupport5.lintian-overrides' |
434 | --- debian/libqt5printsupport5.lintian-overrides 1970-01-01 00:00:00 +0000 |
435 | +++ debian/libqt5printsupport5.lintian-overrides 2013-06-28 14:52:08 +0000 |
436 | @@ -0,0 +1,3 @@ |
437 | +# This dependency has been added to track external packages building against |
438 | +# our private headers. It is ok if internal packages depend on the ABI one. |
439 | +libqt5printsupport5: symbols-declares-dependency-on-other-package qtbase-abi-5-0-2 |
440 | |
441 | === added file 'debian/libqt5sql5.lintian-overrides' |
442 | --- debian/libqt5sql5.lintian-overrides 1970-01-01 00:00:00 +0000 |
443 | +++ debian/libqt5sql5.lintian-overrides 2013-06-28 14:52:08 +0000 |
444 | @@ -0,0 +1,3 @@ |
445 | +# This dependency has been added to track external packages building against |
446 | +# our private headers. It is ok if internal packages depend on the ABI one. |
447 | +libqt5sql5: symbols-declares-dependency-on-other-package qtbase-abi-5-0-2 |
448 | |
449 | === added file 'debian/libqt5test5.lintian-overrides' |
450 | --- debian/libqt5test5.lintian-overrides 1970-01-01 00:00:00 +0000 |
451 | +++ debian/libqt5test5.lintian-overrides 2013-06-28 14:52:08 +0000 |
452 | @@ -0,0 +1,3 @@ |
453 | +# This dependency has been added to track external packages building against |
454 | +# our private headers. It is ok if internal packages depend on the ABI one. |
455 | +libqt5test5: symbols-declares-dependency-on-other-package qtbase-abi-5-0-2 |
456 | |
457 | === added file 'debian/libqt5widgets5.lintian-overrides' |
458 | --- debian/libqt5widgets5.lintian-overrides 1970-01-01 00:00:00 +0000 |
459 | +++ debian/libqt5widgets5.lintian-overrides 2013-06-28 14:52:08 +0000 |
460 | @@ -0,0 +1,3 @@ |
461 | +# This dependency has been added to track external packages building against |
462 | +# our private headers. It is ok if internal packages depend on the ABI one. |
463 | +libqt5widgets5: symbols-declares-dependency-on-other-package qtbase-abi-5-0-2 |
464 | |
465 | === added file 'debian/libqt5xml5.lintian-overrides' |
466 | --- debian/libqt5xml5.lintian-overrides 1970-01-01 00:00:00 +0000 |
467 | +++ debian/libqt5xml5.lintian-overrides 2013-06-28 14:52:08 +0000 |
468 | @@ -0,0 +1,3 @@ |
469 | +# This dependency has been added to track external packages building against |
470 | +# our private headers. It is ok if internal packages depend on the ABI one. |
471 | +libqt5xml5: symbols-declares-dependency-on-other-package qtbase-abi-5-0-2 |
472 | |
473 | === added file 'debian/mark_private_symbols.sh' |
474 | --- debian/mark_private_symbols.sh 1970-01-01 00:00:00 +0000 |
475 | +++ debian/mark_private_symbols.sh 2013-06-28 14:52:08 +0000 |
476 | @@ -0,0 +1,30 @@ |
477 | +#! /bin/sh |
478 | + |
479 | +PRIVATE_HEADERS=qtbase5-private-dev/usr/include |
480 | + |
481 | +error() { |
482 | + echo $@ |
483 | + exit 1 |
484 | +} |
485 | + |
486 | +debug() { |
487 | + [ -n "${DEBUG}" ] && echo $@ |
488 | +} |
489 | + |
490 | +if [ ! -e "${PRIVATE_HEADERS}" ] |
491 | +then |
492 | + error "Private headers not found" |
493 | +fi |
494 | + |
495 | +grep -rh class qtbase5-private-dev/usr/include | |
496 | + grep EXPORT | |
497 | + while read class export classname rest |
498 | + do |
499 | + echo ${#classname}${classname} |
500 | + done | |
501 | + while read privateclass |
502 | + do |
503 | + debug marking ${privateclass} as private |
504 | + sed -i "s/\(.*${privateclass}[^ ]* *[^ ]*\)$/\1 1/" *.symbols |
505 | + done |
506 | + |
507 | |
508 | === renamed file 'debian/patches/rename_qabs_function_for_timeval.patch' => 'debian/patches/Rename-qAbs-Function-for-timeval.patch' |
509 | --- debian/patches/rename_qabs_function_for_timeval.patch 2013-05-03 09:40:08 +0000 |
510 | +++ debian/patches/Rename-qAbs-Function-for-timeval.patch 2013-06-28 14:52:08 +0000 |
511 | @@ -1,4 +1,4 @@ |
512 | -From 1fa6e7399c9e5cdaac73f358ceb3f6501517e16d Mon Sep 17 00:00:00 2001 |
513 | +From d9ff510f02bba63dabe7a081a68296056a89ae4c Mon Sep 17 00:00:00 2001 |
514 | From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= <david.narvaez@computer.org> |
515 | Date: Sat, 23 Feb 2013 23:14:50 -0500 |
516 | Subject: [PATCH] Rename qAbs Function for timeval |
517 | @@ -8,6 +8,7 @@ |
518 | GCC 4.8 |
519 | |
520 | Change-Id: I78e02256ffc8b460ca74ae5241e77dfac4e09ba9 |
521 | +Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> |
522 | --- |
523 | src/corelib/kernel/qtimerinfo_unix.cpp | 5 ++--- |
524 | 1 file changed, 2 insertions(+), 3 deletions(-) |
525 | @@ -36,5 +37,5 @@ |
526 | |
527 | /* |
528 | -- |
529 | -1.8.1.2 |
530 | +1.8.3.1 |
531 | |
532 | |
533 | === modified file 'debian/patches/series' |
534 | --- debian/patches/series 2013-05-03 09:40:08 +0000 |
535 | +++ debian/patches/series 2013-06-28 14:52:08 +0000 |
536 | @@ -5,7 +5,7 @@ |
537 | make_QColor_understand_AARRGGBB.patch |
538 | add_since_52_to_new_QColor_features.patch |
539 | inputmethod_fix_focusout.patch |
540 | -rename_qabs_function_for_timeval.patch |
541 | +Rename-qAbs-Function-for-timeval.patch |
542 | |
543 | # Debian specific. |
544 | build_examples.patch |
545 | |
546 | === added file 'debian/qtbase5-doc-html.install' |
547 | --- debian/qtbase5-doc-html.install 1970-01-01 00:00:00 +0000 |
548 | +++ debian/qtbase5-doc-html.install 2013-06-28 14:52:08 +0000 |
549 | @@ -0,0 +1,12 @@ |
550 | +usr/share/qt5/doc/qdoc/ |
551 | +usr/share/qt5/doc/qtconcurrent/ |
552 | +usr/share/qt5/doc/qtcore/ |
553 | +usr/share/qt5/doc/qtdbus/ |
554 | +usr/share/qt5/doc/qtgui/ |
555 | +usr/share/qt5/doc/qtnetwork/ |
556 | +usr/share/qt5/doc/qtopengl/ |
557 | +usr/share/qt5/doc/qtprintsupport/ |
558 | +usr/share/qt5/doc/qtsql/ |
559 | +usr/share/qt5/doc/qttestlib/ |
560 | +usr/share/qt5/doc/qtwidgets/ |
561 | +usr/share/qt5/doc/qtxml/ |
562 | |
563 | === added file 'debian/qtbase5-doc.install' |
564 | --- debian/qtbase5-doc.install 1970-01-01 00:00:00 +0000 |
565 | +++ debian/qtbase5-doc.install 2013-06-28 14:52:08 +0000 |
566 | @@ -0,0 +1,12 @@ |
567 | +usr/share/qt5/doc/qdoc.qch |
568 | +usr/share/qt5/doc/qtconcurrent.qch |
569 | +usr/share/qt5/doc/qtcore.qch |
570 | +usr/share/qt5/doc/qtdbus.qch |
571 | +usr/share/qt5/doc/qtgui.qch |
572 | +usr/share/qt5/doc/qtnetwork.qch |
573 | +usr/share/qt5/doc/qtopengl.qch |
574 | +usr/share/qt5/doc/qtprintsupport.qch |
575 | +usr/share/qt5/doc/qtsql.qch |
576 | +usr/share/qt5/doc/qttestlib.qch |
577 | +usr/share/qt5/doc/qtwidgets.qch |
578 | +usr/share/qt5/doc/qtxml.qch |
579 | |
580 | === modified file 'debian/rules' |
581 | --- debian/rules 2013-05-03 09:40:08 +0000 |
582 | +++ debian/rules 2013-06-28 14:52:08 +0000 |
583 | @@ -57,9 +57,6 @@ |
584 | ifeq ($(vendor),Ubuntu) |
585 | armv6_architectures += armel |
586 | endif |
587 | -ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(armv6_architectures))) |
588 | - extra_configure_opts += -arch armv6 |
589 | -endif |
590 | |
591 | gles2_architectures := armel armhf |
592 | ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures))) |
593 | @@ -211,7 +208,10 @@ |
594 | rm -rf po |
595 | endif |
596 | |
597 | -override_dh_auto_install: |
598 | +override_dh_auto_build-indep: |
599 | + dh_auto_build -Smakefile -- docs |
600 | + |
601 | +override_dh_auto_install-arch: |
602 | dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp/ |
603 | |
604 | # Fix wrong path in pkgconfig files |
605 | @@ -223,8 +223,10 @@ |
606 | echo "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin" > $(CURDIR)/debian/tmp/usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf |
607 | echo "/usr/lib/$(DEB_HOST_MULTIARCH)" >> $(CURDIR)/debian/tmp/usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf |
608 | |
609 | - # Ship qt5.conf for this arch, and a default.conf. |
610 | + # Ship 5.conf and qt5.conf for this arch, and a default.conf. |
611 | + # 5.conf makes calling qtchooser prettier. |
612 | mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser |
613 | + ln -s /usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/5.conf |
614 | ln -s /usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/qt5.conf |
615 | ln -s /usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/default.conf |
616 | |
617 | @@ -245,6 +247,9 @@ |
618 | -regex '.*\.\(app\|conf\|cpp\|h\|js\|php\|png\|pro\|xml\|xsl\)$$' \ |
619 | -exec chmod a-x {} \; |
620 | |
621 | +override_dh_auto_install-indep: |
622 | + make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs |
623 | + |
624 | override_dh_install: |
625 | # Now flush all the .install-* files as .install files. |
626 | set -e; for pkg in $(pkgs_with_common); do \ |
Looks good to me, only nitpick being that all of it is yet in ~kubuntu- packaging' s branch.