Merge into trunk : unity-scope-tool-fixes : Code : Unity 8

Status:	Merged
Approved by:	Andrea Cimitan on 2016-02-26
Approved revision:	2206
Merged at revision:	2263
Proposed branch:	lp:~aacid/unity8/unity-scope-tool-fixes
Merge into:	lp:unity8
Diff against target:	38 lines (+2/-9) 2 files modified debian/control (+2/-1) qml/ScopeTool.qml (+0/-8)
To merge this branch:	bzr merge lp:~aacid/unity8/unity-scope-tool-fixes
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Andrea Cimitan (community)			Approve on 2016-02-26
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-02-25
Unity8 CI Bot	continuous-integration		Approve on 2016-02-25
Pete Woods (community)			Approve on 2016-02-25
dobey (community)		2016-02-25	Approve on 2016-02-25
Review via email: mp+287191@code.launchpad.net

Commit Message

Minor fixes for unity-scope-tool

* Make the package install things better by making unity8-private pull the gsettings and multimedia deps it has
* Remove unneeded background code

Description of the Change

* Are there any related MPs required for this MP to build/function as expected?
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* Did you make sure that your branch does not contain spurious tags?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

* If you changed the UI, has there been a design review?
N/A

dobey (dobey) on 2016-02-25:

#

review: Approve

Pete Woods (pete-woods) wrote on 2016-02-25:

#

Looks good to me, thanks!

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-25:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/494/rebuild

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-25:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7424/rebuild

review: Needs Fixing (continuous-integration)

Andrea Cimitan (cimi) wrote on 2016-02-26:

#

* Did you perform an exploratory manual test run of the code change and any related functionality?
dobey and pete did
* Did CI run pass? If not, please explain why.
ap
* Did you make sure that the branch does not contain spurious tags?
y

review: Approve

1	=== modified file 'debian/control'
2	--- debian/control 2016-02-12 00:12:30 +0000
3	+++ debian/control 2016-02-25 15:42:11 +0000
4	@@ -101,7 +101,6 @@
5	qml-module-qt-labs-folderlistmodel,
6	qml-module-qtquick-xmllistmodel,
7	qml-module-qtsysteminfo,
8	- qtdeclarative5-gsettings1.0,
9	qtdeclarative5-qtmir-plugin (>= 0.4.5),
10	qtdeclarative5-ubuntu-telephony0.1,
11	qtdeclarative5-ubuntu-web-plugin,
12	@@ -192,6 +191,8 @@
13	libhardware2,
14	pay-service,
15	unity-schemas (>= 7.3.1+14.10.20140915),
16	+ qtdeclarative5-gsettings1.0,
17	+ qml-module-qtmultimedia,
18	${misc:Depends},
19	${shlibs:Depends},
20	Provides: unity-launcher-impl,
21
22	=== modified file 'qml/ScopeTool.qml'
23	--- qml/ScopeTool.qml 2015-07-15 15:07:19 +0000
24	+++ qml/ScopeTool.qml 2016-02-25 15:42:11 +0000
25	@@ -52,14 +52,6 @@
26	color: "#FCFCFC"
27	}
28
29	- Image {
30	- anchors.fill: dashContent
31	- source: root.width > root.height ? "Dash/graphics/paper_landscape.png" : "Dash/graphics/paper_portrait.png"
32	- fillMode: Image.PreserveAspectCrop
33	- horizontalAlignment: Image.AlignRight
34	- verticalAlignment: Image.AlignTop
35	- }
36	-
37	DashContent {
38	id: dashContent
39

Unity 8

Merge lp:~aacid/unity8/unity-scope-tool-fixes into lp:unity8

Commit Message

Description of the Change

Preview Diff

Subscribers