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

[Sergio Schvezov]

[lp:~sergiusens/phablet-extras/qtbase-opensource-src-gles]

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)]

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)]

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.

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-18 06:00:58 +0000
+++ debian/changelog	2014-03-20 00:52:48 +0000
@@ -1,3 +1,9 @@
+qtbase-opensource-src-gles (5.2.1+dfsg-1ubuntu9gles1) UNRELEASED; urgency=medium
+
+  * Repackging for building gles variants for all arches.
+
+ -- Sergio Schvezov <[e-mail]>  Wed, 19 Mar 2014 14:05:15 -0300
+
 qtbase-opensource-src (5.2.1+dfsg-1ubuntu9) trusty; urgency=medium
 
   * debian/patches/Fix-access-after-delete-with-Harfbuzz-NG-code-path.patch

=== modified file 'debian/control'
--- debian/control	2014-03-03 18:50:27 +0000
+++ debian/control	2014-03-20 00:52:48 +0000
@@ -1,4 +1,4 @@
-Source: qtbase-opensource-src
+Source: qtbase-opensource-src-gles
 Section: libs
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
@@ -66,22 +66,25 @@
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qtbase.git;a=summary
 Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/qtbase-opensource-src
 
-Package: libqt5core5a
+Package: libqt5core5a-gles
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
-Provides: qtbase-abi-5-2-1
+Provides: qtbase-abi-5-2-1, libqt5core5a
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: libthai0
-Breaks: libqt5core5 (<< 5.2.0+dfsg~)
-Replaces: libqt5core5 (<< 5.2.0+dfsg~)
+Breaks: libqt5core5 (<< 5.2.0+dfsg~), libqt5core5a (<= 5.2.1+dfsg+)
+Replaces: libqt5core5 (<< 5.2.0+dfsg~), libqt5core5a (<= 5.2.1+dfsg+) 
 Description: Qt 5 core module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
  The QtCore module contains core non-GUI functionality.
 
-Package: libqt5gui5
+Package: libqt5gui5-gles
+Provides: libqt5gui5
+Breaks: libqt5gui5 (<= 5.2.1+dfsg+)
+Replaces: libqt5gui5 (<= 5.2.1+dfsg+)
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
@@ -92,7 +95,10 @@
  .
  The QtGui module extends QtCore with GUI functionality.
 
-Package: libqt5network5
+Package: libqt5network5-gles
+Provides: libqt5network5
+Breaks: libqt5network5 (<= 5.2.1+dfsg+)
+Replaces: libqt5network5 (<= 5.2.1+dfsg+)
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
@@ -104,7 +110,10 @@
  The QtNetwork module offers classes that allow you to write TCP/IP clients and
  servers. It provides classes to make network programming easier and portable.
 
-Package: libqt5opengl5
+Package: libqt5opengl5-gles
+Provides: libqt5opengl5
+Breaks: libqt5opengl5 (<= 5.2.1+dfsg+)
+Replaces: libqt5opengl5 (<= 5.2.1+dfsg+)
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
@@ -119,12 +128,15 @@
  OpenGL is a standard API for rendering 3D graphics. OpenGL only deals with 3D
  rendering and provides little or no support for GUI programming issues.
 
-Package: libqt5sql5
+Package: libqt5sql5-gles
+Provides: libqt5sql5
+Breaks: libqt5sql5 (<= 5.2.1+dfsg+)
+Replaces: libqt5sql5 (<= 5.2.1+dfsg+)
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: libqt5sql5-sqlite | libqt5sql5-mysql | libqt5sql5-odbc | libqt5sql5-psql
+Recommends: libqt5sql5-sqlite-gles | libqt5sql5-mysql-gles | libqt5sql5-odbc-gles | libqt5sql5-psql-gles,
 Description: Qt 5 SQL module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -132,7 +144,10 @@
  The QtSql module helps you provide seamless database integration to your Qt
  applications.
 
-Package: libqt5sql5-mysql
+Package: libqt5sql5-mysql-gles
+Provides: libqt5sql5-mysql
+Breaks: libqt5sql5-mysql (<= 5.2.1+dfsg+)
+Replaces: libqt5sql5-mysql (<= 5.2.1+dfsg+)
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
@@ -143,7 +158,10 @@
  Install it if you intend to use or write Qt programs that are to access a
  MySQL DB.
 
-Package: libqt5sql5-odbc
+Package: libqt5sql5-odbc-gles
+Provides: libqt5sql5-odbc
+Breaks: libqt5sql5-odbc (<= 5.2.1+dfsg+)
+Replaces: libqt5sql5-odbc (<= 5.2.1+dfsg+)
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
@@ -154,7 +172,10 @@
  Install it if you intend to use or write Qt programs that are to access an
  ODBC DB.
 
-Package: libqt5sql5-psql
+Package: libqt5sql5-psql-gles
+Provides: libqt5sql5-psql
+Breaks: libqt5sql5-psql (<= 5.2.1+dfsg+)
+Replaces: libqt5sql5-psql (<= 5.2.1+dfsg+)
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
@@ -165,7 +186,10 @@
  Install it if you intend to use or write Qt programs that are to access a
  PostgreSQL DB.
 
-Package: libqt5sql5-sqlite
+Package: libqt5sql5-sqlite-gles
+Provides: libqt5sql5-sqlite
+Breaks: libqt5sql5-sqlite (<= 5.2.1+dfsg+)
+Replaces: libqt5sql5-sqlite (<= 5.2.1+dfsg+)
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
@@ -176,7 +200,10 @@
  Install it if you intend to use or write Qt programs that are to access an
  SQLite 3 DB.
 
-Package: libqt5sql5-tds
+Package: libqt5sql5-tds-gles
+Provides: libqt5sql5-tds
+Breaks: libqt5sql5-tds (<= 5.2.1+dfsg+)
+Replaces: libqt5sql5-tds (<= 5.2.1+dfsg+)
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
@@ -187,7 +214,10 @@
  Install it if you intend to use or write Qt programs that are to access a
  MS SQL or Sybase SQL server.
 
-Package: libqt5xml5
+Package: libqt5xml5-gles
+Provides: libqt5xml5
+Breaks: libqt5xml5 (<= 5.2.1+dfsg+)
+Replaces: libqt5xml5 (<= 5.2.1+dfsg+)
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
@@ -199,7 +229,10 @@
  The QtXml module provides a stream reader and writer for XML documents,
  and C++ implementations of SAX and DOM.
 
-Package: libqt5dbus5
+Package: libqt5dbus5-gles
+Provides: libqt5dbus5
+Breaks: libqt5dbus5 (<= 5.2.1+dfsg+)
+Replaces: libqt5dbus5 (<= 5.2.1+dfsg+)
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
@@ -215,7 +248,10 @@
  applications by exporting objects, as well as use services exported by those
  applications by placing calls and accessing properties.
 
-Package: libqt5test5
+Package: libqt5test5-gles
+Provides: libqt5test5
+Breaks: libqt5test5 (<= 5.2.1+dfsg+)
+Replaces: libqt5test5 (<= 5.2.1+dfsg+)
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
@@ -227,7 +263,10 @@
  The QtTest module provides classes for unit testing Qt applications and
  libraries.
 
-Package: libqt5concurrent5
+Package: libqt5concurrent5-gles
+Provides: libqt5concurrent5
+Breaks: libqt5concurrent5 (<= 5.2.1+dfsg+)
+Replaces: libqt5concurrent5 (<= 5.2.1+dfsg+)
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
@@ -239,7 +278,10 @@
  The QtConcurrent module contains functionality to support concurrent execution
  of program code.
 
-Package: libqt5widgets5
+Package: libqt5widgets5-gles
+Provides: libqt5widgets5
+Breaks: libqt5widgets5 (<= 5.2.1+dfsg+)
+Replaces: libqt5widgets5 (<= 5.2.1+dfsg+)
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
@@ -250,7 +292,10 @@
  .
  The QtWidgets module extends QtGui with C++ widget functionality.
 
-Package: libqt5printsupport5
+Package: libqt5printsupport5-gles
+Provides: libqt5printsupport5
+Breaks: libqt5printsupport5 (<= 5.2.1+dfsg+)
+Replaces: libqt5printsupport5 (<= 5.2.1+dfsg+)
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
@@ -263,29 +308,30 @@
  The QtPrintSupport module provides classes to make printing easier and
  portable.
 
-Package: qtbase5-dev
+Package: qtbase5-gles-dev
+Provides: qtbase5-dev
+Breaks: qtbase5-dev (<= 5.2.1+dfsg+)
+Replaces: qtbase5-dev (<= 5.2.1+dfsg+)
 Architecture: any
 Multi-Arch: same
 Section: libdevel
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
-         libgles2-mesa-dev | libgles2-dev,
-         libglu1-mesa-dev [!armel !armhf] | libglu-dev [!armel !armhf],
-         libqt5concurrent5 (= ${binary:Version}),
-         libqt5core5a (= ${binary:Version}),
-         libqt5dbus5 (= ${binary:Version}),
-         libqt5gui5 (= ${binary:Version}),
-         libqt5network5 (= ${binary:Version}),
-         libqt5printsupport5 (= ${binary:Version}),
-         libqt5sql5 (= ${binary:Version}),
-         libqt5test5 (= ${binary:Version}),
-         libqt5widgets5 (= ${binary:Version}),
-         libqt5xml5 (= ${binary:Version}),
-         qt5-qmake (= ${binary:Version}),
-         qtbase5-dev-tools (= ${binary:Version}),
+Depends: libgles2-mesa-dev | libgles2-dev,
+         libqt5concurrent5 (>= 5.2.1+dfsg),
+         libqt5core5a (>= 5.2.1+dfsg),
+         libqt5dbus5 (>= 5.2.1+dfsg),
+         libqt5gui5-gles (= ${binary:Version}),
+         libqt5network5 (>= 5.2.1+dfsg),
+         libqt5printsupport5 (>= 5.2.1+dfsg),
+         libqt5sql5 (>= 5.2.1+dfsg),
+         libqt5test5 (>= 5.2.1+dfsg),
+         libqt5widgets5 (>= 5.2.1+dfsg),
+         libqt5xml5 (>= 5.2.1+dfsg),
+         qt5-qmake (>= 5.2.1+dfsg),
+         qtbase5-dev-tools (>= 5.2.1+dfsg),
          qtchooser,
          ${misc:Depends}
-Recommends: libqt5opengl5-dev (= ${binary:Version})
+Recommends: libqt5opengl5-gles-dev (= ${binary:Version})
 Suggests: libmysqlclient-dev,
           libpq-dev,
           libsqlite3-dev,
@@ -297,14 +343,17 @@
  This package contains the header development files used for building Qt 5
  applications.
 
-Package: qtbase5-private-dev
+Package: qtbase5-private-gles-dev
+Provides: qtbase5-private-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: qtbase5-dev (= ${binary:Version}), ${misc:Depends}
-Breaks: qtbase5-dev (<< 5.0.2+dfsg1-3~)
-Replaces: qtbase5-dev (<< 5.0.2+dfsg1-3~)
+Depends: qtbase5-gles-dev (= ${binary:Version}), ${misc:Depends}
+Breaks: qtbase5-dev (<< 5.0.2+dfsg1-3~),
+        qtbase5-private-dev (<= 5.2.1+dfsg+)
+Replaces: qtbase5-dev (<< 5.0.2+dfsg1-3~),
+          qtbase5-private-dev (<= 5.2.1+dfsg+)
 Description: Qt 5 base private 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.
@@ -314,13 +363,16 @@
  .
  Use at your own risk.
 
-Package: libqt5opengl5-dev
+Package: libqt5opengl5-gles-dev
+Provides: libqt5opengl5-dev
+Breaks: libqt5opengl5-dev (<= 5.2.1+dfsg+)
+Replaces: libqt5opengl5-dev (<= 5.2.1+dfsg+)
 Architecture: any
 Multi-Arch: same
 Section: libdevel
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: libqt5opengl5 (= ${binary:Version}),
-         qtbase5-dev (= ${binary:Version}),
+Depends: libqt5opengl5-gles (= ${binary:Version}),
+         qtbase5-gles-dev (= ${binary:Version}),
          ${misc:Depends}
 Description: Qt 5 OpenGL library development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -329,7 +381,10 @@
  This package contains the development files needed to build Qt 5 applications
  using QtOpenGL library.
 
-Package: qtbase5-dev-tools
+Package: qtbase5-dev-tools-gles
+Provides: qtbase5-dev-tools
+Breaks: qtbase5-dev-tools (<= 5.2.1+dfsg+)
+Replaces: qtbase5-dev-tools (<= 5.2.1+dfsg+)
 Architecture: any
 Multi-Arch: foreign
 Section: devel
@@ -344,7 +399,10 @@
  applications, such as moc, qdbuscpp2xml, qdbusxml2cpp, qdoc, rcc,
  syncqt and uic.
 
-Package: qt5-qmake
+Package: qt5-qmake-gles
+Provides: qt5-qmake
+Breaks: qt5-qmake (<= 5.2.1+dfsg+)
+Replaces: qt5-qmake (<= 5.2.1+dfsg+)
 Architecture: any
 Multi-Arch: foreign
 Section: devel
@@ -365,7 +423,10 @@
  .
  This package contains also these platform specifications.
 
-Package: qtbase5-examples
+Package: qtbase5-examples-gles
+Provides: qtbase5-examples
+Breaks: qtbase5-examples (<= 5.2.1+dfsg+)
+Replaces: qtbase5-examples (<= 5.2.1+dfsg+)
 Architecture: any
 Multi-Arch: foreign
 Section: x11
@@ -377,51 +438,62 @@
  .
  This package contains Qt base 5 examples.
 
-Package: qtbase5-dbg
+Package: qtbase5-gles-dbg
+Provides: qtbase5-dbg
+Breaks: qtbase5-dbg (<= 5.2.1+dfsg+)
+Replaces: qtbase5-dbg (<= 5.2.1+dfsg+)
 Priority: extra
 Architecture: any
 Multi-Arch: same
 Section: debug
-Depends: libqt5core5a (= ${binary:Version}), ${misc:Depends}
+Depends: libqt5core5a-gles (= ${binary:Version}), ${misc:Depends}
 Description: Qt 5 base library debugging symbols
  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 debugging symbols for the Qt 5 base libraries.
 
-Package: qtbase5-dev-tools-dbg
+Package: qtbase5-dev-tools-gles-dbg
+Provides: qtbase5-dev-tools-dbg
+Breaks: qtbase5-dev-tools-dbg (<= 5.2.1+dfsg+)
+Replaces: qtbase5-dev-tools-dbg (<= 5.2.1+dfsg+)
 Priority: extra
 Architecture: any
 Section: debug
-Depends: qt5-qmake (= ${binary:Version}),
-         qtbase5-dev-tools (= ${binary:Version}),
+Depends: qt5-qmake-gles (= ${binary:Version}),
+         qtbase5-dev-tools-gles (= ${binary:Version}),
          ${misc:Depends}
-Recommends: qtbase5-dbg
+Recommends: qtbase5-gles-dbg
 Description: Qt 5 base binaries debugging symbols
  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 debugging symbols for the Qt 5 binaries.
 
-Package: qtbase5-examples-dbg
+Package: qtbase5-examples-gles-dbg
+Provides: qtbase5-examples-dbg
+Breaks: qtbase5-examples-dbg (<= 5.2.1+dfsg+)
+Replaces: qtbase5-examples-dbg (<= 5.2.1+dfsg+)
 Priority: extra
 Architecture: any
 Section: debug
-Depends: qtbase5-examples (= ${binary:Version}), ${misc:Depends}
-Recommends: qtbase5-dbg
+Depends: qtbase5-examples-gles (= ${binary:Version}), ${misc:Depends}
+Recommends: qtbase5-gles-dbg
 Description: Qt 5 base examples debugging symbols
  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 debugging symbols for the Qt 5 examples.
 
-Package: qt5-default
+Package: qt5-default-gles
+Breaks: qt5-default (<= 5.2.1+dfsg+)
+Replaces: qt5-default (<= 5.2.1+dfsg+)
 Architecture: any
 Multi-Arch: same
-Depends: qtbase5-dev, qtchooser, ${misc:Depends}
+Depends: qtbase5-gles-dev, qtchooser, ${misc:Depends}
 Conflicts: qt4-default
-Provides: qt-default
-Suggests: qt5-qmake, qtbase5-dev-tools
+Provides: qt-default, qt5-default
+Suggests: qt5-qmake-gles, qtbase5-dev-tools-gles
 Description: Qt 5 development defaults package
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -431,7 +503,10 @@
  configuration for qtchooser, but does not prevent alternative Qt
  installations from being used.
 
-Package: qtbase5-doc-html
+Package: qtbase5-gles-doc-html
+Provides: qtbase5-doc-html
+Breaks: qtbase5-doc-html (<= 5.2.1+dfsg+)
+Replaces: qtbase5-doc-html (<= 5.2.1+dfsg+)
 Priority: extra
 Architecture: all
 Section: doc

=== renamed file 'debian/libqt5concurrent5.install' => 'debian/libqt5concurrent5-gles.install'
=== renamed file 'debian/libqt5concurrent5.lintian-overrides' => 'debian/libqt5concurrent5-gles.lintian-overrides'
=== renamed file 'debian/libqt5concurrent5.symbols' => 'debian/libqt5concurrent5-gles.symbols'
=== renamed file 'debian/libqt5core5a.install' => 'debian/libqt5core5a-gles.install'
=== renamed file 'debian/libqt5core5a.lintian-overrides' => 'debian/libqt5core5a-gles.lintian-overrides'
=== added file 'debian/libqt5core5a-gles.shlibs'
--- debian/libqt5core5a-gles.shlibs	1970-01-01 00:00:00 +0000
+++ debian/libqt5core5a-gles.shlibs	2014-03-20 00:52:48 +0000
@@ -0,0 +1,1 @@
+libQt5Core 5 libqt5core5a (>= 5.2.1+dfsg1)

=== renamed file 'debian/libqt5core5a.symbols' => 'debian/libqt5core5a-gles.symbols'
=== renamed file 'debian/libqt5dbus5.install' => 'debian/libqt5dbus5-gles.install'
=== renamed file 'debian/libqt5dbus5.lintian-overrides' => 'debian/libqt5dbus5-gles.lintian-overrides'
=== added file 'debian/libqt5dbus5-gles.shlibs'
--- debian/libqt5dbus5-gles.shlibs	1970-01-01 00:00:00 +0000
+++ debian/libqt5dbus5-gles.shlibs	2014-03-20 00:52:48 +0000
@@ -0,0 +1,1 @@
+libQt5DBus 5 libqt5dbus5 (>= 5.2.1+dfsg1)

=== renamed file 'debian/libqt5dbus5.symbols' => 'debian/libqt5dbus5-gles.symbols'
=== renamed file 'debian/libqt5gui5.install-common' => 'debian/libqt5gui5-gles.install-common'
=== renamed file 'debian/libqt5gui5.install-linux' => 'debian/libqt5gui5-gles.install-linux'
=== renamed file 'debian/libqt5gui5.lintian-overrides' => 'debian/libqt5gui5-gles.lintian-overrides'
=== added file 'debian/libqt5gui5-gles.shlibs'
--- debian/libqt5gui5-gles.shlibs	1970-01-01 00:00:00 +0000
+++ debian/libqt5gui5-gles.shlibs	2014-03-20 00:52:48 +0000
@@ -0,0 +1,1 @@
+libQt5Gui 5 libqt5gui5 (>= 5.2.1+dfsg1) | libqt5gui5-gles (>= 5.2.1+dfsg1)

=== renamed file 'debian/libqt5gui5.symbols' => 'debian/libqt5gui5-gles.symbols'
=== renamed file 'debian/libqt5network5.install-common' => 'debian/libqt5network5-gles.install-common'
=== renamed file 'debian/libqt5network5.install-linux' => 'debian/libqt5network5-gles.install-linux'
=== renamed file 'debian/libqt5network5.lintian-overrides' => 'debian/libqt5network5-gles.lintian-overrides'
=== renamed file 'debian/libqt5network5.symbols' => 'debian/libqt5network5-gles.symbols'
=== renamed file 'debian/libqt5opengl5-dev.install' => 'debian/libqt5opengl5-gles-dev.install'
=== renamed file 'debian/libqt5opengl5.install' => 'debian/libqt5opengl5-gles.install'
=== renamed file 'debian/libqt5opengl5.lintian-overrides' => 'debian/libqt5opengl5-gles.lintian-overrides'
=== added file 'debian/libqt5opengl5-gles.shlibs'
--- debian/libqt5opengl5-gles.shlibs	1970-01-01 00:00:00 +0000
+++ debian/libqt5opengl5-gles.shlibs	2014-03-20 00:52:48 +0000
@@ -0,0 +1,1 @@
+libQt5OpenGL 5 libqt5opengl5 (>= 5.2.1+dfsg1) | libqt5opengl5-gles (>= 5.2.1+dfsg1)

=== renamed file 'debian/libqt5opengl5.symbols' => 'debian/libqt5opengl5-gles.symbols'
=== renamed file 'debian/libqt5printsupport5.install' => 'debian/libqt5printsupport5-gles.install'
=== renamed file 'debian/libqt5printsupport5.lintian-overrides' => 'debian/libqt5printsupport5-gles.lintian-overrides'
=== renamed file 'debian/libqt5printsupport5.symbols' => 'debian/libqt5printsupport5-gles.symbols'
=== renamed file 'debian/libqt5sql5.install' => 'debian/libqt5sql5-gles.install'
=== renamed file 'debian/libqt5sql5.lintian-overrides' => 'debian/libqt5sql5-gles.lintian-overrides'
=== renamed file 'debian/libqt5sql5.symbols' => 'debian/libqt5sql5-gles.symbols'
=== renamed file 'debian/libqt5sql5-ibase.install' => 'debian/libqt5sql5-ibase-gles.install'
=== renamed file 'debian/libqt5sql5-mysql.install' => 'debian/libqt5sql5-mysql-gles.install'
=== renamed file 'debian/libqt5sql5-odbc.install' => 'debian/libqt5sql5-odbc-gles.install'
=== renamed file 'debian/libqt5sql5-psql.install' => 'debian/libqt5sql5-psql-gles.install'
=== renamed file 'debian/libqt5sql5-sqlite.install' => 'debian/libqt5sql5-sqlite-gles.install'
=== renamed file 'debian/libqt5sql5-tds.install' => 'debian/libqt5sql5-tds-gles.install'
=== renamed file 'debian/libqt5test5.install' => 'debian/libqt5test5-gles.install'
=== renamed file 'debian/libqt5test5.lintian-overrides' => 'debian/libqt5test5-gles.lintian-overrides'
=== renamed file 'debian/libqt5test5.symbols' => 'debian/libqt5test5-gles.symbols'
=== renamed file 'debian/libqt5widgets5.install' => 'debian/libqt5widgets5-gles.install'
=== renamed file 'debian/libqt5widgets5.lintian-overrides' => 'debian/libqt5widgets5-gles.lintian-overrides'
=== added file 'debian/libqt5widgets5-gles.shlibs'
--- debian/libqt5widgets5-gles.shlibs	1970-01-01 00:00:00 +0000
+++ debian/libqt5widgets5-gles.shlibs	2014-03-20 00:52:48 +0000
@@ -0,0 +1,1 @@
+libQt5Widgets 5 libqt5widgets5 (>= 5.2.1+dfsg1)

=== renamed file 'debian/libqt5widgets5.symbols' => 'debian/libqt5widgets5-gles.symbols'
=== renamed file 'debian/libqt5xml5.install' => 'debian/libqt5xml5-gles.install'
=== renamed file 'debian/libqt5xml5.lintian-overrides' => 'debian/libqt5xml5-gles.lintian-overrides'
=== renamed file 'debian/libqt5xml5.symbols' => 'debian/libqt5xml5-gles.symbols'
=== modified file 'debian/mark_private_symbols.sh'
--- debian/mark_private_symbols.sh	2013-07-31 07:54:15 +0000
+++ debian/mark_private_symbols.sh	2014-03-20 00:52:48 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-PRIVATE_HEADERS=qtbase5-private-dev/usr/include
+PRIVATE_HEADERS=qtbase5-private-gles-dev/usr/include
 
 error() {
 	echo $@

=== renamed file 'debian/qt5-default.install' => 'debian/qt5-default-gles.install'
=== renamed file 'debian/qt5-qmake.install' => 'debian/qt5-qmake-gles.install'
=== renamed file 'debian/qt5-qmake.manpages' => 'debian/qt5-qmake-gles.manpages'
=== renamed file 'debian/qtbase5-dev-tools.install' => 'debian/qtbase5-dev-tools-gles.install'
=== renamed file 'debian/qtbase5-dev-tools.manpages' => 'debian/qtbase5-dev-tools-gles.manpages'
=== renamed file 'debian/qtbase5-examples.install' => 'debian/qtbase5-examples-gles.install'
=== renamed file 'debian/qtbase5-examples.lintian-overrides' => 'debian/qtbase5-examples-gles.lintian-overrides'
=== renamed file 'debian/qtbase5-dev.install' => 'debian/qtbase5-gles-dev.install'
=== renamed file 'debian/qtbase5-doc-html.install' => 'debian/qtbase5-gles-doc-html.install'
=== renamed file 'debian/qtbase5-private-dev.install' => 'debian/qtbase5-private-gles-dev.install'
=== modified file 'debian/rules'
--- debian/rules	2014-03-10 11:01:41 +0000
+++ debian/rules	2014-03-20 00:52:48 +0000
@@ -58,12 +58,8 @@
 	armv6_architectures += armel
 endif
 
-gles2_architectures := armel armhf
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
-	extra_configure_opts += -opengl es2
-else
-	extra_configure_opts += -opengl desktop
-endif
+# All arches are gles here
+extra_configure_opts += -opengl es2
 
 # Only run tests on the archs they are known to pass with current configuration
 testrun_architectures := armhf i386 amd64
@@ -288,10 +284,10 @@
 	dh_installchangelogs $(upstream_changes)
 
 override_dh_strip:
-	dh_strip -pqtbase5-examples --dbg-package=qtbase5-examples-dbg
-	dh_strip -pqtbase5-dev-tools --dbg-package=qtbase5-dev-tools-dbg
-	dh_strip -pqt5-qmake --dbg-package=qtbase5-dev-tools-dbg
-	dh_strip --remaining-packages --dbg-package=qtbase5-dbg
+	dh_strip -pqtbase5-examples-gles --dbg-package=qtbase5-examples-gles-dbg
+	dh_strip -pqtbase5-dev-tools-gles --dbg-package=qtbase5-dev-tools-gles-dbg
+	dh_strip -pqt5-qmake-gles --dbg-package=qtbase5-dev-tools-gles-dbg
+	dh_strip --remaining-packages --dbg-package=qtbase5-gles-dbg
 
 override_dh_makeshlibs:
 	# Specific shlibs version (e.g.: 4:4.5.2)
@@ -299,13 +295,21 @@
 	# Generate shlibs local files
 	for pkg in $(pkgs_lib); do \
 		if test -e debian/$${pkg}/DEBIAN/shlibs ; then \
-			sed 's/>=[^)]*/= $(current_version)/' debian/$${pkg}/DEBIAN/shlibs >> debian/shlibs.local ;\
+			cat debian/$${pkg}/DEBIAN/shlibs >> debian/shlibs.local ;\
 		fi \
 	done
 
 override_dh_gencontrol:
 	: # FIXME: better way to do that
-	sed -i 's/perl$$/perl/' debian/qtbase5-dev-tools.substvars
+	sed -i 's/perl$$/perl/' debian/qtbase5-dev-tools-gles.substvars
+	for pkg in $(pkgs_lib); do \
+		if test -e debian/$${pkg}.substvars ; then \
+			sed -i -e 's/libqt5core5a-gles/libqt5core5a/g' debian/$${pkg}.substvars ;\
+			sed -i -e 's/libqt5dbus5-gles/libqt5dbus5/g' debian/$${pkg}.substvars ;\
+			sed -i -e 's/libqt5dbus5-gles/libqt5dbus5/g' debian/$${pkg}.substvars ;\
+			sed -i -e 's/libqt5widgets5-gles/libqt5widgets5/g' debian/$${pkg}.substvars ;\
+		fi \
+	done
 	dh_gencontrol
 
 override_dh_builddeb: