Merge lp:~nik90/ubuntu-clock-app/revert-copyright-header-change into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Reverted copyright header changes done in Stopwatch LapHistory Plugin borrowed from Michael Zanetti's stopwatch app.

Reverted copyright header changes done in Stopwatch LapHistory Plugin borrowed from Michael Zanetti's stopwatch app.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:357
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/804/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/149

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/804/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

Hi, not that I'd have big problems with you reusing my code (I find it quite awesome actually) but in order to be *correct* with licensing it is probably better to fix this indeed. So thanks for that.

Some comments:

* I think the "This file is part of ..." can be dropped. The important parts to be kept are really the copyright holders names and the main license text.
* Given you guys added changes, you can add your name (or Canonical, depending on what you agreed) to the list of copyright holders too.
* This code is licensed under GPLv3+. Afaik, there's a policy to only use GPLv3 (without the +) in core apps. If that is correct, I can re-license it as GPLv3 for you. Let me know if that's required.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:358
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/805/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/150/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/805/rebuild

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Thanks Michael, could you please re-license under GPLv3 and we'll endeavour to prevent this happening again.

Nekhelesh, just add an additional line for any changes any individual made, and we'd be good I think.

[Nekhelesh Ramananthan (nik90)]

Thanks for pointing this out before we pushed out the clock app release. It was a bit of an oversight on my part to stupidly change the copyright header :P. I apologize for that. When Michael re-licenses under GPLv3, I will do the same here in this MP to meet the copyright requirements of the core apps.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:359
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/806/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/151

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/806/rebuild

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:360
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/807/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/152

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/807/rebuild

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

Looks ok to me now.

Code which was reused from Michael Timer, was correctly described.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/304/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-autolanding/61/console

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'app/upstreamcomponents/FastScroll.js'
--- app/upstreamcomponents/FastScroll.js	2015-08-14 05:34:49 +0000
+++ app/upstreamcomponents/FastScroll.js	2015-08-24 13:07:27 +0000
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** Copyright (C) 2014-2015 Canonical Ltda
+** Copyright (C) 2014 Canonical Ltda
 ** All rights reserved.
 ** Contact: Nokia Corporation ([e-mail])
 **

=== modified file 'app/upstreamcomponents/FastScroll.qml'
--- app/upstreamcomponents/FastScroll.qml	2015-08-14 05:34:49 +0000
+++ app/upstreamcomponents/FastScroll.qml	2015-08-24 13:07:27 +0000
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** Copyright (C) 2014-2015 Canonical Ltda
+** Copyright (C) 2014 Canonical Ltda
 ** All rights reserved.
 ** Contact: Nokia Corporation ([e-mail])
 **

=== modified file 'backend/modules/Stopwatch/LapHistory/history.cpp'
--- backend/modules/Stopwatch/LapHistory/history.cpp	2015-08-20 19:59:21 +0000
+++ backend/modules/Stopwatch/LapHistory/history.cpp	2015-08-24 13:07:27 +0000
@@ -1,20 +1,20 @@
-/*
- * Copyright (C) 2015 Canonical Ltd
- *
- * This file is part of Ubuntu Clock App
- *
- * Ubuntu Clock App is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * Ubuntu Clock App is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*****************************************************************************
+ * Copyright: 2015 Michael Zanetti <[e-mail]>                 *
+ *            2015 Bartosz Kosiorek <[e-mail]>                  *
+ *                                                                           *
+ * This prject is free software: you can redistribute it and/or modify       *
+ * it under the terms of the GNU General Public License as published by      *
+ * the Free Software Foundation, version 3 of the License.                   *
+ *                                                                           *
+ * This project is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+ * GNU General Public License for more details.                              *
+ *                                                                           *
+ * You should have received a copy of the GNU General Public License         *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
+ *                                                                           *
+ ****************************************************************************/
 
 #include "history.h"
 

=== modified file 'backend/modules/Stopwatch/LapHistory/history.h'
--- backend/modules/Stopwatch/LapHistory/history.h	2015-08-20 19:59:21 +0000
+++ backend/modules/Stopwatch/LapHistory/history.h	2015-08-24 13:07:27 +0000
@@ -1,20 +1,20 @@
-/*
- * Copyright (C) 2015 Canonical Ltd
- *
- * This file is part of Ubuntu Clock App
- *
- * Ubuntu Clock App is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * Ubuntu Clock App is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*****************************************************************************
+ * Copyright: 2015 Michael Zanetti <[e-mail]>                 *
+ *            2015 Bartosz Kosiorek <[e-mail]>                  *
+ *                                                                           *
+ * This prject is free software: you can redistribute it and/or modify       *
+ * it under the terms of the GNU General Public License as published by      *
+ * the Free Software Foundation, version 3 of the License.                   *
+ *                                                                           *
+ * This project is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
+ * GNU General Public License for more details.                              *
+ *                                                                           *
+ * You should have received a copy of the GNU General Public License         *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.     *
+ *                                                                           *
+ ****************************************************************************/
 
 #ifndef HISTORY_H
 #define HISTORY_H