QtMir

Merge lp:~albaguirre/qtmir/mir-0.22-compat-gles into lp:qtmir/gles

  1. mir-0.22-compat-gles
  2. Merge into gles
Proposed by Alberto Aguirre
Status: Rejected
Rejected by: Robert Bruce Park
Proposed branch: lp:~albaguirre/qtmir/mir-0.22-compat-gles
Merge into: lp:qtmir/gles
Diff against target: 25 lines (+4/-4)
1 file modified
debian/control (+4/-4)
To merge this branch: bzr merge lp:~albaguirre/qtmir/mir-0.22-compat-gles
Reviewer Review Type Date Requested Status
Robert Bruce Park (community) Disapprove
Review via email: mp+292572@code.launchpad.net

Commit message

Sync with upstream

To post a comment you must log in.
Revision history for this message
Robert Bruce Park (robru) wrote :

lp:qtmir/gles is no longer a thing, qtmir-gles is built from the same lp:qtmir source tree, you need to refresh this patch in case it conflicts with your changes:

https://code.launchpad.net/~robru/qtmir/inline-gles-quilt/+merge/290646

review: Disapprove

Unmerged revisions

164. By Alberto Aguirre

Sync with upstream

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2016-03-30 22:24:00 +0000
3+++ debian/control 2016-04-21 17:51:20 +0000
4@@ -11,9 +11,9 @@
5 libglib2.0-dev,
6 libgsettings-qt-dev,
7 liblttng-ust-dev,
8- libmirclient-dev (>= 0.19.0),
9- libmircommon-dev (>= 0.19.0),
10- libmirserver-dev (>= 0.19.0),
11+ libmirclient-dev (>= 0.22.0),
12+ libmircommon-dev (>= 0.22.0),
13+ libmirserver-dev (>= 0.22.0),
14 libmtdev-dev,
15 libprocess-cpp-dev,
16 libqt5gui5-gles,
17@@ -32,7 +32,7 @@
18 liburl-dispatcher1-dev,
19 libxkbcommon-dev,
20 libxrender-dev,
21- mir-renderer-gl-dev (>= 0.17.0),
22+ mir-renderer-gl-dev (>= 0.22.0),
23 pkg-config,
24 # lttng-gen-ts needs python3, but doesn't depend on it itself: bug 1359147
25 python3:any,

Subscribers

People subscribed via source and target branches