frame

Merge lp:~dandrader/frame/relicensing into lp:frame

  1. relicensing
  2. Merge into trunk
Proposed by Daniel d'Andrada
Status: Merged
Approved by: Daniel d'Andrada
Approved revision: 112
Merged at revision: 112
Proposed branch: lp:~dandrader/frame/relicensing
Merge into: lp:frame
Diff against target: 272 lines (+39/-49)
17 files modified
debian/changelog (+6/-0)
debian/copyright (+3/-4)
test/integration/events.cpp (+2/-3)
test/integration/events.h (+2/-3)
test/integration/x11/device.cpp (+2/-3)
test/integration/x11/dynamic_type_checking.cpp (+2/-3)
test/integration/x11/fixture.cpp (+2/-3)
test/integration/x11/fixture.h (+2/-3)
test/integration/x11/ids.cpp (+2/-3)
test/integration/x11/recording.cpp (+2/-3)
tools/common/device.c (+2/-3)
tools/common/device.h (+2/-3)
tools/common/frame.c (+2/-3)
tools/common/frame.h (+2/-3)
tools/common/touch.c (+2/-3)
tools/common/touch.h (+2/-3)
tools/frame-test-x11.c (+2/-3)
To merge this branch: bzr merge lp:~dandrader/frame/relicensing
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Pending
Henrik Rydberg Pending
Review via email: mp+137808@code.launchpad.net

Commit message

Relicense under (L)GPL version 3 *only* (no +)

In accordance with Canonical's licensing policy.

Description of the change

Relicense under (L)GPL version 3 *only* (no +)

In accordance with Canonical's licensing policy.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-12-04 02:00:44 +0000
+++ debian/changelog 2012-12-04 11:37:36 +0000
@@ -1,3 +1,9 @@
1frame (2.4.4daily12.12.04-0ubuntu2) UNRELEASED; urgency=low
2
3 * Relicense under (L)GPL version 3 *only* (no +)
4
5 -- Daniel d'Andrada <daniel.dandrada@canonical.com> Tue, 04 Dec 2012 09:17:12 -0200
6
1frame (2.4.4daily12.12.04-0ubuntu1) raring; urgency=low7frame (2.4.4daily12.12.04-0ubuntu1) raring; urgency=low
28
3 * Automatic snapshot from revision 1109 * Automatic snapshot from revision 110
410
=== modified file 'debian/copyright'
--- debian/copyright 2012-11-22 22:16:27 +0000
+++ debian/copyright 2012-12-04 11:37:36 +0000
@@ -23,11 +23,10 @@
23Files: test/* tools/*23Files: test/* tools/*
24Copyright: 2010-2012, Canonical Ltd.24Copyright: 2010-2012, Canonical Ltd.
25 2010, Henrik Rydberg <rydberg@euromail.se>25 2010, Henrik Rydberg <rydberg@euromail.se>
26License: GPL-3+26License: GPL-3
27 This program is free software: you can redistribute it and/or modify27 This program is free software: you can redistribute it and/or modify
28 it under the terms of the GNU General Public License as published by28 it under the terms of the GNU General Public License version 3 as
29 the Free Software Foundation, either version 3 of the License, or29 published by the Free Software Foundation.
30 (at your option) any later version.
31 .30 .
32 This program is distributed in the hope that it will be useful,31 This program is distributed in the hope that it will be useful,
33 but WITHOUT ANY WARRANTY; without even the implied warranty of32 but WITHOUT ANY WARRANTY; without even the implied warranty of
3433
=== modified file 'test/integration/events.cpp'
--- test/integration/events.cpp 2012-07-24 20:47:15 +0000
+++ test/integration/events.cpp 2012-12-04 11:37:36 +0000
@@ -5,9 +5,8 @@
5 * Copyright (C) 2011 Canonical Ltd.5 * Copyright (C) 2011 Canonical Ltd.
6 *6 *
7 * This program is free software: you can redistribute it and/or modify it7 * This program is free software: you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the8 * under the terms of the GNU General Public License version 3 as published
9 * Free Software Foundation, either version 3 of the License, or (at your9 * by the Free Software Foundation.
10 * option) any later version.
11 *10 *
12 * This program is distributed in the hope that it will be useful, but11 * This program is distributed in the hope that it will be useful, but
13 * WITHOUT ANY WARRANTY; without even the implied warranty of12 * WITHOUT ANY WARRANTY; without even the implied warranty of
1413
=== modified file 'test/integration/events.h'
--- test/integration/events.h 2012-07-24 20:47:15 +0000
+++ test/integration/events.h 2012-12-04 11:37:36 +0000
@@ -5,9 +5,8 @@
5 * Copyright (C) 2011 Canonical Ltd.5 * Copyright (C) 2011 Canonical Ltd.
6 *6 *
7 * This program is free software: you can redistribute it and/or modify it7 * This program is free software: you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the8 * under the terms of the GNU General Public License version 3 as published
9 * Free Software Foundation, either version 3 of the License, or (at your9 * by the Free Software Foundation.
10 * option) any later version.
11 *10 *
12 * This program is distributed in the hope that it will be useful, but11 * This program is distributed in the hope that it will be useful, but
13 * WITHOUT ANY WARRANTY; without even the implied warranty of12 * WITHOUT ANY WARRANTY; without even the implied warranty of
1413
=== modified file 'test/integration/x11/device.cpp'
--- test/integration/x11/device.cpp 2012-06-21 19:41:40 +0000
+++ test/integration/x11/device.cpp 2012-12-04 11:37:36 +0000
@@ -5,9 +5,8 @@
5 * Copyright (C) 2011 Canonical Ltd.5 * Copyright (C) 2011 Canonical Ltd.
6 *6 *
7 * This program is free software: you can redistribute it and/or modify it7 * This program is free software: you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the8 * under the terms of the GNU General Public License version 3 as published
9 * Free Software Foundation, either version 3 of the License, or (at your9 * by the Free Software Foundation.
10 * option) any later version.
11 *10 *
12 * This program is distributed in the hope that it will be useful, but11 * This program is distributed in the hope that it will be useful, but
13 * WITHOUT ANY WARRANTY; without even the implied warranty of12 * WITHOUT ANY WARRANTY; without even the implied warranty of
1413
=== modified file 'test/integration/x11/dynamic_type_checking.cpp'
--- test/integration/x11/dynamic_type_checking.cpp 2012-06-21 19:41:40 +0000
+++ test/integration/x11/dynamic_type_checking.cpp 2012-12-04 11:37:36 +0000
@@ -5,9 +5,8 @@
5 * Copyright (C) 2011 Canonical Ltd.5 * Copyright (C) 2011 Canonical Ltd.
6 *6 *
7 * This program is free software: you can redistribute it and/or modify it7 * This program is free software: you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the8 * under the terms of the GNU General Public License version 3 as published
9 * Free Software Foundation, either version 3 of the License, or (at your9 * by the Free Software Foundation.
10 * option) any later version.
11 *10 *
12 * This program is distributed in the hope that it will be useful, but11 * This program is distributed in the hope that it will be useful, but
13 * WITHOUT ANY WARRANTY; without even the implied warranty of12 * WITHOUT ANY WARRANTY; without even the implied warranty of
1413
=== modified file 'test/integration/x11/fixture.cpp'
--- test/integration/x11/fixture.cpp 2012-06-21 19:41:40 +0000
+++ test/integration/x11/fixture.cpp 2012-12-04 11:37:36 +0000
@@ -5,9 +5,8 @@
5 * Copyright (C) 2011 Canonical Ltd.5 * Copyright (C) 2011 Canonical Ltd.
6 *6 *
7 * This program is free software: you can redistribute it and/or modify it7 * This program is free software: you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the8 * under the terms of the GNU General Public License version 3 as published
9 * Free Software Foundation, either version 3 of the License, or (at your9 * by the Free Software Foundation.
10 * option) any later version.
11 *10 *
12 * This program is distributed in the hope that it will be useful, but11 * This program is distributed in the hope that it will be useful, but
13 * WITHOUT ANY WARRANTY; without even the implied warranty of12 * WITHOUT ANY WARRANTY; without even the implied warranty of
1413
=== modified file 'test/integration/x11/fixture.h'
--- test/integration/x11/fixture.h 2012-06-21 19:41:40 +0000
+++ test/integration/x11/fixture.h 2012-12-04 11:37:36 +0000
@@ -5,9 +5,8 @@
5 * Copyright (C) 2011 Canonical Ltd.5 * Copyright (C) 2011 Canonical Ltd.
6 *6 *
7 * This program is free software: you can redistribute it and/or modify it7 * This program is free software: you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the8 * under the terms of the GNU General Public License version 3 as published
9 * Free Software Foundation, either version 3 of the License, or (at your9 * by the Free Software Foundation.
10 * option) any later version.
11 *10 *
12 * This program is distributed in the hope that it will be useful, but11 * This program is distributed in the hope that it will be useful, but
13 * WITHOUT ANY WARRANTY; without even the implied warranty of12 * WITHOUT ANY WARRANTY; without even the implied warranty of
1413
=== modified file 'test/integration/x11/ids.cpp'
--- test/integration/x11/ids.cpp 2012-06-21 19:41:40 +0000
+++ test/integration/x11/ids.cpp 2012-12-04 11:37:36 +0000
@@ -5,9 +5,8 @@
5 * Copyright (C) 2011 Canonical Ltd.5 * Copyright (C) 2011 Canonical Ltd.
6 *6 *
7 * This program is free software: you can redistribute it and/or modify it7 * This program is free software: you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the8 * under the terms of the GNU General Public License version 3 as published
9 * Free Software Foundation, either version 3 of the License, or (at your9 * by the Free Software Foundation.
10 * option) any later version.
11 *10 *
12 * This program is distributed in the hope that it will be useful, but11 * This program is distributed in the hope that it will be useful, but
13 * WITHOUT ANY WARRANTY; without even the implied warranty of12 * WITHOUT ANY WARRANTY; without even the implied warranty of
1413
=== modified file 'test/integration/x11/recording.cpp'
--- test/integration/x11/recording.cpp 2012-06-21 19:41:40 +0000
+++ test/integration/x11/recording.cpp 2012-12-04 11:37:36 +0000
@@ -5,9 +5,8 @@
5 * Copyright (C) 2011 Canonical Ltd.5 * Copyright (C) 2011 Canonical Ltd.
6 *6 *
7 * This program is free software: you can redistribute it and/or modify it7 * This program is free software: you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the8 * under the terms of the GNU General Public License version 3 as published
9 * Free Software Foundation, either version 3 of the License, or (at your9 * by the Free Software Foundation.
10 * option) any later version.
11 *10 *
12 * This program is distributed in the hope that it will be useful, but11 * This program is distributed in the hope that it will be useful, but
13 * WITHOUT ANY WARRANTY; without even the implied warranty of12 * WITHOUT ANY WARRANTY; without even the implied warranty of
1413
=== modified file 'tools/common/device.c'
--- tools/common/device.c 2012-06-21 19:41:40 +0000
+++ tools/common/device.c 2012-12-04 11:37:36 +0000
@@ -5,9 +5,8 @@
5 * Copyright (C) 2010-2011 Canonical Ltd.5 * Copyright (C) 2010-2011 Canonical Ltd.
6 *6 *
7 * This program is free software: you can redistribute it and/or modify it7 * This program is free software: you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the8 * under the terms of the GNU General Public License version 3 as published
9 * Free Software Foundation, either version 3 of the License, or (at your9 * by the Free Software Foundation.
10 * option) any later version.
11 *10 *
12 * This program is distributed in the hope that it will be useful, but11 * This program is distributed in the hope that it will be useful, but
13 * WITHOUT ANY WARRANTY; without even the implied warranty of12 * WITHOUT ANY WARRANTY; without even the implied warranty of
1413
=== modified file 'tools/common/device.h'
--- tools/common/device.h 2012-06-21 19:41:40 +0000
+++ tools/common/device.h 2012-12-04 11:37:36 +0000
@@ -5,9 +5,8 @@
5 * Copyright (C) 2010-2011 Canonical Ltd.5 * Copyright (C) 2010-2011 Canonical Ltd.
6 *6 *
7 * This program is free software: you can redistribute it and/or modify it7 * This program is free software: you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the8 * under the terms of the GNU General Public License version 3 as published
9 * Free Software Foundation, either version 3 of the License, or (at your9 * by the Free Software Foundation.
10 * option) any later version.
11 *10 *
12 * This program is distributed in the hope that it will be useful, but11 * This program is distributed in the hope that it will be useful, but
13 * WITHOUT ANY WARRANTY; without even the implied warranty of12 * WITHOUT ANY WARRANTY; without even the implied warranty of
1413
=== modified file 'tools/common/frame.c'
--- tools/common/frame.c 2012-06-21 19:41:40 +0000
+++ tools/common/frame.c 2012-12-04 11:37:36 +0000
@@ -5,9 +5,8 @@
5 * Copyright (C) 2010-2011 Canonical Ltd.5 * Copyright (C) 2010-2011 Canonical Ltd.
6 *6 *
7 * This program is free software: you can redistribute it and/or modify it7 * This program is free software: you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the8 * under the terms of the GNU General Public License version 3 as published
9 * Free Software Foundation, either version 3 of the License, or (at your9 * by the Free Software Foundation.
10 * option) any later version.
11 *10 *
12 * This program is distributed in the hope that it will be useful, but11 * This program is distributed in the hope that it will be useful, but
13 * WITHOUT ANY WARRANTY; without even the implied warranty of12 * WITHOUT ANY WARRANTY; without even the implied warranty of
1413
=== modified file 'tools/common/frame.h'
--- tools/common/frame.h 2012-06-21 19:41:40 +0000
+++ tools/common/frame.h 2012-12-04 11:37:36 +0000
@@ -5,9 +5,8 @@
5 * Copyright (C) 2010-2011 Canonical Ltd.5 * Copyright (C) 2010-2011 Canonical Ltd.
6 *6 *
7 * This program is free software: you can redistribute it and/or modify it7 * This program is free software: you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the8 * under the terms of the GNU General Public License version 3 as published
9 * Free Software Foundation, either version 3 of the License, or (at your9 * by the Free Software Foundation.
10 * option) any later version.
11 *10 *
12 * This program is distributed in the hope that it will be useful, but11 * This program is distributed in the hope that it will be useful, but
13 * WITHOUT ANY WARRANTY; without even the implied warranty of12 * WITHOUT ANY WARRANTY; without even the implied warranty of
1413
=== modified file 'tools/common/touch.c'
--- tools/common/touch.c 2012-06-21 19:41:40 +0000
+++ tools/common/touch.c 2012-12-04 11:37:36 +0000
@@ -5,9 +5,8 @@
5 * Copyright (C) 2010-2011 Canonical Ltd.5 * Copyright (C) 2010-2011 Canonical Ltd.
6 *6 *
7 * This program is free software: you can redistribute it and/or modify it7 * This program is free software: you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the8 * under the terms of the GNU General Public License version 3 as published
9 * Free Software Foundation, either version 3 of the License, or (at your9 * by the Free Software Foundation.
10 * option) any later version.
11 *10 *
12 * This program is distributed in the hope that it will be useful, but11 * This program is distributed in the hope that it will be useful, but
13 * WITHOUT ANY WARRANTY; without even the implied warranty of12 * WITHOUT ANY WARRANTY; without even the implied warranty of
1413
=== modified file 'tools/common/touch.h'
--- tools/common/touch.h 2012-06-21 19:41:40 +0000
+++ tools/common/touch.h 2012-12-04 11:37:36 +0000
@@ -5,9 +5,8 @@
5 * Copyright (C) 2010-2011 Canonical Ltd.5 * Copyright (C) 2010-2011 Canonical Ltd.
6 *6 *
7 * This program is free software: you can redistribute it and/or modify it7 * This program is free software: you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the8 * under the terms of the GNU General Public License version 3 as published
9 * Free Software Foundation, either version 3 of the License, or (at your9 * by the Free Software Foundation.
10 * option) any later version.
11 *10 *
12 * This program is distributed in the hope that it will be useful, but11 * This program is distributed in the hope that it will be useful, but
13 * WITHOUT ANY WARRANTY; without even the implied warranty of12 * WITHOUT ANY WARRANTY; without even the implied warranty of
1413
=== modified file 'tools/frame-test-x11.c'
--- tools/frame-test-x11.c 2012-06-21 19:41:40 +0000
+++ tools/frame-test-x11.c 2012-12-04 11:37:36 +0000
@@ -5,9 +5,8 @@
5 * Copyright (C) 2010-2011 Canonical Ltd.5 * Copyright (C) 2010-2011 Canonical Ltd.
6 *6 *
7 * This program is free software: you can redistribute it and/or modify it7 * This program is free software: you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the8 * under the terms of the GNU General Public License version 3 as published by
9 * Free Software Foundation, either version 3 of the License, or (at your9 * the Free Software Foundation.
10 * option) any later version.
11 *10 *
12 * This program is distributed in the hope that it will be useful, but11 * This program is distributed in the hope that it will be useful, but
13 * WITHOUT ANY WARRANTY; without even the implied warranty of12 * WITHOUT ANY WARRANTY; without even the implied warranty of

Subscribers

People subscribed via source and target branches