Merge ~aluria/charm-juju-controller:copyright-charmproof into charm-juju-controller:master

Proposed by Alvaro Uria
Status: Merged
Approved by: Giuseppe Petralia
Approved revision: a87c27009274e79290793a1c2928d233e4d7eb68
Merged at revision: e9121e440e39d4311b82985a6558c306546ef6fc
Proposed branch: ~aluria/charm-juju-controller:copyright-charmproof
Merge into: charm-juju-controller:master
Diff against target: 52 lines (+16/-16)
2 files modified
Makefile (+2/-2)
src/copyright (+14/-14)
Reviewer Review Type Date Requested Status
Giuseppe Petralia Approve
Xav Paice Approve
Review via email: mp+389278@code.launchpad.net

Commit message

Update license, charm proof built code

To post a comment you must log in.

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Xav Paice (xavpaice) wrote :

LGTM

review: Approve
Giuseppe Petralia (peppepetra) wrote :

lgtm

review: Approve

Change successfully merged at revision e9121e440e39d4311b82985a6558c306546ef6fc

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index fd2bbe7..0a84b5f 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -61,9 +61,9 @@ black:
6 @echo "Reformat files with black"
7 @cd src && tox -e black
8
9-proof:
10+proof: build
11 @echo "Running charm proof"
12- @charm proof src
13+ @charm proof ${CHARM_BUILD_DIR}/${CHARM_NAME}
14
15 unittests:
16 @echo "Running unit tests"
17diff --git a/src/copyright b/src/copyright
18index d26af19..ff6b476 100644
19--- a/src/copyright
20+++ b/src/copyright
21@@ -1,16 +1,16 @@
22-Format: http://dep.debian.net/deps/dep5/
23+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
24
25 Files: *
26-Copyright: Copyright 2020, Canonical Ltd.
27-License: GPL-3
28- This program is free software: you can redistribute it and/or modify
29- it under the terms of the GNU General Public License version 3, as
30- published by the Free Software Foundation.
31- .
32- This program is distributed in the hope that it will be useful,
33- but WITHOUT ANY WARRANTY; without even the implied warranties of
34- MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
35- PURPOSE. See the GNU General Public License for more details.
36- .
37- You should have received a copy of the GNU General Public License
38- along with this program. If not, see <http://www.gnu.org/licenses/>.
39\ No newline at end of file
40+Copyright: 2020, Canonical Ltd.
41+License: Apache-2.0
42+ Licensed under the Apache License, Version 2.0 (the "License"); you may
43+ not use this file except in compliance with the License. You may obtain
44+ a copy of the License at
45+
46+ http://www.apache.org/licenses/LICENSE-2.0
47+
48+ Unless required by applicable law or agreed to in writing, software
49+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
50+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
51+ License for the specific language governing permissions and limitations
52+ under the License.

Subscribers

People subscribed via source and target branches