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
=== modified file 'debian/changelog'
--- debian/changelog 2012-11-26 13:59:47 +0000
+++ debian/changelog 2012-11-26 14:37:23 +0000
@@ -12,6 +12,7 @@
12 - Override dh_autoreconf to call autogen.sh and not run configure.12 - Override dh_autoreconf to call autogen.sh and not run configure.
13 - Drop override for dh_makeshlibs.13 - Drop override for dh_makeshlibs.
14 - Add and export DPKG_GENSYMBOLS_CHECK_LEVEL.14 - Add and export DPKG_GENSYMBOLS_CHECK_LEVEL.
15 * debian/copyright: update to properly reflect upstream copyright.
1516
16 -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Fri, 23 Nov 2012 12:20:25 -050017 -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Fri, 23 Nov 2012 12:20:25 -0500
1718
1819
=== modified file 'debian/copyright'
--- debian/copyright 2012-09-24 14:25:40 +0000
+++ debian/copyright 2012-11-26 14:37:23 +0000
@@ -6,11 +6,10 @@
66
7Files: *7Files: *
8Copyright: 2011 Canonical Ltd8Copyright: 2011 Canonical Ltd
9License: LGPL-2.1+9License: LGPL-2.1
10 This library is free software; you can redistribute it and/or10 This library is free software; you can redistribute it and/or
11 modify it under the terms of the GNU Lesser General Public11 modify it under the terms of the GNU Lesser General Public
12 License as published by the Free Software Foundation; either12 License version 2.1 as published by the Free Software Foundation.
13 version 2.1 of the License, or (at your option) any later version.
14 .13 .
15 This library is distributed in the hope that it will be useful,14 This library is distributed in the hope that it will be useful,
16 but WITHOUT ANY WARRANTY; without even the implied warranty of15 but WITHOUT ANY WARRANTY; without even the implied warranty of
1716
=== modified file 'os/os-animation.c'
--- os/os-animation.c 2012-08-09 11:17:09 +0000
+++ os/os-animation.c 2012-11-26 14:37:23 +0000
@@ -4,8 +4,7 @@
4 *4 *
5 * This library is free software; you can redistribute it and/or5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Lesser General Public6 * modify it under the terms of the GNU Lesser General Public
7 * License as published by the Free Software Foundation; either7 * License version 2.1 as published by the Free Software Foundation.
8 * version 2.1 of the License, or (at your option) any later version.
9 *8 *
10 * This library is distributed in the hope that it will be useful,9 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1211
=== modified file 'os/os-bar.c'
--- os/os-bar.c 2012-05-15 14:36:40 +0000
+++ os/os-bar.c 2012-11-26 14:37:23 +0000
@@ -4,8 +4,7 @@
4 *4 *
5 * This library is free software; you can redistribute it and/or5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Lesser General Public6 * modify it under the terms of the GNU Lesser General Public
7 * License as published by the Free Software Foundation; either7 * License version 2.1 as published by the Free Software Foundation.
8 * version 2.1 of the License, or (at your option) any later version.
9 *8 *
10 * This library is distributed in the hope that it will be useful,9 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1211
=== modified file 'os/os-log.c'
--- os/os-log.c 2011-10-05 12:24:21 +0000
+++ os/os-log.c 2012-11-26 14:37:23 +0000
@@ -4,8 +4,7 @@
4 *4 *
5 * This library is free software; you can redistribute it and/or5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Lesser General Public6 * modify it under the terms of the GNU Lesser General Public
7 * License as published by the Free Software Foundation; either7 * License version 2.1 as published by the Free Software Foundation.
8 * version 2.1 of the License, or (at your option) any later version.
9 *8 *
10 * This library is distributed in the hope that it will be useful,9 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1211
=== modified file 'os/os-private.h'
--- os/os-private.h 2012-01-18 17:30:27 +0000
+++ os/os-private.h 2012-11-26 14:37:23 +0000
@@ -4,8 +4,7 @@
4 *4 *
5 * This library is free software; you can redistribute it and/or5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Lesser General Public6 * modify it under the terms of the GNU Lesser General Public
7 * License as published by the Free Software Foundation; either7 * License version 2.1 as published by the Free Software Foundation.
8 * version 2.1 of the License, or (at your option) any later version.
9 *8 *
10 * This library is distributed in the hope that it will be useful,9 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1211
=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c 2012-11-23 16:07:44 +0000
+++ os/os-scrollbar.c 2012-11-26 14:37:23 +0000
@@ -4,8 +4,7 @@
4 *4 *
5 * This library is free software; you can redistribute it and/or5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Lesser General Public6 * modify it under the terms of the GNU Lesser General Public
7 * License as published by the Free Software Foundation; either7 * License version 2.1 as published by the Free Software Foundation.
8 * version 2.1 of the License, or (at your option) any later version.
9 *8 *
10 * This library is distributed in the hope that it will be useful,9 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1211
=== modified file 'os/os-scrollbar.h'
--- os/os-scrollbar.h 2012-05-04 21:32:56 +0000
+++ os/os-scrollbar.h 2012-11-26 14:37:23 +0000
@@ -4,8 +4,7 @@
4 *4 *
5 * This library is free software; you can redistribute it and/or5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Lesser General Public6 * modify it under the terms of the GNU Lesser General Public
7 * License as published by the Free Software Foundation; either7 * License version 2.1 as published by the Free Software Foundation.
8 * version 2.1 of the License, or (at your option) any later version.
9 *8 *
10 * This library is distributed in the hope that it will be useful,9 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1211
=== modified file 'os/os-thumb.c'
--- os/os-thumb.c 2012-05-15 14:36:40 +0000
+++ os/os-thumb.c 2012-11-26 14:37:23 +0000
@@ -4,8 +4,7 @@
4 *4 *
5 * This library is free software; you can redistribute it and/or5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Lesser General Public6 * modify it under the terms of the GNU Lesser General Public
7 * License as published by the Free Software Foundation; either7 * License version 2.1 as published by the Free Software Foundation.
8 * version 2.1 of the License, or (at your option) any later version.
9 *8 *
10 * This library is distributed in the hope that it will be useful,9 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1211
=== modified file 'tests/test-os.c'
--- tests/test-os.c 2012-04-26 14:02:33 +0000
+++ tests/test-os.c 2012-11-26 14:37:23 +0000
@@ -4,8 +4,7 @@
4 *4 *
5 * This library is free software; you can redistribute it and/or5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Lesser General Public6 * modify it under the terms of the GNU Lesser General Public
7 * License as published by the Free Software Foundation; either7 * License version 2.1 as published by the Free Software Foundation.
8 * version 2.1 of the License, or (at your option) any later version.
9 *8 *
10 * This library is distributed in the hope that it will be useful,9 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of10 * but WITHOUT ANY WARRANTY; without even the implied warranty of

Subscribers

People subscribed via source and target branches