Unity System Compositor

Merge lp:unity-system-compositor/0.7 into lp:unity-system-compositor/ubuntu

  1. 0.7
  2. Merge into ubuntu
Proposed by Alexandros Frantzis
Status: Merged
Approved by: Alexandros Frantzis
Approved revision: 304
Merged at revision: 251
Proposed branch: lp:unity-system-compositor/0.7
Merge into: lp:unity-system-compositor/ubuntu
Diff against target: 210 lines (+35/-42)
11 files modified
CMakeLists.txt (+1/-1)
cmake/FindPIL.cmake (+1/-1)
debian/10-unity-system-compositor.conf (+0/-3)
debian/changelog (+9/-0)
debian/control (+7/-18)
debian/rules (+2/-2)
debian/ubuntu-desktop-mir.install (+0/-1)
debian/ubuntu-desktop-mir.maintscript (+0/-1)
spinner/CMakeLists.txt (+1/-1)
tests/autopilot/unity_system_compositor/test_runtime.py (+1/-1)
tools/png2header.py (+13/-13)
To merge this branch: bzr merge lp:unity-system-compositor/0.7
Reviewer Review Type Date Requested Status
Unity System Compositor Development Team Pending
Review via email: mp+303771@code.launchpad.net

Commit message

Release 0.7.1

Description of the change

Release 0.7.1

To post a comment you must log in.

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 2016-08-12 14:08:22 +0000
3+++ CMakeLists.txt 2016-08-24 07:12:15 +0000
4@@ -17,7 +17,7 @@
5 project(UnitySystemCompositor)
6 set(USC_VERSION_MAJOR 0)
7 set(USC_VERSION_MINOR 7)
8-set(USC_VERSION_PATCH 0)
9+set(USC_VERSION_PATCH 1)
10 set(USC_VERSION "${USC_VERSION_MAJOR}.${USC_VERSION_MINOR}.${USC_VERSION_PATCH}")
11
12 cmake_minimum_required(VERSION 2.8)
13
14=== modified file 'cmake/FindPIL.cmake'
15--- cmake/FindPIL.cmake 2015-06-11 09:05:02 +0000
16+++ cmake/FindPIL.cmake 2016-08-24 07:12:15 +0000
17@@ -1,5 +1,5 @@
18 execute_process(
19- COMMAND python -c "from PIL import Image"
20+ COMMAND python3 -c "from PIL import Image"
21 RESULT_VARIABLE HAVE_PIL
22 )
23
24
25=== removed file 'debian/10-unity-system-compositor.conf'
26--- debian/10-unity-system-compositor.conf 2015-08-07 01:36:52 +0000
27+++ debian/10-unity-system-compositor.conf 1970-01-01 00:00:00 +0000
28@@ -1,3 +0,0 @@
29-[Seat:*]
30-type=unity;xlocal
31-unity-compositor-command=unity-system-compositor.sleep
32
33=== modified file 'debian/changelog'
34--- debian/changelog 2016-08-15 18:57:16 +0000
35+++ debian/changelog 2016-08-24 07:12:15 +0000
36@@ -1,3 +1,12 @@
37+unity-system-compositor (0.7.1-0ubuntu1) UNRELEASED; urgency=medium
38+
39+ * 0.7.1 release
40+ - Use libandroid-properties-dev build-dep on arm64
41+ - Use python3 for everything (autopilot tests and internal scripts)
42+ - Remove obsolete ubuntu-desktop-mir binary package
43+
44+ -- Alexandros Frantzis <alexandros.frantzis@canonical.com> Wed, 24 Aug 2016 09:48:41 +0300
45+
46 unity-system-compositor (0.7.0+16.10.20160815-0ubuntu1) yakkety; urgency=medium
47
48 * 0.7.0 release, containing compatibility fixes for mir 0.24 release.
49
50=== modified file 'debian/control'
51--- debian/control 2016-08-12 14:08:22 +0000
52+++ debian/control 2016-08-24 07:12:15 +0000
53@@ -6,8 +6,9 @@
54 cmake-data,
55 dbus,
56 debhelper (>= 9),
57+ dh-python,
58 google-mock,
59- libandroid-properties-dev [i386 amd64 armhf],
60+ libandroid-properties-dev [i386 amd64 armhf arm64],
61 libboost-dev,
62 libboost-system-dev,
63 libdbus-1-dev,
64@@ -17,9 +18,9 @@
65 libmirclient-dev (>= 0.24.0),
66 libmirserver-dev (>= 0.24.0),
67 pkg-config,
68- python:any (>= 2.7),
69- python-setuptools,
70- python-pil:native,
71+ python3,
72+ python3-setuptools,
73+ python3-pil:native,
74 Standards-Version: 3.9.7
75 Homepage: https://launchpad.net/unity-system-compositor
76 # if you don't have have commit access to this branch but would like to upload
77@@ -39,21 +40,9 @@
78
79 Package: unity-system-compositor-autopilot
80 Architecture: all
81-Depends: python-autopilot,
82+Depends: python3-autopilot,
83 unity-system-compositor (>= ${source:Version}),
84 ${misc:Depends},
85- ${python:Depends},
86+ ${python3:Depends},
87 Description: Test package for Unity System Compositor
88 Autopilots tests for Unity System Compositor
89-
90-Package: ubuntu-desktop-mir
91-Architecture: all
92-Depends: lightdm (>= 1.9.4),
93- unity-system-compositor,
94- xmir,
95- ${misc:Depends},
96-Replaces: unity-system-compositor (<< 0.0.2),
97-Breaks: unity-system-compositor (<< 0.0.2),
98-Description: System compositor for Ubuntu Desktop
99- Settings package which installs everything Ubuntu Desktop needs to use Mir
100- (via XMir).
101
102=== modified file 'debian/rules'
103--- debian/rules 2015-07-27 16:37:47 +0000
104+++ debian/rules 2016-08-24 07:12:15 +0000
105@@ -1,7 +1,7 @@
106 #!/usr/bin/make -f
107
108 %:
109- dh $@ --parallel --fail-missing --with python2
110+ dh $@ --parallel --fail-missing --with python3
111
112 override_dh_auto_configure:
113 # Debian defines CMAKE_INSTALL_SYSCONFDIR as /usr/etc, which is wrong.
114@@ -11,7 +11,7 @@
115 override_dh_install:
116 # install autopilot tests
117 cd tests/autopilot; \
118- set -ex; for python in $(shell pyversions -r); do \
119+ set -ex; for python in $(shell py3versions -r); do \
120 $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
121 done; \
122 cd $(CURDIR)
123
124=== removed file 'debian/ubuntu-desktop-mir.install'
125--- debian/ubuntu-desktop-mir.install 2014-01-06 23:29:06 +0000
126+++ debian/ubuntu-desktop-mir.install 1970-01-01 00:00:00 +0000
127@@ -1,1 +0,0 @@
128-debian/10-unity-system-compositor.conf /usr/share/lightdm/lightdm.conf.d
129
130=== removed file 'debian/ubuntu-desktop-mir.maintscript'
131--- debian/ubuntu-desktop-mir.maintscript 2014-01-06 23:29:06 +0000
132+++ debian/ubuntu-desktop-mir.maintscript 1970-01-01 00:00:00 +0000
133@@ -1,1 +0,0 @@
134-rm_conffile /etc/lightdm/lightdm.conf.d/10-unity-system-compositor.conf 0.0.2+14.04.20131128.2-0ubuntu1
135
136=== modified file 'spinner/CMakeLists.txt'
137--- spinner/CMakeLists.txt 2015-06-25 15:47:06 +0000
138+++ spinner/CMakeLists.txt 2016-08-24 07:12:15 +0000
139@@ -17,7 +17,7 @@
140 function(png2header png header varname)
141 add_custom_command(
142 OUTPUT ${header}
143- COMMAND python ${CMAKE_SOURCE_DIR}/tools/png2header.py ${png} ${varname} > ${header}
144+ COMMAND python3 ${CMAKE_SOURCE_DIR}/tools/png2header.py ${png} ${varname} > ${header}
145 DEPENDS ${png} ${CMAKE_SOURCE_DIR}/tools/png2header.py
146 )
147 endfunction()
148
149=== modified file 'tests/autopilot/unity_system_compositor/test_runtime.py'
150--- tests/autopilot/unity_system_compositor/test_runtime.py 2013-07-18 05:46:18 +0000
151+++ tests/autopilot/unity_system_compositor/test_runtime.py 2016-08-24 07:12:15 +0000
152@@ -78,7 +78,7 @@
153
154
155 def _get_video_devices():
156- lspci_output = check_output(["lspci", "-vvv"]).strip()
157+ lspci_output = check_output(["lspci", "-vvv"]).decode("utf-8").strip()
158 devices = [s.strip() for s in re.split("\n\n", lspci_output, flags=re.M)]
159 video_devices = [dev for dev in devices if _is_video_device(dev)]
160 return video_devices
161
162=== modified file 'tools/png2header.py'
163--- tools/png2header.py 2015-12-01 07:57:47 +0000
164+++ tools/png2header.py 2016-08-24 07:12:15 +0000
165@@ -1,4 +1,4 @@
166-#!/usr/bin/env python
167+#!/usr/bin/env python3
168 # coding: utf-8
169
170 # Copyright © 2015 Canonical Ltd.
171@@ -37,7 +37,7 @@
172 if line_chars == 0:
173 result += ' "'
174
175- s = '\\%o' % ord(c)
176+ s = '\\%o' % c
177 result += s
178 line_chars += len(s)
179
180@@ -60,19 +60,19 @@
181
182 def export(image, variable_name):
183 image_info = (image.size[0], image.size[1], bytes_per_pixel(image))
184- print "static const struct {"
185- print " unsigned int width;"
186- print " unsigned int height;"
187- print " unsigned int bytes_per_pixel; /* 3:RGB, 4:RGBA */"
188- print " unsigned char pixel_data[%d * %d * %d + 1];" % image_info
189- print "} %s = {" % variable_name
190- print " %d, %d, %d," % image_info
191- print tocstring(image.tobytes())
192- print "};"
193+ print("static const struct {")
194+ print(" unsigned int width;")
195+ print(" unsigned int height;")
196+ print(" unsigned int bytes_per_pixel; /* 3:RGB, 4:RGBA */")
197+ print(" unsigned char pixel_data[%d * %d * %d + 1];" % image_info)
198+ print("} %s = {" % variable_name)
199+ print(" %d, %d, %d," % image_info)
200+ print(tocstring(image.tobytes()))
201+ print("};")
202
203 def show_usage():
204- print >>sys.stderr, "Usage: ./png2header.py PNGFILE VARNAME > HEADER_FILE"
205- print >>sys.stderr, "Convert a PNG image to an embeddable C/C++ header file"
206+ print("Usage: ./png2header.py PNGFILE VARNAME > HEADER_FILE", file=sys.stderr)
207+ print("Convert a PNG image to an embeddable C/C++ header file", file=sys.stderr)
208
209 if len(sys.argv) < 3:
210 show_usage()

Subscribers

People subscribed via source and target branches