Merge lp:~saviq/qtubuntu/remove-content-hub-and-ual-gles into lp:qtubuntu

[Michał Sawicz]

Update convert-to-gles.patch

[Gerry Boland (gerboland)]

works

review: Approve

Unmerged revisions

400. By Michał Sawicz on 2017-10-10

Update convert-to-gles.patch

399. By Gerry Boland on 2017-08-25

Merge trunk and fix conflicts

398. By Gerry Boland on 2017-08-03

Remove another ref to papi

397. By Gerry Boland on 2017-08-03

Reduce delta

396. By Gerry Boland on 2017-08-03

Restore basic platform services

395. By Gerry Boland on 2017-08-03

Remove clipboard implementation using content-hub

394. By Gerry Boland on 2017-08-03

Merge papi-cleanup and fix

=== modified file 'debian/gles-patches/convert-to-gles.patch'
--- debian/gles-patches/convert-to-gles.patch	2016-10-12 09:24:44 +0000
+++ debian/gles-patches/convert-to-gles.patch	2017-10-10 20:21:12 +0000
@@ -8,9 +8,9 @@
  Priority: optional
  Maintainer: Ubuntu Developers <[e-mail]>
  Build-Depends: debhelper (>= 9),
-@@ -12,11 +12,20 @@ Build-Depends: debhelper (>= 9),
+@@ -11,10 +11,19 @@ Build-Depends: debhelper (>= 9),
                 libinput-dev,
-                libmirclient-dev (>= 0.13.0),
+                libmirclient-dev (>= 0.26.1),
                 libmtdev-dev,
 +               libqt5gui5-gles,
 +               libqt5quick5-gles,
@@ -18,7 +18,6 @@
 +               libqt5quicktest5,
 +               libqt5quickwidgets5-gles,
 +               libqt5sensors5-dev,
-                libubuntu-application-api-dev (>= 2.9.0),
                 libudev-dev,
                 libxkbcommon-dev,
                 libxrender-dev,
@@ -29,7 +28,7 @@
                 quilt,
  # if you don't have have commit access to this branch but would like to upload
  # directly to Ubuntu, don't worry: your changes will be merged back into the
-@@ -26,7 +35,7 @@ Standards-Version: 3.9.6
+@@ -24,7 +33,7 @@ Standards-Version: 3.9.6
  Section: libs
  
  Package: qtubuntu-android
@@ -37,59 +36,44 @@
 +Architecture: amd64 i386
  Multi-Arch: same
  Conflicts: qtubuntu-desktop,
- Replaces: qtubuntu (<< 0.52),
-@@ -37,43 +46,12 @@ Provides: qtubuntu,
- Depends: ubuntu-application-api3-touch,
-          ${misc:Depends},
-          ${shlibs:Depends},
--Description: Qt plugins for Ubuntu Platform API (mobile)
-+Description: Qt plugins for Ubuntu Platform API (mobile) - OpenGLES
-  QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It contains a
-  QPA (Qt Platform Abstraction) plugin based on the Ubuntu Platform API and a
-  legacy QPA plugin based on the compatibility layers. It also provides Qt
-  bindings for Ubuntu Platform API features that are not exposed through the QPA
-  plugins.
-  .
+            qtubuntu-appmenutheme,
+@@ -34,28 +43,11 @@ Replaces: qtubuntu (<< 0.52),
+ Breaks: ubuntu-touch-session (<< 0.107),
+         unity8 (<< 7.85),
+ Provides: qtubuntu,
+-          qtubuntu-appmenutheme
+-Depends: ${misc:Depends},
+-         ${shlibs:Depends},
+-Description: Qt plugins for Mir support on Ubuntu (mobile)
+- QtUbuntu is a QPA plugin for Qt5 adding support for the Mir display server.
+- .
 - This variant of the package is for Android-based phones and tablets.
 -
 -Package: qtubuntu-desktop
 -Architecture: any
 -Multi-Arch: same
 -Conflicts: qtubuntu-android,
+-           qtubuntu-appmenutheme,
 -Replaces: qtubuntu (<< 0.52),
 -          qtubuntu-android,
+-          qtubuntu-appmenutheme,
 -Breaks: unity8 (<< 7.85),
 -Provides: qtubuntu,
--Depends: ubuntu-application-api3-desktop,
--         ${misc:Depends},
--         ${shlibs:Depends},
--Description: Qt plugins for Ubuntu Platform API (desktop)
-- QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It contains a
-- QPA (Qt Platform Abstraction) plugin based on the Ubuntu Platform API and a
-- legacy QPA plugin based on the compatibility layers. It also provides Qt
-- bindings for Ubuntu Platform API features that are not exposed through the QPA
-- plugins.
-- .
+           qtubuntu-appmenutheme,
+ Depends: ${misc:Depends},
+          ${shlibs:Depends},
+-Description: Qt plugins for Mir support on Ubuntu (desktop)
++Description: Qt plugins for Mir support on Ubuntu (mobile) - OpenGLES
+  QtUbuntu is a QPA plugin for Qt5 adding support for the Mir display server.
+  .
 - This variant of the package is for GNU-based desktops.
--
--Package: qtubuntu-appmenutheme
--Architecture: any
--Multi-Arch: same
--Depends: ${misc:Depends},
--         ${shlibs:Depends},
--Description: Qt platform theme for exported application menus
-- Appmenutheme enables the export of application menus to a global menu bar.
-- It is implemented in a QPA platform theme plugin.
-- .
-- This package will work for applications designed for Qt5, as well as QML
-- applications
 + This variant of the package is for Android-based phones and tablets (built
 + against the OpenGLES variant of qtbase).
 Index: qtubuntu/debian/rules
 ===================================================================
 --- qtubuntu.orig/debian/rules
 +++ qtubuntu/debian/rules
-@@ -5,61 +5,35 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4
+@@ -5,60 +5,35 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4
  export QT_SELECT=5
  
  ANDROID_DIR = build-android
@@ -151,4 +135,3 @@
  	dh_install --sourcedir=$(TMP1_DIR) -pqtubuntu-android
 -endif
 -	dh_install --sourcedir=$(TMP2_DIR) -pqtubuntu-desktop
--	dh_install --sourcedir=$(TMP2_DIR) -pqtubuntu-appmenutheme