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

Proposed by Michał Sawicz on 2017-10-10
Status: Approved
Approved by: Gerry Boland on 2017-10-11
Approved revision: 400
Proposed branch: lp:~saviq/qtubuntu/remove-content-hub-and-ual-gles
Merge into: lp:qtubuntu
Prerequisite: lp:~gerboland/qtubuntu/remove-content-hub-and-ual
Diff against target: 118 lines (+24/-41)
1 file modified
debian/gles-patches/convert-to-gles.patch (+24/-41)
To merge this branch: bzr merge lp:~saviq/qtubuntu/remove-content-hub-and-ual-gles
Reviewer Review Type Date Requested Status
Gerry Boland 2017-10-10 Approve on 2017-10-11
Review via email: mp+332079@code.launchpad.net

Commit message

Update convert-to-gles.patch

To post a comment you must log in.
Gerry Boland (gerboland) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/gles-patches/convert-to-gles.patch'
2--- debian/gles-patches/convert-to-gles.patch 2016-10-12 09:24:44 +0000
3+++ debian/gles-patches/convert-to-gles.patch 2017-10-10 20:21:12 +0000
4@@ -8,9 +8,9 @@
5 Priority: optional
6 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
7 Build-Depends: debhelper (>= 9),
8-@@ -12,11 +12,20 @@ Build-Depends: debhelper (>= 9),
9+@@ -11,10 +11,19 @@ Build-Depends: debhelper (>= 9),
10 libinput-dev,
11- libmirclient-dev (>= 0.13.0),
12+ libmirclient-dev (>= 0.26.1),
13 libmtdev-dev,
14 + libqt5gui5-gles,
15 + libqt5quick5-gles,
16@@ -18,7 +18,6 @@
17 + libqt5quicktest5,
18 + libqt5quickwidgets5-gles,
19 + libqt5sensors5-dev,
20- libubuntu-application-api-dev (>= 2.9.0),
21 libudev-dev,
22 libxkbcommon-dev,
23 libxrender-dev,
24@@ -29,7 +28,7 @@
25 quilt,
26 # if you don't have have commit access to this branch but would like to upload
27 # directly to Ubuntu, don't worry: your changes will be merged back into the
28-@@ -26,7 +35,7 @@ Standards-Version: 3.9.6
29+@@ -24,7 +33,7 @@ Standards-Version: 3.9.6
30 Section: libs
31
32 Package: qtubuntu-android
33@@ -37,59 +36,44 @@
34 +Architecture: amd64 i386
35 Multi-Arch: same
36 Conflicts: qtubuntu-desktop,
37- Replaces: qtubuntu (<< 0.52),
38-@@ -37,43 +46,12 @@ Provides: qtubuntu,
39- Depends: ubuntu-application-api3-touch,
40- ${misc:Depends},
41- ${shlibs:Depends},
42--Description: Qt plugins for Ubuntu Platform API (mobile)
43-+Description: Qt plugins for Ubuntu Platform API (mobile) - OpenGLES
44- QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It contains a
45- QPA (Qt Platform Abstraction) plugin based on the Ubuntu Platform API and a
46- legacy QPA plugin based on the compatibility layers. It also provides Qt
47- bindings for Ubuntu Platform API features that are not exposed through the QPA
48- plugins.
49- .
50+ qtubuntu-appmenutheme,
51+@@ -34,28 +43,11 @@ Replaces: qtubuntu (<< 0.52),
52+ Breaks: ubuntu-touch-session (<< 0.107),
53+ unity8 (<< 7.85),
54+ Provides: qtubuntu,
55+- qtubuntu-appmenutheme
56+-Depends: ${misc:Depends},
57+- ${shlibs:Depends},
58+-Description: Qt plugins for Mir support on Ubuntu (mobile)
59+- QtUbuntu is a QPA plugin for Qt5 adding support for the Mir display server.
60+- .
61 - This variant of the package is for Android-based phones and tablets.
62 -
63 -Package: qtubuntu-desktop
64 -Architecture: any
65 -Multi-Arch: same
66 -Conflicts: qtubuntu-android,
67+- qtubuntu-appmenutheme,
68 -Replaces: qtubuntu (<< 0.52),
69 - qtubuntu-android,
70+- qtubuntu-appmenutheme,
71 -Breaks: unity8 (<< 7.85),
72 -Provides: qtubuntu,
73--Depends: ubuntu-application-api3-desktop,
74-- ${misc:Depends},
75-- ${shlibs:Depends},
76--Description: Qt plugins for Ubuntu Platform API (desktop)
77-- QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It contains a
78-- QPA (Qt Platform Abstraction) plugin based on the Ubuntu Platform API and a
79-- legacy QPA plugin based on the compatibility layers. It also provides Qt
80-- bindings for Ubuntu Platform API features that are not exposed through the QPA
81-- plugins.
82-- .
83+ qtubuntu-appmenutheme,
84+ Depends: ${misc:Depends},
85+ ${shlibs:Depends},
86+-Description: Qt plugins for Mir support on Ubuntu (desktop)
87++Description: Qt plugins for Mir support on Ubuntu (mobile) - OpenGLES
88+ QtUbuntu is a QPA plugin for Qt5 adding support for the Mir display server.
89+ .
90 - This variant of the package is for GNU-based desktops.
91--
92--Package: qtubuntu-appmenutheme
93--Architecture: any
94--Multi-Arch: same
95--Depends: ${misc:Depends},
96-- ${shlibs:Depends},
97--Description: Qt platform theme for exported application menus
98-- Appmenutheme enables the export of application menus to a global menu bar.
99-- It is implemented in a QPA platform theme plugin.
100-- .
101-- This package will work for applications designed for Qt5, as well as QML
102-- applications
103 + This variant of the package is for Android-based phones and tablets (built
104 + against the OpenGLES variant of qtbase).
105 Index: qtubuntu/debian/rules
106 ===================================================================
107 --- qtubuntu.orig/debian/rules
108 +++ qtubuntu/debian/rules
109-@@ -5,61 +5,35 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4
110+@@ -5,60 +5,35 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4
111 export QT_SELECT=5
112
113 ANDROID_DIR = build-android
114@@ -151,4 +135,3 @@
115 dh_install --sourcedir=$(TMP1_DIR) -pqtubuntu-android
116 -endif
117 - dh_install --sourcedir=$(TMP2_DIR) -pqtubuntu-desktop
118-- dh_install --sourcedir=$(TMP2_DIR) -pqtubuntu-appmenutheme

Subscribers

People subscribed via source and target branches