Merge lp:~sergiusens/phablet-extras/qtbase-opensource-src-gles into lp:~phablet-team/phablet-extras/qtbase-opensource-src-gles

Proposed by Sergio Schvezov on 2014-03-19
Status: Needs review
Proposed branch: lp:~sergiusens/phablet-extras/qtbase-opensource-src-gles
Merge into: lp:~phablet-team/phablet-extras/qtbase-opensource-src-gles
Diff against target: 594 lines (+165/-75)
9 files modified
debian/changelog (+6/-0)
debian/control (+137/-62)
debian/libqt5core5a-gles.shlibs (+1/-0)
debian/libqt5dbus5-gles.shlibs (+1/-0)
debian/libqt5gui5-gles.shlibs (+1/-0)
debian/libqt5opengl5-gles.shlibs (+1/-0)
debian/libqt5widgets5-gles.shlibs (+1/-0)
debian/mark_private_symbols.sh (+1/-1)
debian/rules (+16/-12)
To merge this branch: bzr merge lp:~sergiusens/phablet-extras/qtbase-opensource-src-gles
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team 2014-03-19 Pending
Review via email: mp+211808@code.launchpad.net
To post a comment you must log in.
163. By Sergio Schvezov on 2014-03-19

Repackging for building gles variants for all arches.

164. By Sergio Schvezov on 2014-03-20

Fix replaces/breaks and depends as much as possible on original package

Timo Jyrinki (timo-jyrinki) wrote :

Reading the diff it seems consistent and could work, thanks to the various Provides: and .shlibs used. I don't know what else is needed when this is available or if this would be enough for the emulator purposes, but yes this kind of package could coexist with the qtbase-opensource-src similar to the touch variant of the qtmultimedia.

I'm unsure of the need to restrict the Breaks/Replaces to "<= 5.2.1+dfsg+"? I mean, if we'd ship say qtdeclarative 5.2.1+git20140326 or simply 5.3 later on, this packaging would break. But maybe I'm not seeing something why this couldn't simply be Breaks/Replaces without version number.

For an upstream update, https://bugreports.qt-project.org/browse/QTBUG-36829 was updated to say that the full runtime configurability is planned eventually but there is no timeline yet - so no knowledge of whether it'll be in eg. 5.4 or 5.5.

Sergio Schvezov (sergiusens) wrote :

On Wed, Mar 26, 2014 at 10:43 AM, Timo Jyrinki
<email address hidden> wrote:
> Reading the diff it seems consistent and could work, thanks to the various Provides: and .shlibs used. I don't know what else is needed when this is available or if this would be enough for the emulator purposes, but yes this kind of package could coexist with the qtbase-opensource-src similar to the touch variant of the qtmultimedia.

I have this built in my PPA ppa:sergiusens/qt-gles

We need to to one thing more as well; the original package would need
to have a similar shlibs/substvar logic so the stuff that builds
against these libs don't need to rebuild (given no abi/symbols
breakage)

> I'm unsure of the need to restrict the Breaks/Replaces to "<= 5.2.1+dfsg+"? I mean, if we'd ship say qtdeclarative 5.2.1+git20140326 or simply 5.3 later on, this packaging would break. But maybe I'm not seeing something why this couldn't simply be Breaks/Replaces without version number.

The problem is breaking ABI/API if 5.3 changes, so this forces us to
relook into it and avoid the qtmultimedia problem.

> For an upstream update, https://bugreports.qt-project.org/browse/QTBUG-36829 was updated to say that the full runtime configurability is planned eventually but there is no timeline yet - so no knowledge of whether it'll be in eg. 5.4 or 5.5.
> --
> https://code.launchpad.net/~sergiusens/phablet-extras/qtbase-opensource-src-gles/+merge/211808
> You are the owner of lp:~sergiusens/phablet-extras/qtbase-opensource-src-gles.

Unmerged revisions

164. By Sergio Schvezov on 2014-03-20

Fix replaces/breaks and depends as much as possible on original package

163. By Sergio Schvezov on 2014-03-19

Repackging for building gles variants for all arches.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-03-18 06:00:58 +0000
3+++ debian/changelog 2014-03-20 00:52:48 +0000
4@@ -1,3 +1,9 @@
5+qtbase-opensource-src-gles (5.2.1+dfsg-1ubuntu9gles1) UNRELEASED; urgency=medium
6+
7+ * Repackging for building gles variants for all arches.
8+
9+ -- Sergio Schvezov <sergio.schvezov@canonical.com> Wed, 19 Mar 2014 14:05:15 -0300
10+
11 qtbase-opensource-src (5.2.1+dfsg-1ubuntu9) trusty; urgency=medium
12
13 * debian/patches/Fix-access-after-delete-with-Harfbuzz-NG-code-path.patch
14
15=== modified file 'debian/control'
16--- debian/control 2014-03-03 18:50:27 +0000
17+++ debian/control 2014-03-20 00:52:48 +0000
18@@ -1,4 +1,4 @@
19-Source: qtbase-opensource-src
20+Source: qtbase-opensource-src-gles
21 Section: libs
22 Priority: optional
23 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
24@@ -66,22 +66,25 @@
25 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qtbase.git;a=summary
26 Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src
27
28-Package: libqt5core5a
29+Package: libqt5core5a-gles
30 Architecture: any
31 Multi-Arch: same
32 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
33-Provides: qtbase-abi-5-2-1
34+Provides: qtbase-abi-5-2-1, libqt5core5a
35 Depends: ${misc:Depends}, ${shlibs:Depends}
36 Suggests: libthai0
37-Breaks: libqt5core5 (<< 5.2.0+dfsg~)
38-Replaces: libqt5core5 (<< 5.2.0+dfsg~)
39+Breaks: libqt5core5 (<< 5.2.0+dfsg~), libqt5core5a (<= 5.2.1+dfsg+)
40+Replaces: libqt5core5 (<< 5.2.0+dfsg~), libqt5core5a (<= 5.2.1+dfsg+)
41 Description: Qt 5 core module
42 Qt is a cross-platform C++ application framework. Qt's primary feature
43 is its rich set of widgets that provide standard GUI functionality.
44 .
45 The QtCore module contains core non-GUI functionality.
46
47-Package: libqt5gui5
48+Package: libqt5gui5-gles
49+Provides: libqt5gui5
50+Breaks: libqt5gui5 (<= 5.2.1+dfsg+)
51+Replaces: libqt5gui5 (<= 5.2.1+dfsg+)
52 Architecture: any
53 Multi-Arch: same
54 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
55@@ -92,7 +95,10 @@
56 .
57 The QtGui module extends QtCore with GUI functionality.
58
59-Package: libqt5network5
60+Package: libqt5network5-gles
61+Provides: libqt5network5
62+Breaks: libqt5network5 (<= 5.2.1+dfsg+)
63+Replaces: libqt5network5 (<= 5.2.1+dfsg+)
64 Architecture: any
65 Multi-Arch: same
66 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
67@@ -104,7 +110,10 @@
68 The QtNetwork module offers classes that allow you to write TCP/IP clients and
69 servers. It provides classes to make network programming easier and portable.
70
71-Package: libqt5opengl5
72+Package: libqt5opengl5-gles
73+Provides: libqt5opengl5
74+Breaks: libqt5opengl5 (<= 5.2.1+dfsg+)
75+Replaces: libqt5opengl5 (<= 5.2.1+dfsg+)
76 Architecture: any
77 Multi-Arch: same
78 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
79@@ -119,12 +128,15 @@
80 OpenGL is a standard API for rendering 3D graphics. OpenGL only deals with 3D
81 rendering and provides little or no support for GUI programming issues.
82
83-Package: libqt5sql5
84+Package: libqt5sql5-gles
85+Provides: libqt5sql5
86+Breaks: libqt5sql5 (<= 5.2.1+dfsg+)
87+Replaces: libqt5sql5 (<= 5.2.1+dfsg+)
88 Architecture: any
89 Multi-Arch: same
90 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
91 Depends: ${misc:Depends}, ${shlibs:Depends}
92-Recommends: libqt5sql5-sqlite | libqt5sql5-mysql | libqt5sql5-odbc | libqt5sql5-psql
93+Recommends: libqt5sql5-sqlite-gles | libqt5sql5-mysql-gles | libqt5sql5-odbc-gles | libqt5sql5-psql-gles,
94 Description: Qt 5 SQL module
95 Qt is a cross-platform C++ application framework. Qt's primary feature
96 is its rich set of widgets that provide standard GUI functionality.
97@@ -132,7 +144,10 @@
98 The QtSql module helps you provide seamless database integration to your Qt
99 applications.
100
101-Package: libqt5sql5-mysql
102+Package: libqt5sql5-mysql-gles
103+Provides: libqt5sql5-mysql
104+Breaks: libqt5sql5-mysql (<= 5.2.1+dfsg+)
105+Replaces: libqt5sql5-mysql (<= 5.2.1+dfsg+)
106 Architecture: any
107 Multi-Arch: same
108 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
109@@ -143,7 +158,10 @@
110 Install it if you intend to use or write Qt programs that are to access a
111 MySQL DB.
112
113-Package: libqt5sql5-odbc
114+Package: libqt5sql5-odbc-gles
115+Provides: libqt5sql5-odbc
116+Breaks: libqt5sql5-odbc (<= 5.2.1+dfsg+)
117+Replaces: libqt5sql5-odbc (<= 5.2.1+dfsg+)
118 Architecture: any
119 Multi-Arch: same
120 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
121@@ -154,7 +172,10 @@
122 Install it if you intend to use or write Qt programs that are to access an
123 ODBC DB.
124
125-Package: libqt5sql5-psql
126+Package: libqt5sql5-psql-gles
127+Provides: libqt5sql5-psql
128+Breaks: libqt5sql5-psql (<= 5.2.1+dfsg+)
129+Replaces: libqt5sql5-psql (<= 5.2.1+dfsg+)
130 Architecture: any
131 Multi-Arch: same
132 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
133@@ -165,7 +186,10 @@
134 Install it if you intend to use or write Qt programs that are to access a
135 PostgreSQL DB.
136
137-Package: libqt5sql5-sqlite
138+Package: libqt5sql5-sqlite-gles
139+Provides: libqt5sql5-sqlite
140+Breaks: libqt5sql5-sqlite (<= 5.2.1+dfsg+)
141+Replaces: libqt5sql5-sqlite (<= 5.2.1+dfsg+)
142 Architecture: any
143 Multi-Arch: same
144 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
145@@ -176,7 +200,10 @@
146 Install it if you intend to use or write Qt programs that are to access an
147 SQLite 3 DB.
148
149-Package: libqt5sql5-tds
150+Package: libqt5sql5-tds-gles
151+Provides: libqt5sql5-tds
152+Breaks: libqt5sql5-tds (<= 5.2.1+dfsg+)
153+Replaces: libqt5sql5-tds (<= 5.2.1+dfsg+)
154 Architecture: any
155 Multi-Arch: same
156 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
157@@ -187,7 +214,10 @@
158 Install it if you intend to use or write Qt programs that are to access a
159 MS SQL or Sybase SQL server.
160
161-Package: libqt5xml5
162+Package: libqt5xml5-gles
163+Provides: libqt5xml5
164+Breaks: libqt5xml5 (<= 5.2.1+dfsg+)
165+Replaces: libqt5xml5 (<= 5.2.1+dfsg+)
166 Architecture: any
167 Multi-Arch: same
168 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
169@@ -199,7 +229,10 @@
170 The QtXml module provides a stream reader and writer for XML documents,
171 and C++ implementations of SAX and DOM.
172
173-Package: libqt5dbus5
174+Package: libqt5dbus5-gles
175+Provides: libqt5dbus5
176+Breaks: libqt5dbus5 (<= 5.2.1+dfsg+)
177+Replaces: libqt5dbus5 (<= 5.2.1+dfsg+)
178 Architecture: any
179 Multi-Arch: same
180 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
181@@ -215,7 +248,10 @@
182 applications by exporting objects, as well as use services exported by those
183 applications by placing calls and accessing properties.
184
185-Package: libqt5test5
186+Package: libqt5test5-gles
187+Provides: libqt5test5
188+Breaks: libqt5test5 (<= 5.2.1+dfsg+)
189+Replaces: libqt5test5 (<= 5.2.1+dfsg+)
190 Architecture: any
191 Multi-Arch: same
192 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
193@@ -227,7 +263,10 @@
194 The QtTest module provides classes for unit testing Qt applications and
195 libraries.
196
197-Package: libqt5concurrent5
198+Package: libqt5concurrent5-gles
199+Provides: libqt5concurrent5
200+Breaks: libqt5concurrent5 (<= 5.2.1+dfsg+)
201+Replaces: libqt5concurrent5 (<= 5.2.1+dfsg+)
202 Architecture: any
203 Multi-Arch: same
204 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
205@@ -239,7 +278,10 @@
206 The QtConcurrent module contains functionality to support concurrent execution
207 of program code.
208
209-Package: libqt5widgets5
210+Package: libqt5widgets5-gles
211+Provides: libqt5widgets5
212+Breaks: libqt5widgets5 (<= 5.2.1+dfsg+)
213+Replaces: libqt5widgets5 (<= 5.2.1+dfsg+)
214 Architecture: any
215 Multi-Arch: same
216 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
217@@ -250,7 +292,10 @@
218 .
219 The QtWidgets module extends QtGui with C++ widget functionality.
220
221-Package: libqt5printsupport5
222+Package: libqt5printsupport5-gles
223+Provides: libqt5printsupport5
224+Breaks: libqt5printsupport5 (<= 5.2.1+dfsg+)
225+Replaces: libqt5printsupport5 (<= 5.2.1+dfsg+)
226 Architecture: any
227 Multi-Arch: same
228 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
229@@ -263,29 +308,30 @@
230 The QtPrintSupport module provides classes to make printing easier and
231 portable.
232
233-Package: qtbase5-dev
234+Package: qtbase5-gles-dev
235+Provides: qtbase5-dev
236+Breaks: qtbase5-dev (<= 5.2.1+dfsg+)
237+Replaces: qtbase5-dev (<= 5.2.1+dfsg+)
238 Architecture: any
239 Multi-Arch: same
240 Section: libdevel
241 Pre-Depends: dpkg (>= 1.15.6~)
242-Depends: libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
243- libgles2-mesa-dev | libgles2-dev,
244- libglu1-mesa-dev [!armel !armhf] | libglu-dev [!armel !armhf],
245- libqt5concurrent5 (= ${binary:Version}),
246- libqt5core5a (= ${binary:Version}),
247- libqt5dbus5 (= ${binary:Version}),
248- libqt5gui5 (= ${binary:Version}),
249- libqt5network5 (= ${binary:Version}),
250- libqt5printsupport5 (= ${binary:Version}),
251- libqt5sql5 (= ${binary:Version}),
252- libqt5test5 (= ${binary:Version}),
253- libqt5widgets5 (= ${binary:Version}),
254- libqt5xml5 (= ${binary:Version}),
255- qt5-qmake (= ${binary:Version}),
256- qtbase5-dev-tools (= ${binary:Version}),
257+Depends: libgles2-mesa-dev | libgles2-dev,
258+ libqt5concurrent5 (>= 5.2.1+dfsg),
259+ libqt5core5a (>= 5.2.1+dfsg),
260+ libqt5dbus5 (>= 5.2.1+dfsg),
261+ libqt5gui5-gles (= ${binary:Version}),
262+ libqt5network5 (>= 5.2.1+dfsg),
263+ libqt5printsupport5 (>= 5.2.1+dfsg),
264+ libqt5sql5 (>= 5.2.1+dfsg),
265+ libqt5test5 (>= 5.2.1+dfsg),
266+ libqt5widgets5 (>= 5.2.1+dfsg),
267+ libqt5xml5 (>= 5.2.1+dfsg),
268+ qt5-qmake (>= 5.2.1+dfsg),
269+ qtbase5-dev-tools (>= 5.2.1+dfsg),
270 qtchooser,
271 ${misc:Depends}
272-Recommends: libqt5opengl5-dev (= ${binary:Version})
273+Recommends: libqt5opengl5-gles-dev (= ${binary:Version})
274 Suggests: libmysqlclient-dev,
275 libpq-dev,
276 libsqlite3-dev,
277@@ -297,14 +343,17 @@
278 This package contains the header development files used for building Qt 5
279 applications.
280
281-Package: qtbase5-private-dev
282+Package: qtbase5-private-gles-dev
283+Provides: qtbase5-private-dev
284 Architecture: any
285 Multi-Arch: same
286 Section: libdevel
287 Pre-Depends: dpkg (>= 1.15.6~)
288-Depends: qtbase5-dev (= ${binary:Version}), ${misc:Depends}
289-Breaks: qtbase5-dev (<< 5.0.2+dfsg1-3~)
290-Replaces: qtbase5-dev (<< 5.0.2+dfsg1-3~)
291+Depends: qtbase5-gles-dev (= ${binary:Version}), ${misc:Depends}
292+Breaks: qtbase5-dev (<< 5.0.2+dfsg1-3~),
293+ qtbase5-private-dev (<= 5.2.1+dfsg+)
294+Replaces: qtbase5-dev (<< 5.0.2+dfsg1-3~),
295+ qtbase5-private-dev (<= 5.2.1+dfsg+)
296 Description: Qt 5 base private development files
297 Qt is a cross-platform C++ application framework. Qt's primary feature
298 is its rich set of widgets that provide standard GUI functionality.
299@@ -314,13 +363,16 @@
300 .
301 Use at your own risk.
302
303-Package: libqt5opengl5-dev
304+Package: libqt5opengl5-gles-dev
305+Provides: libqt5opengl5-dev
306+Breaks: libqt5opengl5-dev (<= 5.2.1+dfsg+)
307+Replaces: libqt5opengl5-dev (<= 5.2.1+dfsg+)
308 Architecture: any
309 Multi-Arch: same
310 Section: libdevel
311 Pre-Depends: dpkg (>= 1.15.6~)
312-Depends: libqt5opengl5 (= ${binary:Version}),
313- qtbase5-dev (= ${binary:Version}),
314+Depends: libqt5opengl5-gles (= ${binary:Version}),
315+ qtbase5-gles-dev (= ${binary:Version}),
316 ${misc:Depends}
317 Description: Qt 5 OpenGL library development files
318 Qt is a cross-platform C++ application framework. Qt's primary feature
319@@ -329,7 +381,10 @@
320 This package contains the development files needed to build Qt 5 applications
321 using QtOpenGL library.
322
323-Package: qtbase5-dev-tools
324+Package: qtbase5-dev-tools-gles
325+Provides: qtbase5-dev-tools
326+Breaks: qtbase5-dev-tools (<= 5.2.1+dfsg+)
327+Replaces: qtbase5-dev-tools (<= 5.2.1+dfsg+)
328 Architecture: any
329 Multi-Arch: foreign
330 Section: devel
331@@ -344,7 +399,10 @@
332 applications, such as moc, qdbuscpp2xml, qdbusxml2cpp, qdoc, rcc,
333 syncqt and uic.
334
335-Package: qt5-qmake
336+Package: qt5-qmake-gles
337+Provides: qt5-qmake
338+Breaks: qt5-qmake (<= 5.2.1+dfsg+)
339+Replaces: qt5-qmake (<= 5.2.1+dfsg+)
340 Architecture: any
341 Multi-Arch: foreign
342 Section: devel
343@@ -365,7 +423,10 @@
344 .
345 This package contains also these platform specifications.
346
347-Package: qtbase5-examples
348+Package: qtbase5-examples-gles
349+Provides: qtbase5-examples
350+Breaks: qtbase5-examples (<= 5.2.1+dfsg+)
351+Replaces: qtbase5-examples (<= 5.2.1+dfsg+)
352 Architecture: any
353 Multi-Arch: foreign
354 Section: x11
355@@ -377,51 +438,62 @@
356 .
357 This package contains Qt base 5 examples.
358
359-Package: qtbase5-dbg
360+Package: qtbase5-gles-dbg
361+Provides: qtbase5-dbg
362+Breaks: qtbase5-dbg (<= 5.2.1+dfsg+)
363+Replaces: qtbase5-dbg (<= 5.2.1+dfsg+)
364 Priority: extra
365 Architecture: any
366 Multi-Arch: same
367 Section: debug
368-Depends: libqt5core5a (= ${binary:Version}), ${misc:Depends}
369+Depends: libqt5core5a-gles (= ${binary:Version}), ${misc:Depends}
370 Description: Qt 5 base library debugging symbols
371 Qt is a cross-platform C++ application framework. Qt's primary feature
372 is its rich set of widgets that provide standard GUI functionality.
373 .
374 This package contains the debugging symbols for the Qt 5 base libraries.
375
376-Package: qtbase5-dev-tools-dbg
377+Package: qtbase5-dev-tools-gles-dbg
378+Provides: qtbase5-dev-tools-dbg
379+Breaks: qtbase5-dev-tools-dbg (<= 5.2.1+dfsg+)
380+Replaces: qtbase5-dev-tools-dbg (<= 5.2.1+dfsg+)
381 Priority: extra
382 Architecture: any
383 Section: debug
384-Depends: qt5-qmake (= ${binary:Version}),
385- qtbase5-dev-tools (= ${binary:Version}),
386+Depends: qt5-qmake-gles (= ${binary:Version}),
387+ qtbase5-dev-tools-gles (= ${binary:Version}),
388 ${misc:Depends}
389-Recommends: qtbase5-dbg
390+Recommends: qtbase5-gles-dbg
391 Description: Qt 5 base binaries debugging symbols
392 Qt is a cross-platform C++ application framework. Qt's primary feature
393 is its rich set of widgets that provide standard GUI functionality.
394 .
395 This package contains the debugging symbols for the Qt 5 binaries.
396
397-Package: qtbase5-examples-dbg
398+Package: qtbase5-examples-gles-dbg
399+Provides: qtbase5-examples-dbg
400+Breaks: qtbase5-examples-dbg (<= 5.2.1+dfsg+)
401+Replaces: qtbase5-examples-dbg (<= 5.2.1+dfsg+)
402 Priority: extra
403 Architecture: any
404 Section: debug
405-Depends: qtbase5-examples (= ${binary:Version}), ${misc:Depends}
406-Recommends: qtbase5-dbg
407+Depends: qtbase5-examples-gles (= ${binary:Version}), ${misc:Depends}
408+Recommends: qtbase5-gles-dbg
409 Description: Qt 5 base examples debugging symbols
410 Qt is a cross-platform C++ application framework. Qt's primary feature
411 is its rich set of widgets that provide standard GUI functionality.
412 .
413 This package contains the debugging symbols for the Qt 5 examples.
414
415-Package: qt5-default
416+Package: qt5-default-gles
417+Breaks: qt5-default (<= 5.2.1+dfsg+)
418+Replaces: qt5-default (<= 5.2.1+dfsg+)
419 Architecture: any
420 Multi-Arch: same
421-Depends: qtbase5-dev, qtchooser, ${misc:Depends}
422+Depends: qtbase5-gles-dev, qtchooser, ${misc:Depends}
423 Conflicts: qt4-default
424-Provides: qt-default
425-Suggests: qt5-qmake, qtbase5-dev-tools
426+Provides: qt-default, qt5-default
427+Suggests: qt5-qmake-gles, qtbase5-dev-tools-gles
428 Description: Qt 5 development defaults package
429 Qt is a cross-platform C++ application framework. Qt's primary feature
430 is its rich set of widgets that provide standard GUI functionality.
431@@ -431,7 +503,10 @@
432 configuration for qtchooser, but does not prevent alternative Qt
433 installations from being used.
434
435-Package: qtbase5-doc-html
436+Package: qtbase5-gles-doc-html
437+Provides: qtbase5-doc-html
438+Breaks: qtbase5-doc-html (<= 5.2.1+dfsg+)
439+Replaces: qtbase5-doc-html (<= 5.2.1+dfsg+)
440 Priority: extra
441 Architecture: all
442 Section: doc
443
444=== renamed file 'debian/libqt5concurrent5.install' => 'debian/libqt5concurrent5-gles.install'
445=== renamed file 'debian/libqt5concurrent5.lintian-overrides' => 'debian/libqt5concurrent5-gles.lintian-overrides'
446=== renamed file 'debian/libqt5concurrent5.symbols' => 'debian/libqt5concurrent5-gles.symbols'
447=== renamed file 'debian/libqt5core5a.install' => 'debian/libqt5core5a-gles.install'
448=== renamed file 'debian/libqt5core5a.lintian-overrides' => 'debian/libqt5core5a-gles.lintian-overrides'
449=== added file 'debian/libqt5core5a-gles.shlibs'
450--- debian/libqt5core5a-gles.shlibs 1970-01-01 00:00:00 +0000
451+++ debian/libqt5core5a-gles.shlibs 2014-03-20 00:52:48 +0000
452@@ -0,0 +1,1 @@
453+libQt5Core 5 libqt5core5a (>= 5.2.1+dfsg1)
454
455=== renamed file 'debian/libqt5core5a.symbols' => 'debian/libqt5core5a-gles.symbols'
456=== renamed file 'debian/libqt5dbus5.install' => 'debian/libqt5dbus5-gles.install'
457=== renamed file 'debian/libqt5dbus5.lintian-overrides' => 'debian/libqt5dbus5-gles.lintian-overrides'
458=== added file 'debian/libqt5dbus5-gles.shlibs'
459--- debian/libqt5dbus5-gles.shlibs 1970-01-01 00:00:00 +0000
460+++ debian/libqt5dbus5-gles.shlibs 2014-03-20 00:52:48 +0000
461@@ -0,0 +1,1 @@
462+libQt5DBus 5 libqt5dbus5 (>= 5.2.1+dfsg1)
463
464=== renamed file 'debian/libqt5dbus5.symbols' => 'debian/libqt5dbus5-gles.symbols'
465=== renamed file 'debian/libqt5gui5.install-common' => 'debian/libqt5gui5-gles.install-common'
466=== renamed file 'debian/libqt5gui5.install-linux' => 'debian/libqt5gui5-gles.install-linux'
467=== renamed file 'debian/libqt5gui5.lintian-overrides' => 'debian/libqt5gui5-gles.lintian-overrides'
468=== added file 'debian/libqt5gui5-gles.shlibs'
469--- debian/libqt5gui5-gles.shlibs 1970-01-01 00:00:00 +0000
470+++ debian/libqt5gui5-gles.shlibs 2014-03-20 00:52:48 +0000
471@@ -0,0 +1,1 @@
472+libQt5Gui 5 libqt5gui5 (>= 5.2.1+dfsg1) | libqt5gui5-gles (>= 5.2.1+dfsg1)
473
474=== renamed file 'debian/libqt5gui5.symbols' => 'debian/libqt5gui5-gles.symbols'
475=== renamed file 'debian/libqt5network5.install-common' => 'debian/libqt5network5-gles.install-common'
476=== renamed file 'debian/libqt5network5.install-linux' => 'debian/libqt5network5-gles.install-linux'
477=== renamed file 'debian/libqt5network5.lintian-overrides' => 'debian/libqt5network5-gles.lintian-overrides'
478=== renamed file 'debian/libqt5network5.symbols' => 'debian/libqt5network5-gles.symbols'
479=== renamed file 'debian/libqt5opengl5-dev.install' => 'debian/libqt5opengl5-gles-dev.install'
480=== renamed file 'debian/libqt5opengl5.install' => 'debian/libqt5opengl5-gles.install'
481=== renamed file 'debian/libqt5opengl5.lintian-overrides' => 'debian/libqt5opengl5-gles.lintian-overrides'
482=== added file 'debian/libqt5opengl5-gles.shlibs'
483--- debian/libqt5opengl5-gles.shlibs 1970-01-01 00:00:00 +0000
484+++ debian/libqt5opengl5-gles.shlibs 2014-03-20 00:52:48 +0000
485@@ -0,0 +1,1 @@
486+libQt5OpenGL 5 libqt5opengl5 (>= 5.2.1+dfsg1) | libqt5opengl5-gles (>= 5.2.1+dfsg1)
487
488=== renamed file 'debian/libqt5opengl5.symbols' => 'debian/libqt5opengl5-gles.symbols'
489=== renamed file 'debian/libqt5printsupport5.install' => 'debian/libqt5printsupport5-gles.install'
490=== renamed file 'debian/libqt5printsupport5.lintian-overrides' => 'debian/libqt5printsupport5-gles.lintian-overrides'
491=== renamed file 'debian/libqt5printsupport5.symbols' => 'debian/libqt5printsupport5-gles.symbols'
492=== renamed file 'debian/libqt5sql5.install' => 'debian/libqt5sql5-gles.install'
493=== renamed file 'debian/libqt5sql5.lintian-overrides' => 'debian/libqt5sql5-gles.lintian-overrides'
494=== renamed file 'debian/libqt5sql5.symbols' => 'debian/libqt5sql5-gles.symbols'
495=== renamed file 'debian/libqt5sql5-ibase.install' => 'debian/libqt5sql5-ibase-gles.install'
496=== renamed file 'debian/libqt5sql5-mysql.install' => 'debian/libqt5sql5-mysql-gles.install'
497=== renamed file 'debian/libqt5sql5-odbc.install' => 'debian/libqt5sql5-odbc-gles.install'
498=== renamed file 'debian/libqt5sql5-psql.install' => 'debian/libqt5sql5-psql-gles.install'
499=== renamed file 'debian/libqt5sql5-sqlite.install' => 'debian/libqt5sql5-sqlite-gles.install'
500=== renamed file 'debian/libqt5sql5-tds.install' => 'debian/libqt5sql5-tds-gles.install'
501=== renamed file 'debian/libqt5test5.install' => 'debian/libqt5test5-gles.install'
502=== renamed file 'debian/libqt5test5.lintian-overrides' => 'debian/libqt5test5-gles.lintian-overrides'
503=== renamed file 'debian/libqt5test5.symbols' => 'debian/libqt5test5-gles.symbols'
504=== renamed file 'debian/libqt5widgets5.install' => 'debian/libqt5widgets5-gles.install'
505=== renamed file 'debian/libqt5widgets5.lintian-overrides' => 'debian/libqt5widgets5-gles.lintian-overrides'
506=== added file 'debian/libqt5widgets5-gles.shlibs'
507--- debian/libqt5widgets5-gles.shlibs 1970-01-01 00:00:00 +0000
508+++ debian/libqt5widgets5-gles.shlibs 2014-03-20 00:52:48 +0000
509@@ -0,0 +1,1 @@
510+libQt5Widgets 5 libqt5widgets5 (>= 5.2.1+dfsg1)
511
512=== renamed file 'debian/libqt5widgets5.symbols' => 'debian/libqt5widgets5-gles.symbols'
513=== renamed file 'debian/libqt5xml5.install' => 'debian/libqt5xml5-gles.install'
514=== renamed file 'debian/libqt5xml5.lintian-overrides' => 'debian/libqt5xml5-gles.lintian-overrides'
515=== renamed file 'debian/libqt5xml5.symbols' => 'debian/libqt5xml5-gles.symbols'
516=== modified file 'debian/mark_private_symbols.sh'
517--- debian/mark_private_symbols.sh 2013-07-31 07:54:15 +0000
518+++ debian/mark_private_symbols.sh 2014-03-20 00:52:48 +0000
519@@ -1,6 +1,6 @@
520 #! /bin/sh
521
522-PRIVATE_HEADERS=qtbase5-private-dev/usr/include
523+PRIVATE_HEADERS=qtbase5-private-gles-dev/usr/include
524
525 error() {
526 echo $@
527
528=== renamed file 'debian/qt5-default.install' => 'debian/qt5-default-gles.install'
529=== renamed file 'debian/qt5-qmake.install' => 'debian/qt5-qmake-gles.install'
530=== renamed file 'debian/qt5-qmake.manpages' => 'debian/qt5-qmake-gles.manpages'
531=== renamed file 'debian/qtbase5-dev-tools.install' => 'debian/qtbase5-dev-tools-gles.install'
532=== renamed file 'debian/qtbase5-dev-tools.manpages' => 'debian/qtbase5-dev-tools-gles.manpages'
533=== renamed file 'debian/qtbase5-examples.install' => 'debian/qtbase5-examples-gles.install'
534=== renamed file 'debian/qtbase5-examples.lintian-overrides' => 'debian/qtbase5-examples-gles.lintian-overrides'
535=== renamed file 'debian/qtbase5-dev.install' => 'debian/qtbase5-gles-dev.install'
536=== renamed file 'debian/qtbase5-doc-html.install' => 'debian/qtbase5-gles-doc-html.install'
537=== renamed file 'debian/qtbase5-private-dev.install' => 'debian/qtbase5-private-gles-dev.install'
538=== modified file 'debian/rules'
539--- debian/rules 2014-03-10 11:01:41 +0000
540+++ debian/rules 2014-03-20 00:52:48 +0000
541@@ -58,12 +58,8 @@
542 armv6_architectures += armel
543 endif
544
545-gles2_architectures := armel armhf
546-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
547- extra_configure_opts += -opengl es2
548-else
549- extra_configure_opts += -opengl desktop
550-endif
551+# All arches are gles here
552+extra_configure_opts += -opengl es2
553
554 # Only run tests on the archs they are known to pass with current configuration
555 testrun_architectures := armhf i386 amd64
556@@ -288,10 +284,10 @@
557 dh_installchangelogs $(upstream_changes)
558
559 override_dh_strip:
560- dh_strip -pqtbase5-examples --dbg-package=qtbase5-examples-dbg
561- dh_strip -pqtbase5-dev-tools --dbg-package=qtbase5-dev-tools-dbg
562- dh_strip -pqt5-qmake --dbg-package=qtbase5-dev-tools-dbg
563- dh_strip --remaining-packages --dbg-package=qtbase5-dbg
564+ dh_strip -pqtbase5-examples-gles --dbg-package=qtbase5-examples-gles-dbg
565+ dh_strip -pqtbase5-dev-tools-gles --dbg-package=qtbase5-dev-tools-gles-dbg
566+ dh_strip -pqt5-qmake-gles --dbg-package=qtbase5-dev-tools-gles-dbg
567+ dh_strip --remaining-packages --dbg-package=qtbase5-gles-dbg
568
569 override_dh_makeshlibs:
570 # Specific shlibs version (e.g.: 4:4.5.2)
571@@ -299,13 +295,21 @@
572 # Generate shlibs local files
573 for pkg in $(pkgs_lib); do \
574 if test -e debian/$${pkg}/DEBIAN/shlibs ; then \
575- sed 's/>=[^)]*/= $(current_version)/' debian/$${pkg}/DEBIAN/shlibs >> debian/shlibs.local ;\
576+ cat debian/$${pkg}/DEBIAN/shlibs >> debian/shlibs.local ;\
577 fi \
578 done
579
580 override_dh_gencontrol:
581 : # FIXME: better way to do that
582- sed -i 's/perl$$/perl/' debian/qtbase5-dev-tools.substvars
583+ sed -i 's/perl$$/perl/' debian/qtbase5-dev-tools-gles.substvars
584+ for pkg in $(pkgs_lib); do \
585+ if test -e debian/$${pkg}.substvars ; then \
586+ sed -i -e 's/libqt5core5a-gles/libqt5core5a/g' debian/$${pkg}.substvars ;\
587+ sed -i -e 's/libqt5dbus5-gles/libqt5dbus5/g' debian/$${pkg}.substvars ;\
588+ sed -i -e 's/libqt5dbus5-gles/libqt5dbus5/g' debian/$${pkg}.substvars ;\
589+ sed -i -e 's/libqt5widgets5-gles/libqt5widgets5/g' debian/$${pkg}.substvars ;\
590+ fi \
591+ done
592 dh_gencontrol
593
594 override_dh_builddeb:

Subscribers

People subscribed via source and target branches