Merge lp:~kdub/unity-system-compositor/nochange-rebuild into lp:unity-system-compositor

Proposed by Kevin DuBois
Status: Superseded
Proposed branch: lp:~kdub/unity-system-compositor/nochange-rebuild
Merge into: lp:unity-system-compositor
Diff against target: 48 lines (+15/-4)
3 files modified
CMakeLists.txt (+2/-2)
debian/changelog (+11/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~kdub/unity-system-compositor/nochange-rebuild
Reviewer Review Type Date Requested Status
Unity System Compositor Development Team Pending
Review via email: mp+277479@code.launchpad.net

This proposal has been superseded by a proposal from 2015-11-16.

Commit message

do not land: no change rebuild to test a mir corruption fix that breaks abi

Description of the change

do not land: no change rebuild to test a mir corruption fix that breaks abi

To post a comment you must log in.
259. By Andreas Pokorny

follow the deprecation warning and use tobytes instead of tostring.

Approved by PS Jenkins bot.

260. By Andreas Pokorny

do not premultiply RGB images

python would raise an exception if we attempt to access pixel[x,y][3] on a RGB image.
.

Approved by PS Jenkins bot.

261. By Andrea Cimitan

Updated wallpaper for spinner from unity8.

Approved by PS Jenkins bot, Andreas Pokorny.

262. By Andreas Pokorny

Change keyboard handling to scan codes.

Additionally relevant for ubuntu-pd: use none-phone keys to keep display on. Fixes: https://bugs.launchpad.net/bugs/1514059, https://bugs.launchpad.net/bugs/1520422.

Approved by Alexandros Frantzis, PS Jenkins bot.

263. By Andreas Pokorny

Catch all devices with pointer or touchpad capabilities and forward input configuration changes to them.

Approved by Alexandros Frantzis, PS Jenkins bot.

264. By Andreas Pokorny

Use actual image.bytes_per_pixel to decide about GL format of pixel data.

Approved by Alexandros Frantzis, PS Jenkins bot, Kevin DuBois.

265. By Andreas Pokorny

merge updated change log and version

266. By Andreas Pokorny

Move Mocks around and integration test utilities to reuse them in further tests.

Approved by Alexandros Frantzis, PS Jenkins bot.

267. By Andreas Pokorny

Split out the single DBusConnectionHandle from DBusConnectionThread

This allows having multiple connection names that actually work. As opposed to assigning multiple connection names to a single DBusConnection, in which case the first one wins. Fixes: https://bugs.launchpad.net/bugs/1536383.

Approved by PS Jenkins bot, Alexandros Frantzis.

268. By Michael Terry

Properly clamp mouseCursorSpeed and touchpadCursorSpeed settings.

Approved by PS Jenkins bot, Andreas Pokorny.

269. By Alexandros Frantzis

Unblank the screen when a pointer or key event arrives. Fixes: https://bugs.launchpad.net/bugs/1488413.

Approved by Andreas Pokorny, PS Jenkins bot.

270. By Kevin DuBois

bump changelog for no change rebuild

271. By Kevin DuBois

 update changelog after 0.3 landing

Unmerged revisions

271. By Kevin DuBois

 update changelog after 0.3 landing

270. By Kevin DuBois

bump changelog for no change rebuild

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-11-10 18:12:25 +0000
3+++ CMakeLists.txt 2015-11-16 15:46:44 +0000
4@@ -16,8 +16,8 @@
5
6 project(UnitySystemCompositor)
7 set(USC_VERSION_MAJOR 0)
8-set(USC_VERSION_MINOR 1)
9-set(USC_VERSION_PATCH 4)
10+set(USC_VERSION_MINOR 2)
11+set(USC_VERSION_PATCH 0)
12 set(USC_VERSION "${USC_VERSION_MAJOR}.${USC_VERSION_MINOR}.${USC_VERSION_PATCH}")
13
14 cmake_minimum_required(VERSION 2.8)
15
16=== modified file 'debian/changelog'
17--- debian/changelog 2015-10-07 09:55:47 +0000
18+++ debian/changelog 2015-11-16 15:46:44 +0000
19@@ -1,3 +1,14 @@
20+unity-system-compositor (0.2.0+15.10.20151008.1-0ubuntu1) wily; urgency=medium
21+
22+ [ Alexandros Frantzis ]
23+ * Use new versions of mir::event::make_event() overloads.
24+ * Rebuild for Mir 0.17.
25+
26+ [ CI Train Bot ]
27+ * New rebuild forced.
28+
29+ -- Alexandros Frantzis <alexandros.frantzis@canonical.com> Thu, 08 Oct 2015 18:34:03 +0000
30+
31 unity-system-compositor (0.1.4+15.10.20150930.1-0ubuntu1) wily; urgency=medium
32
33 [ Alexandros Frantzis ]
34
35=== modified file 'debian/control'
36--- debian/control 2015-07-27 10:29:16 +0000
37+++ debian/control 2015-11-16 15:46:44 +0000
38@@ -13,8 +13,8 @@
39 libdbus-1-dev,
40 libglib2.0-dev,
41 libgles2-mesa-dev,
42- libmirclient-dev (>= 0.13.0),
43- libmirserver-dev (>= 0.13.0),
44+ libmirclient-dev (>= 0.16.0),
45+ libmirserver-dev (>= 0.16.0),
46 libprotobuf-dev,
47 pkg-config,
48 python:any (>= 2.7),

Subscribers

People subscribed via source and target branches