Merge lp:~didrocks/xpathselect/copyright into lp:xpathselect

Proposed by Didier Roche on 2012-11-29
Status: Merged
Approved by: Didier Roche on 2012-11-29
Approved revision: 25
Merged at revision: 24
Proposed branch: lp:~didrocks/xpathselect/copyright
Merge into: lp:xpathselect
Diff against target: 34 lines (+1/-19)
1 file modified
debian/copyright (+1/-19)
To merge this branch: bzr merge lp:~didrocks/xpathselect/copyright
Reviewer Review Type Date Requested Status
Martin Mrazik (community) 2012-11-29 Approve on 2012-11-29
PS Jenkins bot continuous-integration Pending
Review via email: mp+136883@code.launchpad.net

Commit Message

Use only one coherent copyright

Description of the Change

Use only one copyright

To post a comment you must log in.
Martin Mrazik (mrazik) wrote :

Makes sense, looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/copyright'
2--- debian/copyright 2012-08-09 00:48:44 +0000
3+++ debian/copyright 2012-11-29 10:00:28 +0000
4@@ -8,30 +8,12 @@
5 This program is free software: you can redistribute it and/or modify
6 it under the terms of the GNU General Public License version 3 as
7 published by the Free Software Foundation.
8- This program is distributed in the hope that it will be useful,
9- but WITHOUT ANY WARRANTY; without even the implied warranty of
10- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11- GNU General Public License for more details.
12- You should have received a copy of the GNU General Public License
13- along with this program. If not, see <http://www.gnu.org/licenses/>.
14- .
15-
16-Files: debian/*
17-Copyright: 2012 Thomi Richards <thomi.richards@canonical.com>
18-License: GPL-2+
19- This package is free software; you can redistribute it and/or modify
20- it under the terms of the GNU General Public License as published by
21- the Free Software Foundation; either version 2 of the License, or
22- (at your option) any later version.
23 .
24 This package is distributed in the hope that it will be useful,
25 but WITHOUT ANY WARRANTY; without even the implied warranty of
26 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27 GNU General Public License for more details.
28 .
29- You should have received a copy of the GNU General Public License
30- along with this program. If not, see <http://www.gnu.org/licenses/>
31- .
32 On Debian systems, the complete text of the GNU General
33- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
34+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
35

Subscribers

People subscribed via source and target branches