overlay-scrollbar

Merge lp:~cyphermox/overlay-scrollbar/relicense into lp:overlay-scrollbar

  1. relicense
  2. Merge into trunk
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 361
Merged at revision: 360
Proposed branch: lp:~cyphermox/overlay-scrollbar/relicense
Merge into: lp:overlay-scrollbar
Diff against target: 141 lines (+11/-19)
10 files modified
debian/changelog (+1/-0)
debian/copyright (+2/-3)
os/os-animation.c (+1/-2)
os/os-bar.c (+1/-2)
os/os-log.c (+1/-2)
os/os-private.h (+1/-2)
os/os-scrollbar.c (+1/-2)
os/os-scrollbar.h (+1/-2)
os/os-thumb.c (+1/-2)
tests/test-os.c (+1/-2)
To merge this branch: bzr merge lp:~cyphermox/overlay-scrollbar/relicense
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+136188@code.launchpad.net

Description of the change

Relicensing to LGPL-2.1 only; the Canonical copyright was never LGPL-2.1+.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Excellent! Thanks :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-11-26 13:59:47 +0000
3+++ debian/changelog 2012-11-26 14:37:23 +0000
4@@ -12,6 +12,7 @@
5 - Override dh_autoreconf to call autogen.sh and not run configure.
6 - Drop override for dh_makeshlibs.
7 - Add and export DPKG_GENSYMBOLS_CHECK_LEVEL.
8+ * debian/copyright: update to properly reflect upstream copyright.
9
10 -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Fri, 23 Nov 2012 12:20:25 -0500
11
12
13=== modified file 'debian/copyright'
14--- debian/copyright 2012-09-24 14:25:40 +0000
15+++ debian/copyright 2012-11-26 14:37:23 +0000
16@@ -6,11 +6,10 @@
17
18 Files: *
19 Copyright: 2011 Canonical Ltd
20-License: LGPL-2.1+
21+License: LGPL-2.1
22 This library is free software; you can redistribute it and/or
23 modify it under the terms of the GNU Lesser General Public
24- License as published by the Free Software Foundation; either
25- version 2.1 of the License, or (at your option) any later version.
26+ License version 2.1 as published by the Free Software Foundation.
27 .
28 This library is distributed in the hope that it will be useful,
29 but WITHOUT ANY WARRANTY; without even the implied warranty of
30
31=== modified file 'os/os-animation.c'
32--- os/os-animation.c 2012-08-09 11:17:09 +0000
33+++ os/os-animation.c 2012-11-26 14:37:23 +0000
34@@ -4,8 +4,7 @@
35 *
36 * This library is free software; you can redistribute it and/or
37 * modify it under the terms of the GNU Lesser General Public
38- * License as published by the Free Software Foundation; either
39- * version 2.1 of the License, or (at your option) any later version.
40+ * License version 2.1 as published by the Free Software Foundation.
41 *
42 * This library is distributed in the hope that it will be useful,
43 * but WITHOUT ANY WARRANTY; without even the implied warranty of
44
45=== modified file 'os/os-bar.c'
46--- os/os-bar.c 2012-05-15 14:36:40 +0000
47+++ os/os-bar.c 2012-11-26 14:37:23 +0000
48@@ -4,8 +4,7 @@
49 *
50 * This library is free software; you can redistribute it and/or
51 * modify it under the terms of the GNU Lesser General Public
52- * License as published by the Free Software Foundation; either
53- * version 2.1 of the License, or (at your option) any later version.
54+ * License version 2.1 as published by the Free Software Foundation.
55 *
56 * This library is distributed in the hope that it will be useful,
57 * but WITHOUT ANY WARRANTY; without even the implied warranty of
58
59=== modified file 'os/os-log.c'
60--- os/os-log.c 2011-10-05 12:24:21 +0000
61+++ os/os-log.c 2012-11-26 14:37:23 +0000
62@@ -4,8 +4,7 @@
63 *
64 * This library is free software; you can redistribute it and/or
65 * modify it under the terms of the GNU Lesser General Public
66- * License as published by the Free Software Foundation; either
67- * version 2.1 of the License, or (at your option) any later version.
68+ * License version 2.1 as published by the Free Software Foundation.
69 *
70 * This library is distributed in the hope that it will be useful,
71 * but WITHOUT ANY WARRANTY; without even the implied warranty of
72
73=== modified file 'os/os-private.h'
74--- os/os-private.h 2012-01-18 17:30:27 +0000
75+++ os/os-private.h 2012-11-26 14:37:23 +0000
76@@ -4,8 +4,7 @@
77 *
78 * This library is free software; you can redistribute it and/or
79 * modify it under the terms of the GNU Lesser General Public
80- * License as published by the Free Software Foundation; either
81- * version 2.1 of the License, or (at your option) any later version.
82+ * License version 2.1 as published by the Free Software Foundation.
83 *
84 * This library is distributed in the hope that it will be useful,
85 * but WITHOUT ANY WARRANTY; without even the implied warranty of
86
87=== modified file 'os/os-scrollbar.c'
88--- os/os-scrollbar.c 2012-11-23 16:07:44 +0000
89+++ os/os-scrollbar.c 2012-11-26 14:37:23 +0000
90@@ -4,8 +4,7 @@
91 *
92 * This library is free software; you can redistribute it and/or
93 * modify it under the terms of the GNU Lesser General Public
94- * License as published by the Free Software Foundation; either
95- * version 2.1 of the License, or (at your option) any later version.
96+ * License version 2.1 as published by the Free Software Foundation.
97 *
98 * This library is distributed in the hope that it will be useful,
99 * but WITHOUT ANY WARRANTY; without even the implied warranty of
100
101=== modified file 'os/os-scrollbar.h'
102--- os/os-scrollbar.h 2012-05-04 21:32:56 +0000
103+++ os/os-scrollbar.h 2012-11-26 14:37:23 +0000
104@@ -4,8 +4,7 @@
105 *
106 * This library is free software; you can redistribute it and/or
107 * modify it under the terms of the GNU Lesser General Public
108- * License as published by the Free Software Foundation; either
109- * version 2.1 of the License, or (at your option) any later version.
110+ * License version 2.1 as published by the Free Software Foundation.
111 *
112 * This library is distributed in the hope that it will be useful,
113 * but WITHOUT ANY WARRANTY; without even the implied warranty of
114
115=== modified file 'os/os-thumb.c'
116--- os/os-thumb.c 2012-05-15 14:36:40 +0000
117+++ os/os-thumb.c 2012-11-26 14:37:23 +0000
118@@ -4,8 +4,7 @@
119 *
120 * This library is free software; you can redistribute it and/or
121 * modify it under the terms of the GNU Lesser General Public
122- * License as published by the Free Software Foundation; either
123- * version 2.1 of the License, or (at your option) any later version.
124+ * License version 2.1 as published by the Free Software Foundation.
125 *
126 * This library is distributed in the hope that it will be useful,
127 * but WITHOUT ANY WARRANTY; without even the implied warranty of
128
129=== modified file 'tests/test-os.c'
130--- tests/test-os.c 2012-04-26 14:02:33 +0000
131+++ tests/test-os.c 2012-11-26 14:37:23 +0000
132@@ -4,8 +4,7 @@
133 *
134 * This library is free software; you can redistribute it and/or
135 * modify it under the terms of the GNU Lesser General Public
136- * License as published by the Free Software Foundation; either
137- * version 2.1 of the License, or (at your option) any later version.
138+ * License version 2.1 as published by the Free Software Foundation.
139 *
140 * This library is distributed in the hope that it will be useful,
141 * but WITHOUT ANY WARRANTY; without even the implied warranty of

Subscribers

People subscribed via source and target branches