Merge ~aluria/charm-prometheus-blackbox-exporter:copyright-charmproof into charm-prometheus-blackbox-exporter:master

Proposed by Alvaro Uria
Status: Merged
Approved by: Xav Paice
Approved revision: b79f428fad84e1080ef70f8755e1aa09b1d7a693
Merged at revision: b79f428fad84e1080ef70f8755e1aa09b1d7a693
Proposed branch: ~aluria/charm-prometheus-blackbox-exporter:copyright-charmproof
Merge into: charm-prometheus-blackbox-exporter:master
Diff against target: 52 lines (+16/-17)
2 files modified
Makefile (+2/-2)
src/copyright (+14/-15)
Reviewer Review Type Date Requested Status
Xav Paice (community) Approve
Review via email: mp+389268@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Xav Paice (xavpaice) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index 214579c..a3b073d 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 # @cd src && tox -e unit
17diff --git a/src/copyright b/src/copyright
18index 8dddbf0..de0dca7 100644
19--- a/src/copyright
20+++ b/src/copyright
21@@ -1,17 +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 2012-2018, Canonical Ltd., All Rights Reserved.
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 as published by
30- the Free Software Foundation, either version 3 of the License, or
31- (at your option) any later version.
32- .
33- This program is distributed in the hope that it will be useful,
34- but WITHOUT ANY WARRANTY; without even the implied warranty of
35- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
36- GNU General Public License for more details.
37- .
38- You should have received a copy of the GNU General Public License
39- along with this program. If not, see <http://www.gnu.org/licenses/>.
40+Copyright: 2012-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

to all changes: