Unity

Merge lp:~mzanetti/unity/phablet-copyright-headers into lp:unity/phablet

  1. phablet-copyright-headers
  2. Merge into phablet
Proposed by Michael Zanetti
Status: Merged
Approved by: Michael Zanetti
Approved revision: no longer in the source branch.
Merged at revision: 558
Proposed branch: lp:~mzanetti/unity/phablet-copyright-headers
Merge into: lp:unity/phablet
Diff against target: 191 lines (+128/-0)
8 files modified
Bottombar/Bottombar.qml (+16/-0)
Bottombar/HudButton.qml (+16/-0)
Components/ApplicationImageFake.qml (+16/-0)
Components/ApplicationImageWrapper.qml (+16/-0)
Components/ResponsiveFlowView.qml (+16/-0)
Dash/Video/VideoInfo.qml (+16/-0)
VolumeControl.qml (+16/-0)
tests/qmluitests/Components/tst_Stage/FakeApplicationScreenshot.qml (+16/-0)
To merge this branch: bzr merge lp:~mzanetti/unity/phablet-copyright-headers
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Albert Astals Cid (community) Approve
Review via email: mp+157858@code.launchpad.net

Commit message

added missing copyright headers

To post a comment you must log in.
Revision history for this message
Albert Astals Cid (aacid) wrote :

Looks good

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:558
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/368/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/369
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/369/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/368
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/244
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/244/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/777

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/368/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/144/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/96/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/144
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/144/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-autolanding/144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/78
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/78/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/779

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
Approved revid is not set in launchpad (maybe a permission problem?).
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/146/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/146
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/146/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-autolanding/146
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/80
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/80/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/782

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Bottombar/Bottombar.qml'
2--- Bottombar/Bottombar.qml 2013-02-28 12:42:00 +0000
3+++ Bottombar/Bottombar.qml 2013-04-09 12:32:22 +0000
4@@ -1,3 +1,19 @@
5+/*
6+ * Copyright (C) 2013 Canonical, Ltd.
7+ *
8+ * This program is free software; you can redistribute it and/or modify
9+ * it under the terms of the GNU General Public License as published by
10+ * the Free Software Foundation; version 3.
11+ *
12+ * This program is distributed in the hope that it will be useful,
13+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
14+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+ * GNU General Public License for more details.
16+ *
17+ * You should have received a copy of the GNU General Public License
18+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
19+ */
20+
21 import QtQuick 2.0
22 import "../Components"
23 import "../Components/Math.js" as MathLocal
24
25=== modified file 'Bottombar/HudButton.qml'
26--- Bottombar/HudButton.qml 2013-02-18 15:36:17 +0000
27+++ Bottombar/HudButton.qml 2013-04-09 12:32:22 +0000
28@@ -1,3 +1,19 @@
29+/*
30+ * Copyright (C) 2013 Canonical, Ltd.
31+ *
32+ * This program is free software; you can redistribute it and/or modify
33+ * it under the terms of the GNU General Public License as published by
34+ * the Free Software Foundation; version 3.
35+ *
36+ * This program is distributed in the hope that it will be useful,
37+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
38+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
39+ * GNU General Public License for more details.
40+ *
41+ * You should have received a copy of the GNU General Public License
42+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
43+ */
44+
45 import QtQuick 2.0
46 import Ubuntu.Components 0.1
47
48
49=== modified file 'Components/ApplicationImageFake.qml'
50--- Components/ApplicationImageFake.qml 2013-02-23 16:09:58 +0000
51+++ Components/ApplicationImageFake.qml 2013-04-09 12:32:22 +0000
52@@ -1,3 +1,19 @@
53+/*
54+ * Copyright (C) 2013 Canonical, Ltd.
55+ *
56+ * This program is free software; you can redistribute it and/or modify
57+ * it under the terms of the GNU General Public License as published by
58+ * the Free Software Foundation; version 3.
59+ *
60+ * This program is distributed in the hope that it will be useful,
61+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
62+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
63+ * GNU General Public License for more details.
64+ *
65+ * You should have received a copy of the GNU General Public License
66+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
67+ */
68+
69 import QtQuick 2.0
70
71 Item {
72
73=== modified file 'Components/ApplicationImageWrapper.qml'
74--- Components/ApplicationImageWrapper.qml 2013-01-23 23:38:35 +0000
75+++ Components/ApplicationImageWrapper.qml 2013-04-09 12:32:22 +0000
76@@ -1,3 +1,19 @@
77+/*
78+ * Copyright (C) 2013 Canonical, Ltd.
79+ *
80+ * This program is free software; you can redistribute it and/or modify
81+ * it under the terms of the GNU General Public License as published by
82+ * the Free Software Foundation; version 3.
83+ *
84+ * This program is distributed in the hope that it will be useful,
85+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
86+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
87+ * GNU General Public License for more details.
88+ *
89+ * You should have received a copy of the GNU General Public License
90+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
91+ */
92+
93 import QtQuick 2.0
94 import Ubuntu.Application 0.1
95
96
97=== modified file 'Components/ResponsiveFlowView.qml'
98--- Components/ResponsiveFlowView.qml 2013-02-12 03:01:41 +0000
99+++ Components/ResponsiveFlowView.qml 2013-04-09 12:32:22 +0000
100@@ -1,3 +1,19 @@
101+/*
102+ * Copyright (C) 2013 Canonical, Ltd.
103+ *
104+ * This program is free software; you can redistribute it and/or modify
105+ * it under the terms of the GNU General Public License as published by
106+ * the Free Software Foundation; version 3.
107+ *
108+ * This program is distributed in the hope that it will be useful,
109+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
110+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
111+ * GNU General Public License for more details.
112+ *
113+ * You should have received a copy of the GNU General Public License
114+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
115+ */
116+
117 import QtQuick 2.0
118 import Ubuntu.Components 0.1
119
120
121=== modified file 'Dash/Video/VideoInfo.qml'
122--- Dash/Video/VideoInfo.qml 2013-02-11 17:33:18 +0000
123+++ Dash/Video/VideoInfo.qml 2013-04-09 12:32:22 +0000
124@@ -1,3 +1,19 @@
125+/*
126+ * Copyright (C) 2013 Canonical, Ltd.
127+ *
128+ * This program is free software; you can redistribute it and/or modify
129+ * it under the terms of the GNU General Public License as published by
130+ * the Free Software Foundation; version 3.
131+ *
132+ * This program is distributed in the hope that it will be useful,
133+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
134+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
135+ * GNU General Public License for more details.
136+ *
137+ * You should have received a copy of the GNU General Public License
138+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
139+ */
140+
141 import QtQuick 2.0
142 import QtQuick.XmlListModel 2.0
143
144
145=== modified file 'VolumeControl.qml'
146--- VolumeControl.qml 2013-02-15 22:55:58 +0000
147+++ VolumeControl.qml 2013-04-09 12:32:22 +0000
148@@ -1,3 +1,19 @@
149+/*
150+ * Copyright (C) 2013 Canonical, Ltd.
151+ *
152+ * This program is free software; you can redistribute it and/or modify
153+ * it under the terms of the GNU General Public License as published by
154+ * the Free Software Foundation; version 3.
155+ *
156+ * This program is distributed in the hope that it will be useful,
157+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
158+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
159+ * GNU General Public License for more details.
160+ *
161+ * You should have received a copy of the GNU General Public License
162+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
163+ */
164+
165 import QtQuick 2.0
166 import QMenuModel 0.1
167
168
169=== modified file 'tests/qmluitests/Components/tst_Stage/FakeApplicationScreenshot.qml'
170--- tests/qmluitests/Components/tst_Stage/FakeApplicationScreenshot.qml 2013-04-02 21:34:08 +0000
171+++ tests/qmluitests/Components/tst_Stage/FakeApplicationScreenshot.qml 2013-04-09 12:32:22 +0000
172@@ -1,3 +1,19 @@
173+/*
174+ * Copyright (C) 2013 Canonical, Ltd.
175+ *
176+ * This program is free software; you can redistribute it and/or modify
177+ * it under the terms of the GNU General Public License as published by
178+ * the Free Software Foundation; version 3.
179+ *
180+ * This program is distributed in the hope that it will be useful,
181+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
182+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
183+ * GNU General Public License for more details.
184+ *
185+ * You should have received a copy of the GNU General Public License
186+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
187+ */
188+
189 import QtQuick 2.0
190
191 Item {

Subscribers

People subscribed via source and target branches