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
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-12-04 02:00:44 +0000
3+++ debian/changelog 2012-12-04 11:37:36 +0000
4@@ -1,3 +1,9 @@
5+frame (2.4.4daily12.12.04-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * Relicense under (L)GPL version 3 *only* (no +)
8+
9+ -- Daniel d'Andrada <daniel.dandrada@canonical.com> Tue, 04 Dec 2012 09:17:12 -0200
10+
11 frame (2.4.4daily12.12.04-0ubuntu1) raring; urgency=low
12
13 * Automatic snapshot from revision 110
14
15=== modified file 'debian/copyright'
16--- debian/copyright 2012-11-22 22:16:27 +0000
17+++ debian/copyright 2012-12-04 11:37:36 +0000
18@@ -23,11 +23,10 @@
19 Files: test/* tools/*
20 Copyright: 2010-2012, Canonical Ltd.
21 2010, Henrik Rydberg <rydberg@euromail.se>
22-License: GPL-3+
23+License: GPL-3
24 This program is free software: you can redistribute it and/or modify
25- it under the terms of the GNU General Public License as published by
26- the Free Software Foundation, either version 3 of the License, or
27- (at your option) any later version.
28+ it under the terms of the GNU General Public License version 3 as
29+ published by the Free Software Foundation.
30 .
31 This program is distributed in the hope that it will be useful,
32 but WITHOUT ANY WARRANTY; without even the implied warranty of
33
34=== modified file 'test/integration/events.cpp'
35--- test/integration/events.cpp 2012-07-24 20:47:15 +0000
36+++ test/integration/events.cpp 2012-12-04 11:37:36 +0000
37@@ -5,9 +5,8 @@
38 * Copyright (C) 2011 Canonical Ltd.
39 *
40 * This program is free software: you can redistribute it and/or modify it
41- * under the terms of the GNU General Public License as published by the
42- * Free Software Foundation, either version 3 of the License, or (at your
43- * option) any later version.
44+ * under the terms of the GNU General Public License version 3 as published
45+ * by the Free Software Foundation.
46 *
47 * This program is distributed in the hope that it will be useful, but
48 * WITHOUT ANY WARRANTY; without even the implied warranty of
49
50=== modified file 'test/integration/events.h'
51--- test/integration/events.h 2012-07-24 20:47:15 +0000
52+++ test/integration/events.h 2012-12-04 11:37:36 +0000
53@@ -5,9 +5,8 @@
54 * Copyright (C) 2011 Canonical Ltd.
55 *
56 * This program is free software: you can redistribute it and/or modify it
57- * under the terms of the GNU General Public License as published by the
58- * Free Software Foundation, either version 3 of the License, or (at your
59- * option) any later version.
60+ * under the terms of the GNU General Public License version 3 as published
61+ * by the Free Software Foundation.
62 *
63 * This program is distributed in the hope that it will be useful, but
64 * WITHOUT ANY WARRANTY; without even the implied warranty of
65
66=== modified file 'test/integration/x11/device.cpp'
67--- test/integration/x11/device.cpp 2012-06-21 19:41:40 +0000
68+++ test/integration/x11/device.cpp 2012-12-04 11:37:36 +0000
69@@ -5,9 +5,8 @@
70 * Copyright (C) 2011 Canonical Ltd.
71 *
72 * This program is free software: you can redistribute it and/or modify it
73- * under the terms of the GNU General Public License as published by the
74- * Free Software Foundation, either version 3 of the License, or (at your
75- * option) any later version.
76+ * under the terms of the GNU General Public License version 3 as published
77+ * by the Free Software Foundation.
78 *
79 * This program is distributed in the hope that it will be useful, but
80 * WITHOUT ANY WARRANTY; without even the implied warranty of
81
82=== modified file 'test/integration/x11/dynamic_type_checking.cpp'
83--- test/integration/x11/dynamic_type_checking.cpp 2012-06-21 19:41:40 +0000
84+++ test/integration/x11/dynamic_type_checking.cpp 2012-12-04 11:37:36 +0000
85@@ -5,9 +5,8 @@
86 * Copyright (C) 2011 Canonical Ltd.
87 *
88 * This program is free software: you can redistribute it and/or modify it
89- * under the terms of the GNU General Public License as published by the
90- * Free Software Foundation, either version 3 of the License, or (at your
91- * option) any later version.
92+ * under the terms of the GNU General Public License version 3 as published
93+ * by the Free Software Foundation.
94 *
95 * This program is distributed in the hope that it will be useful, but
96 * WITHOUT ANY WARRANTY; without even the implied warranty of
97
98=== modified file 'test/integration/x11/fixture.cpp'
99--- test/integration/x11/fixture.cpp 2012-06-21 19:41:40 +0000
100+++ test/integration/x11/fixture.cpp 2012-12-04 11:37:36 +0000
101@@ -5,9 +5,8 @@
102 * Copyright (C) 2011 Canonical Ltd.
103 *
104 * This program is free software: you can redistribute it and/or modify it
105- * under the terms of the GNU General Public License as published by the
106- * Free Software Foundation, either version 3 of the License, or (at your
107- * option) any later version.
108+ * under the terms of the GNU General Public License version 3 as published
109+ * by the Free Software Foundation.
110 *
111 * This program is distributed in the hope that it will be useful, but
112 * WITHOUT ANY WARRANTY; without even the implied warranty of
113
114=== modified file 'test/integration/x11/fixture.h'
115--- test/integration/x11/fixture.h 2012-06-21 19:41:40 +0000
116+++ test/integration/x11/fixture.h 2012-12-04 11:37:36 +0000
117@@ -5,9 +5,8 @@
118 * Copyright (C) 2011 Canonical Ltd.
119 *
120 * This program is free software: you can redistribute it and/or modify it
121- * under the terms of the GNU General Public License as published by the
122- * Free Software Foundation, either version 3 of the License, or (at your
123- * option) any later version.
124+ * under the terms of the GNU General Public License version 3 as published
125+ * by the Free Software Foundation.
126 *
127 * This program is distributed in the hope that it will be useful, but
128 * WITHOUT ANY WARRANTY; without even the implied warranty of
129
130=== modified file 'test/integration/x11/ids.cpp'
131--- test/integration/x11/ids.cpp 2012-06-21 19:41:40 +0000
132+++ test/integration/x11/ids.cpp 2012-12-04 11:37:36 +0000
133@@ -5,9 +5,8 @@
134 * Copyright (C) 2011 Canonical Ltd.
135 *
136 * This program is free software: you can redistribute it and/or modify it
137- * under the terms of the GNU General Public License as published by the
138- * Free Software Foundation, either version 3 of the License, or (at your
139- * option) any later version.
140+ * under the terms of the GNU General Public License version 3 as published
141+ * by the Free Software Foundation.
142 *
143 * This program is distributed in the hope that it will be useful, but
144 * WITHOUT ANY WARRANTY; without even the implied warranty of
145
146=== modified file 'test/integration/x11/recording.cpp'
147--- test/integration/x11/recording.cpp 2012-06-21 19:41:40 +0000
148+++ test/integration/x11/recording.cpp 2012-12-04 11:37:36 +0000
149@@ -5,9 +5,8 @@
150 * Copyright (C) 2011 Canonical Ltd.
151 *
152 * This program is free software: you can redistribute it and/or modify it
153- * under the terms of the GNU General Public License as published by the
154- * Free Software Foundation, either version 3 of the License, or (at your
155- * option) any later version.
156+ * under the terms of the GNU General Public License version 3 as published
157+ * by the Free Software Foundation.
158 *
159 * This program is distributed in the hope that it will be useful, but
160 * WITHOUT ANY WARRANTY; without even the implied warranty of
161
162=== modified file 'tools/common/device.c'
163--- tools/common/device.c 2012-06-21 19:41:40 +0000
164+++ tools/common/device.c 2012-12-04 11:37:36 +0000
165@@ -5,9 +5,8 @@
166 * Copyright (C) 2010-2011 Canonical Ltd.
167 *
168 * This program is free software: you can redistribute it and/or modify it
169- * under the terms of the GNU General Public License as published by the
170- * Free Software Foundation, either version 3 of the License, or (at your
171- * option) any later version.
172+ * under the terms of the GNU General Public License version 3 as published
173+ * by the Free Software Foundation.
174 *
175 * This program is distributed in the hope that it will be useful, but
176 * WITHOUT ANY WARRANTY; without even the implied warranty of
177
178=== modified file 'tools/common/device.h'
179--- tools/common/device.h 2012-06-21 19:41:40 +0000
180+++ tools/common/device.h 2012-12-04 11:37:36 +0000
181@@ -5,9 +5,8 @@
182 * Copyright (C) 2010-2011 Canonical Ltd.
183 *
184 * This program is free software: you can redistribute it and/or modify it
185- * under the terms of the GNU General Public License as published by the
186- * Free Software Foundation, either version 3 of the License, or (at your
187- * option) any later version.
188+ * under the terms of the GNU General Public License version 3 as published
189+ * by the Free Software Foundation.
190 *
191 * This program is distributed in the hope that it will be useful, but
192 * WITHOUT ANY WARRANTY; without even the implied warranty of
193
194=== modified file 'tools/common/frame.c'
195--- tools/common/frame.c 2012-06-21 19:41:40 +0000
196+++ tools/common/frame.c 2012-12-04 11:37:36 +0000
197@@ -5,9 +5,8 @@
198 * Copyright (C) 2010-2011 Canonical Ltd.
199 *
200 * This program is free software: you can redistribute it and/or modify it
201- * under the terms of the GNU General Public License as published by the
202- * Free Software Foundation, either version 3 of the License, or (at your
203- * option) any later version.
204+ * under the terms of the GNU General Public License version 3 as published
205+ * by the Free Software Foundation.
206 *
207 * This program is distributed in the hope that it will be useful, but
208 * WITHOUT ANY WARRANTY; without even the implied warranty of
209
210=== modified file 'tools/common/frame.h'
211--- tools/common/frame.h 2012-06-21 19:41:40 +0000
212+++ tools/common/frame.h 2012-12-04 11:37:36 +0000
213@@ -5,9 +5,8 @@
214 * Copyright (C) 2010-2011 Canonical Ltd.
215 *
216 * This program is free software: you can redistribute it and/or modify it
217- * under the terms of the GNU General Public License as published by the
218- * Free Software Foundation, either version 3 of the License, or (at your
219- * option) any later version.
220+ * under the terms of the GNU General Public License version 3 as published
221+ * by the Free Software Foundation.
222 *
223 * This program is distributed in the hope that it will be useful, but
224 * WITHOUT ANY WARRANTY; without even the implied warranty of
225
226=== modified file 'tools/common/touch.c'
227--- tools/common/touch.c 2012-06-21 19:41:40 +0000
228+++ tools/common/touch.c 2012-12-04 11:37:36 +0000
229@@ -5,9 +5,8 @@
230 * Copyright (C) 2010-2011 Canonical Ltd.
231 *
232 * This program is free software: you can redistribute it and/or modify it
233- * under the terms of the GNU General Public License as published by the
234- * Free Software Foundation, either version 3 of the License, or (at your
235- * option) any later version.
236+ * under the terms of the GNU General Public License version 3 as published
237+ * by the Free Software Foundation.
238 *
239 * This program is distributed in the hope that it will be useful, but
240 * WITHOUT ANY WARRANTY; without even the implied warranty of
241
242=== modified file 'tools/common/touch.h'
243--- tools/common/touch.h 2012-06-21 19:41:40 +0000
244+++ tools/common/touch.h 2012-12-04 11:37:36 +0000
245@@ -5,9 +5,8 @@
246 * Copyright (C) 2010-2011 Canonical Ltd.
247 *
248 * This program is free software: you can redistribute it and/or modify it
249- * under the terms of the GNU General Public License as published by the
250- * Free Software Foundation, either version 3 of the License, or (at your
251- * option) any later version.
252+ * under the terms of the GNU General Public License version 3 as published
253+ * by the Free Software Foundation.
254 *
255 * This program is distributed in the hope that it will be useful, but
256 * WITHOUT ANY WARRANTY; without even the implied warranty of
257
258=== modified file 'tools/frame-test-x11.c'
259--- tools/frame-test-x11.c 2012-06-21 19:41:40 +0000
260+++ tools/frame-test-x11.c 2012-12-04 11:37:36 +0000
261@@ -5,9 +5,8 @@
262 * Copyright (C) 2010-2011 Canonical Ltd.
263 *
264 * This program is free software: you can redistribute it and/or modify it
265- * under the terms of the GNU General Public License as published by the
266- * Free Software Foundation, either version 3 of the License, or (at your
267- * option) any later version.
268+ * under the terms of the GNU General Public License version 3 as published by
269+ * the Free Software Foundation.
270 *
271 * This program is distributed in the hope that it will be useful, but
272 * WITHOUT ANY WARRANTY; without even the implied warranty of

Subscribers

People subscribed via source and target branches