Merge lp:~nik90/ubuntu-clock-app/add-copyright into lp:ubuntu-clock-app/saucy

Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 36
Merged at revision: 22
Proposed branch: lp:~nik90/ubuntu-clock-app/add-copyright
Merge into: lp:ubuntu-clock-app/saucy
Diff against target: 554 lines (+339/-18)
22 files modified
README (+1/-1)
alarm/AlarmPage.qml (+18/-0)
clock/ClockPage.qml (+20/-0)
common/AnalogClockFace.qml (+20/-0)
common/AnalogClockHand.qml (+20/-0)
common/AnalogClockMarker.qml (+19/-0)
common/AnalogFaceBase.qml (+19/-0)
common/AnalogGlowEffect.qml (+19/-0)
common/AnalogHand.qml (+18/-0)
common/ClockUtils.js (+19/-0)
common/Constants.js (+20/-0)
common/Storage.qml (+18/-0)
debian/compat (+1/-1)
debian/control (+8/-6)
debian/copyright (+5/-5)
debian/rules (+0/-5)
stopwatch/StopwatchPage.qml (+18/-0)
stopwatch/StopwatchScript.js (+18/-0)
timer/TimerPage.qml (+19/-0)
timer/TimerScript.js (+19/-0)
timer/TimerStorage.qml (+18/-0)
ubuntu-clock-app.qml (+22/-0)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/add-copyright
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nick Leppänen Larsson Pending
Juha Ristolainen Pending
Ubuntu Clock Developers Pending
Review via email: mp+157167@code.launchpad.net

Commit message

Description of the change

This MP accomplishes the following,

1. Add copyright info to every .qml, .js file in the project.
2. Updates debian control, compact, format and rules file.
3. Updated README file
4. Removed debian docs file

All changes are trivial and should not cause any regression.

To post a comment you must log in.
30. By Nekhelesh Ramananthan

Merge with trunk

31. By Nekhelesh Ramananthan

Small fix

32. By Nekhelesh Ramananthan

Reverting previous commit

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

missing "qtdeclarative5-localstorage-plugin" in the dependency list.

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

is not mandatory but I would suggest to put a "," in the last line in the dependency list this will avoid changes in this line in the future.

313 qtdeclarative5-qtquick2-plugin

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

any special reason fo the files inside of debian dir have a different version??

333 Files: debian/*
334 Copyright: 2013 Canonical Ltd.
335 -License: LGPL-3.0
336 +License: LGPL-3

33. By Nekhelesh Ramananthan

Added missing local storage dependency

34. By Nekhelesh Ramananthan

Small fix

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Renato, that is the format used in other core apps, hence I did not want to change it unnecessarily.

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

I think that would be nice add the authors sections in the headers license, then you can put your names.

OBS: is not mandatory

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Yeah I was planning to do that. However the format used in the Authors section is "Name <email address>". I know who worked on what, but wasnt sure of their email addresses. I could add the Authors section after getting that info.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
35. By Nekhelesh Ramananthan

Added authors to license headers

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Added the authors as requested :)

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
36. By Nekhelesh Ramananthan

Revert changes to debian/format. This can be done in an additional commit since it requires .bzr-builddeb along with this.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2013-02-12 16:18:48 +0000
3+++ README 2013-04-09 09:52:19 +0000
4@@ -1,1 +1,1 @@
5-this is an example README file.
6+Ubuntu Clock Application provides Timer, Stopwatch, Alarm and Clock functionality for the Ubuntu project.
7
8=== modified file 'alarm/AlarmPage.qml'
9--- alarm/AlarmPage.qml 2013-03-14 17:29:50 +0000
10+++ alarm/AlarmPage.qml 2013-04-09 09:52:19 +0000
11@@ -1,3 +1,21 @@
12+/*
13+ * Copyright (C) 2013 Canonical Ltd
14+ *
15+ * This program is free software: you can redistribute it and/or modify
16+ * it under the terms of the GNU General Public License version 3 as
17+ * published by the Free Software Foundation.
18+ *
19+ * This program is distributed in the hope that it will be useful,
20+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
21+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22+ * GNU General Public License for more details.
23+ *
24+ * You should have received a copy of the GNU General Public License
25+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
26+ *
27+ * Authored by: Juha Ristolainen <juha.ristolainen@codemancers.fi>
28+ */
29+
30 import QtQuick 2.0
31 import Ubuntu.Components 0.1
32 import Ubuntu.Components.ListItems 0.1
33
34=== modified file 'clock/ClockPage.qml'
35--- clock/ClockPage.qml 2013-03-14 17:29:50 +0000
36+++ clock/ClockPage.qml 2013-04-09 09:52:19 +0000
37@@ -1,3 +1,23 @@
38+/*
39+ * Copyright (C) 2013 Canonical Ltd
40+ *
41+ * This program is free software: you can redistribute it and/or modify
42+ * it under the terms of the GNU General Public License version 3 as
43+ * published by the Free Software Foundation.
44+ *
45+ * This program is distributed in the hope that it will be useful,
46+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
47+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
48+ * GNU General Public License for more details.
49+ *
50+ * You should have received a copy of the GNU General Public License
51+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
52+ *
53+ * Authored by: Juha Ristolainen <juha.ristolainen@codemancers.fi>
54+ * Nekhelesh Ramananthan <krnekhelesh@gmail.com>
55+ * Nick Leppänen Larsson <frals@frals.se>
56+ */
57+
58 import QtQuick 2.0
59 import Ubuntu.Components 0.1
60 import "../common/ClockUtils.js" as Utils
61
62=== modified file 'common/AnalogClockFace.qml'
63--- common/AnalogClockFace.qml 2013-03-19 19:41:11 +0000
64+++ common/AnalogClockFace.qml 2013-04-09 09:52:19 +0000
65@@ -1,3 +1,23 @@
66+/*
67+ * Copyright (C) 2013 Canonical Ltd
68+ *
69+ * This program is free software: you can redistribute it and/or modify
70+ * it under the terms of the GNU General Public License version 3 as
71+ * published by the Free Software Foundation.
72+ *
73+ * This program is distributed in the hope that it will be useful,
74+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
75+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
76+ * GNU General Public License for more details.
77+ *
78+ * You should have received a copy of the GNU General Public License
79+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
80+ *
81+ * Authored by: Juha Ristolainen <juha.ristolainen@codemancers.fi>
82+ * Nekhelesh Ramananthan <krnekhelesh@gmail.com>
83+ * Nick Leppänen Larsson <frals@frals.se>
84+ */
85+
86 import QtQuick 2.0
87 import Ubuntu.Components 0.1
88
89
90=== modified file 'common/AnalogClockHand.qml'
91--- common/AnalogClockHand.qml 2013-03-18 18:51:11 +0000
92+++ common/AnalogClockHand.qml 2013-04-09 09:52:19 +0000
93@@ -1,3 +1,23 @@
94+/*
95+ * Copyright (C) 2013 Canonical Ltd
96+ *
97+ * This program is free software: you can redistribute it and/or modify
98+ * it under the terms of the GNU General Public License version 3 as
99+ * published by the Free Software Foundation.
100+ *
101+ * This program is distributed in the hope that it will be useful,
102+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
103+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
104+ * GNU General Public License for more details.
105+ *
106+ * You should have received a copy of the GNU General Public License
107+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
108+ *
109+ * Authored by: Juha Ristolainen <juha.ristolainen@codemancers.fi>
110+ * Nekhelesh Ramananthan <krnekhelesh@gmail.com>
111+ * Nick Leppänen Larsson <frals@frals.se>
112+ */
113+
114 import QtQuick 2.0
115 import "Constants.js" as Constants
116
117
118=== modified file 'common/AnalogClockMarker.qml'
119--- common/AnalogClockMarker.qml 2013-03-19 21:34:43 +0000
120+++ common/AnalogClockMarker.qml 2013-04-09 09:52:19 +0000
121@@ -1,3 +1,22 @@
122+/*
123+ * Copyright (C) 2013 Canonical Ltd
124+ *
125+ * This program is free software: you can redistribute it and/or modify
126+ * it under the terms of the GNU General Public License version 3 as
127+ * published by the Free Software Foundation.
128+ *
129+ * This program is distributed in the hope that it will be useful,
130+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
131+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
132+ * GNU General Public License for more details.
133+ *
134+ * You should have received a copy of the GNU General Public License
135+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
136+ *
137+ * Authored by: Nekhelesh Ramananthan <krnekhelesh@gmail.com>
138+ * Marco Biscaro <marcobiscaro2112@gmail.com>
139+ */
140+
141 import QtQuick 2.0
142 import Ubuntu.Components 0.1
143 import "Constants.js" as Constants
144
145=== modified file 'common/AnalogFaceBase.qml'
146--- common/AnalogFaceBase.qml 2013-04-03 14:57:09 +0000
147+++ common/AnalogFaceBase.qml 2013-04-09 09:52:19 +0000
148@@ -1,3 +1,22 @@
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 version 3 as
154+ * published by the Free Software Foundation.
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+ * Authored by: Juha Ristolainen <juha.ristolainen@codemancers.fi>
165+ * Nick Leppänen Larsson <frals@frals.se>
166+ */
167+
168 import QtQuick 2.0
169 import Ubuntu.Components 0.1
170 import "../common/Constants.js" as Constants
171
172=== modified file 'common/AnalogGlowEffect.qml'
173--- common/AnalogGlowEffect.qml 2013-04-03 14:57:09 +0000
174+++ common/AnalogGlowEffect.qml 2013-04-09 09:52:19 +0000
175@@ -1,3 +1,22 @@
176+/*
177+ * Copyright (C) 2013 Canonical Ltd
178+ *
179+ * This program is free software: you can redistribute it and/or modify
180+ * it under the terms of the GNU General Public License version 3 as
181+ * published by the Free Software Foundation.
182+ *
183+ * This program is distributed in the hope that it will be useful,
184+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
185+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
186+ * GNU General Public License for more details.
187+ *
188+ * You should have received a copy of the GNU General Public License
189+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
190+ *
191+ * Authored by: Juha Ristolainen <juha.ristolainen@codemancers.fi>
192+ * Nick Leppänen Larsson <frals@frals.se>
193+ */
194+
195 import QtQuick 2.0
196 import QtGraphicalEffects 1.0
197 import "Constants.js" as Constants
198
199=== modified file 'common/AnalogHand.qml'
200--- common/AnalogHand.qml 2013-04-03 11:38:01 +0000
201+++ common/AnalogHand.qml 2013-04-09 09:52:19 +0000
202@@ -1,3 +1,21 @@
203+/*
204+ * Copyright (C) 2013 Canonical Ltd
205+ *
206+ * This program is free software: you can redistribute it and/or modify
207+ * it under the terms of the GNU General Public License version 3 as
208+ * published by the Free Software Foundation.
209+ *
210+ * This program is distributed in the hope that it will be useful,
211+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
212+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
213+ * GNU General Public License for more details.
214+ *
215+ * You should have received a copy of the GNU General Public License
216+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
217+ *
218+ * Authored by: Alessandro Pozzi <signor.hyde@gmail.com>
219+ */
220+
221 import QtQuick 2.0
222 import "../common/Constants.js" as Constants
223
224
225=== modified file 'common/ClockUtils.js'
226--- common/ClockUtils.js 2013-03-26 00:50:54 +0000
227+++ common/ClockUtils.js 2013-04-09 09:52:19 +0000
228@@ -1,3 +1,22 @@
229+/*
230+ * Copyright (C) 2013 Canonical Ltd
231+ *
232+ * This program is free software: you can redistribute it and/or modify
233+ * it under the terms of the GNU General Public License version 3 as
234+ * published by the Free Software Foundation.
235+ *
236+ * This program is distributed in the hope that it will be useful,
237+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
238+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
239+ * GNU General Public License for more details.
240+ *
241+ * You should have received a copy of the GNU General Public License
242+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
243+ *
244+ * Authored by: Juha Ristolainen <juha.ristolainen@codemancers.fi>
245+ * Alessandro Pozzi <signor.hyde@gmail.com>
246+ */
247+
248 .pragma library
249
250 var LOG_PREFIX = "[CLOCK]";
251
252=== modified file 'common/Constants.js'
253--- common/Constants.js 2013-03-23 17:26:52 +0000
254+++ common/Constants.js 2013-04-09 09:52:19 +0000
255@@ -1,3 +1,23 @@
256+/*
257+ * Copyright (C) 2013 Canonical Ltd
258+ *
259+ * This program is free software: you can redistribute it and/or modify
260+ * it under the terms of the GNU General Public License version 3 as
261+ * published by the Free Software Foundation.
262+ *
263+ * This program is distributed in the hope that it will be useful,
264+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
265+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
266+ * GNU General Public License for more details.
267+ *
268+ * You should have received a copy of the GNU General Public License
269+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
270+ *
271+ * Authored by: Juha Ristolainen <juha.ristolainen@codemancers.fi>
272+ * Nekhelesh Ramananthan <krnekhelesh@gmail.com>
273+ * Alessandro Pozzi <signor.hyde@gmail.com>
274+ */
275+
276 .pragma library
277
278 // Settings keys stored in the local storage
279
280=== modified file 'common/Storage.qml'
281--- common/Storage.qml 2013-03-16 13:16:09 +0000
282+++ common/Storage.qml 2013-04-09 09:52:19 +0000
283@@ -1,3 +1,21 @@
284+/*
285+ * Copyright (C) 2013 Canonical Ltd
286+ *
287+ * This program is free software: you can redistribute it and/or modify
288+ * it under the terms of the GNU General Public License version 3 as
289+ * published by the Free Software Foundation.
290+ *
291+ * This program is distributed in the hope that it will be useful,
292+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
293+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
294+ * GNU General Public License for more details.
295+ *
296+ * You should have received a copy of the GNU General Public License
297+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
298+ *
299+ * Authored by: Juha Ristolainen <juha.ristolainen@codemancers.fi>
300+ */
301+
302 import QtQuick 2.0
303 import QtQuick.LocalStorage 2.0
304 import "../common/ClockUtils.js" as Utils
305
306=== modified file 'debian/compat'
307--- debian/compat 2013-02-12 16:18:48 +0000
308+++ debian/compat 2013-04-09 09:52:19 +0000
309@@ -1,1 +1,1 @@
310-8
311+9
312
313=== modified file 'debian/control'
314--- debian/control 2013-04-03 19:26:55 +0000
315+++ debian/control 2013-04-09 09:52:19 +0000
316@@ -1,18 +1,20 @@
317 Source: ubuntu-clock-app
318 Priority: extra
319-Maintainer: Ugo Riboni <ugo.riboni@canonical.com>
320-Build-Depends: debhelper (>= 8.0.0),
321-Standards-Version: 3.9.3
322+Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>
323+Build-Depends: debhelper (>= 9),
324+Standards-Version: 3.9.4
325 Section: misc
326 Homepage: https://launchpad.net/ubuntu-clock-app
327+Vcs-Bzr: https://code.launchpad.net/~ubuntu-clock-dev/ubuntu-clock-app/trunk
328
329 Package: ubuntu-clock-app
330 Section: misc
331 Architecture: all
332 Depends: ${shlibs:Depends}, ${misc:Depends},
333 qmlscene,
334- qt-components-ubuntu,
335- qtdeclarative5-qtquick2-plugin
336+ qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
337+ qtdeclarative5-localstorage-plugin,
338+ qtdeclarative5-qtquick2-plugin,
339 Description: Clock application
340- Core Clock application
341+ Ubuntu Core Clock application which provides Stopwatch, Timer, Alarm and Clock functionalities.
342
343
344=== modified file 'debian/copyright'
345--- debian/copyright 2013-02-12 16:28:01 +0000
346+++ debian/copyright 2013-04-09 09:52:19 +0000
347@@ -1,16 +1,16 @@
348-Format: http://dep.debian.net/deps/dep5
349+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
350 Upstream-Name: ubuntu-clock-app
351 Source:
352
353 Files: *
354 Copyright: 2013 Canonical Ltd.
355-License: GPL-3.0
356+License: GPL-3
357
358 Files: debian/*
359 Copyright: 2013 Canonical Ltd.
360-License: LGPL-3.0
361+License: LGPL-3
362
363-License: GPL-3.0
364+License: GPL-3
365 This package is free software; you can redistribute it and/or
366 modify it under the terms of the GNU General Public
367 License as published by the Free Software Foundation; either
368@@ -27,7 +27,7 @@
369 On Debian systems, the complete text of the GNU General
370 Public License can be found in "/usr/share/common-licenses/GPL-3".
371
372-License: LGPL-3.0
373+License: LGPL-3
374 This package is free software; you can redistribute it and/or
375 modify it under the terms of the GNU Lesser General Public
376 License as published by the Free Software Foundation; either
377
378=== removed file 'debian/docs'
379=== modified file 'debian/rules'
380--- debian/rules 2013-03-14 20:35:28 +0000
381+++ debian/rules 2013-04-09 09:52:19 +0000
382@@ -1,10 +1,5 @@
383 #!/usr/bin/make -f
384 # -*- makefile -*-
385-# Sample debian/rules that uses debhelper.
386-# This file was originally written by Joey Hess and Craig Small.
387-# As a special exception, when this file is copied by dh-make into a
388-# dh-make output file, you may use that output file without restriction.
389-# This special exception was added by Craig Small in version 0.37 of dh-make.
390
391 # Uncomment this to turn on verbose mode.
392 #export DH_VERBOSE=1
393
394=== modified file 'stopwatch/StopwatchPage.qml'
395--- stopwatch/StopwatchPage.qml 2013-03-30 14:53:18 +0000
396+++ stopwatch/StopwatchPage.qml 2013-04-09 09:52:19 +0000
397@@ -1,3 +1,21 @@
398+/*
399+ * Copyright (C) 2013 Canonical Ltd
400+ *
401+ * This program is free software: you can redistribute it and/or modify
402+ * it under the terms of the GNU General Public License version 3 as
403+ * published by the Free Software Foundation.
404+ *
405+ * This program is distributed in the hope that it will be useful,
406+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
407+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
408+ * GNU General Public License for more details.
409+ *
410+ * You should have received a copy of the GNU General Public License
411+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
412+ *
413+ * Authored by: Alessandro Pozzi <signor.hyde@gmail.com>
414+ */
415+
416 import QtQuick 2.0
417 import Ubuntu.Components 0.1
418 import Ubuntu.Components.Popups 0.1
419
420=== modified file 'stopwatch/StopwatchScript.js'
421--- stopwatch/StopwatchScript.js 2013-03-29 23:52:37 +0000
422+++ stopwatch/StopwatchScript.js 2013-04-09 09:52:19 +0000
423@@ -1,3 +1,21 @@
424+/*
425+ * Copyright (C) 2013 Canonical Ltd
426+ *
427+ * This program is free software: you can redistribute it and/or modify
428+ * it under the terms of the GNU General Public License version 3 as
429+ * published by the Free Software Foundation.
430+ *
431+ * This program is distributed in the hope that it will be useful,
432+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
433+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
434+ * GNU General Public License for more details.
435+ *
436+ * You should have received a copy of the GNU General Public License
437+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
438+ *
439+ * Authored by: Alessandro Pozzi <signor.hyde@gmail.com>
440+ */
441+
442 Qt.include("../common/ClockUtils.js")
443
444 var hours = 0;
445
446=== modified file 'timer/TimerPage.qml'
447--- timer/TimerPage.qml 2013-04-03 11:38:01 +0000
448+++ timer/TimerPage.qml 2013-04-09 09:52:19 +0000
449@@ -1,3 +1,22 @@
450+/*
451+ * Copyright (C) 2013 Canonical Ltd
452+ *
453+ * This program is free software: you can redistribute it and/or modify
454+ * it under the terms of the GNU General Public License version 3 as
455+ * published by the Free Software Foundation.
456+ *
457+ * This program is distributed in the hope that it will be useful,
458+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
459+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
460+ * GNU General Public License for more details.
461+ *
462+ * You should have received a copy of the GNU General Public License
463+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
464+ *
465+ * Authored by: Alessandro Pozzi <signor.hyde@gmail.com>
466+ * Nekhelesh Ramananthan <krnekhelesh@gmail.com>
467+ */
468+
469 import QtQuick 2.0
470 import Ubuntu.Components 0.1
471 import Ubuntu.Components.Popups 0.1
472
473=== modified file 'timer/TimerScript.js'
474--- timer/TimerScript.js 2013-04-03 11:38:01 +0000
475+++ timer/TimerScript.js 2013-04-09 09:52:19 +0000
476@@ -1,3 +1,22 @@
477+/*
478+ * Copyright (C) 2013 Canonical Ltd
479+ *
480+ * This program is free software: you can redistribute it and/or modify
481+ * it under the terms of the GNU General Public License version 3 as
482+ * published by the Free Software Foundation.
483+ *
484+ * This program is distributed in the hope that it will be useful,
485+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
486+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
487+ * GNU General Public License for more details.
488+ *
489+ * You should have received a copy of the GNU General Public License
490+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
491+ *
492+ * Authored by: Alessandro Pozzi <signor.hyde@gmail.com>
493+ * Nekhelesh Ramananthan <krnekhelesh@gmail.com>
494+ */
495+
496 Qt.include("../common/ClockUtils.js")
497
498 function setlabelTimer(sec) {
499
500=== modified file 'timer/TimerStorage.qml'
501--- timer/TimerStorage.qml 2013-04-03 11:38:01 +0000
502+++ timer/TimerStorage.qml 2013-04-09 09:52:19 +0000
503@@ -1,3 +1,21 @@
504+/*
505+ * Copyright (C) 2013 Canonical Ltd
506+ *
507+ * This program is free software: you can redistribute it and/or modify
508+ * it under the terms of the GNU General Public License version 3 as
509+ * published by the Free Software Foundation.
510+ *
511+ * This program is distributed in the hope that it will be useful,
512+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
513+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
514+ * GNU General Public License for more details.
515+ *
516+ * You should have received a copy of the GNU General Public License
517+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
518+ *
519+ * Authored by: Alessandro Pozzi <signor.hyde@gmail.com>
520+ */
521+
522 import QtQuick 2.0
523 import QtQuick.LocalStorage 2.0
524 import "../common/ClockUtils.js" as Utils
525
526=== modified file 'ubuntu-clock-app.qml'
527--- ubuntu-clock-app.qml 2013-03-16 19:44:40 +0000
528+++ ubuntu-clock-app.qml 2013-04-09 09:52:19 +0000
529@@ -1,3 +1,25 @@
530+/*
531+ * Copyright (C) 2013 Canonical Ltd
532+ *
533+ * This program is free software: you can redistribute it and/or modify
534+ * it under the terms of the GNU General Public License version 3 as
535+ * published by the Free Software Foundation.
536+ *
537+ * This program is distributed in the hope that it will be useful,
538+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
539+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
540+ * GNU General Public License for more details.
541+ *
542+ * You should have received a copy of the GNU General Public License
543+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
544+ *
545+ * Authored by: Juha Ristolainen <juha.ristolainen@codemancers.fi>
546+ * Nekhelesh Ramananthan <krnekhelesh@gmail.com>
547+ * Nick Leppänen Larsson <frals@frals.se>
548+ * Marco Biscaro <marcobiscaro2112@gmail.com>
549+ * Alessandro Pozzi <signor.hyde@gmail.com>
550+ */
551+
552 import QtQuick 2.0
553 import Ubuntu.Components 0.1
554 import "common/ClockUtils.js" as Utils

Subscribers

People subscribed via source and target branches