Merge lp:~ferbarcelona10/switchboard-plug-security-privacy/license-check into lp:~elementary-apps/switchboard-plug-security-privacy/trunk

Proposed by Fernando Alvarenga
Status: Merged
Approved by: Danielle Foré
Approved revision: 312
Merged at revision: 313
Proposed branch: lp:~ferbarcelona10/switchboard-plug-security-privacy/license-check
Merge into: lp:~elementary-apps/switchboard-plug-security-privacy/trunk
Diff against target: 343 lines (+94/-54)
11 files modified
src/BlackList.vala (+5/-5)
src/Plug.vala (+5/-5)
src/UFWHelpers.vala (+8/-8)
src/Views/FirewallPanel.vala (+7/-7)
src/Views/LocationPanel.vala (+3/-3)
src/Views/LockPanel.vala (+7/-7)
src/Views/TrackPanel.vala (+7/-7)
src/Widgets/ClearUsagePopover.vala (+6/-6)
src/Widgets/ServiceItem.vala (+20/-0)
src/Widgets/ServiceList.vala (+20/-0)
src/ZGUtilities.vala (+6/-6)
To merge this branch: bzr merge lp:~ferbarcelona10/switchboard-plug-security-privacy/license-check
Reviewer Review Type Date Requested Status
David Hewitt Approve
Danielle Foré Approve
Review via email: mp+318690@code.launchpad.net

Commit message

Changed license headers to pass license check.

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) wrote :

Just commenting to say I approve of re-licensing files copyright by elementary to LGPL :)

review: Approve
Revision history for this message
David Hewitt (davidmhewitt) wrote :

Fine to relicense by me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/BlackList.vala'
2--- src/BlackList.vala 2014-12-02 19:26:08 +0000
3+++ src/BlackList.vala 2017-03-01 22:46:36 +0000
4@@ -2,7 +2,7 @@
5 /*-
6 * Copyright (c) 2011 Collabora Ltd.
7 * Copyright (c) 2012 Manish Sinha <manishsinha@ubuntu.com>
8- * Copyright (c) 2014 Security & Privacy Plug (http://launchpad.net/your-project)
9+ * Copyright (c) 2014 elementary LLC. (http://launchpad.net/switchboard-plug-security-privacy)
10 *
11 * This library is free software; you can redistribute it and/or
12 * modify it under the terms of the GNU Lesser General Public
13@@ -12,12 +12,12 @@
14 * This library is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17- * Library General Public License for more details.
18+ * Lesser General Public License for more details.
19 *
20 * You should have received a copy of the GNU Lesser General Public
21- * License along with this library; if not, write to the
22- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
23- * Boston, MA 02111-1307, USA.
24+ * License along with this program; if not, write to the
25+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
26+ * Boston, MA 02110-1301 USA
27 *
28 * Authored by: Corentin Noël <tintou@mailoo.org>
29 * Siegfried-Angel Gevatter Pujals <siegfried@gevatter.com> (from Activity-Log-Manager)
30
31=== modified file 'src/Plug.vala'
32--- src/Plug.vala 2017-02-28 22:10:20 +0000
33+++ src/Plug.vala 2017-03-01 22:46:36 +0000
34@@ -3,7 +3,7 @@
35 * Copyright (c) 2014-2017 elementary LLC. (https://launchpad.net/switchboard-plug-security-privacy)
36 *
37 * This library is free software; you can redistribute it and/or
38- * modify it under the terms of the GNU Library General Public
39+ * modify it under the terms of the GNU Lesser General Public
40 * License as published by the Free Software Foundation; either
41 * version 3 of the License, or (at your option) any later version.
42 *
43@@ -12,10 +12,10 @@
44 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
45 * Library General Public License for more details.
46 *
47- * You should have received a copy of the GNU Library General Public
48- * License along with this library; if not, write to the
49- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
50- * Boston, MA 02111-1307, USA.
51+ * You should have received a copy of the GNU Lesser General Public
52+ * License along with this program; if not, write to the
53+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
54+ * Boston, MA 02110-1301 USA
55 *
56 * Authored by: Corentin Noël <tintou@mailoo.org>
57 */
58
59=== modified file 'src/UFWHelpers.vala'
60--- src/UFWHelpers.vala 2014-04-24 16:28:52 +0000
61+++ src/UFWHelpers.vala 2017-03-01 22:46:36 +0000
62@@ -1,21 +1,21 @@
63 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
64 /*-
65- * Copyright (c) 2014 Security & Privacy Plug (http://launchpad.net/your-project)
66+ * Copyright (c) 2014 elementary LLC. (http://launchpad.net/switchboard-plug-security-privacy)
67 *
68 * This library is free software; you can redistribute it and/or
69- * modify it under the terms of the GNU Library General Public
70+ * modify it under the terms of the GNU Lesser General Public
71 * License as published by the Free Software Foundation; either
72 * version 3 of the License, or (at your option) any later version.
73 *
74 * This library is distributed in the hope that it will be useful,
75 * but WITHOUT ANY WARRANTY; without even the implied warranty of
76 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
77- * Library General Public License for more details.
78+ * Lesser General Public License for more details.
79 *
80- * You should have received a copy of the GNU Library General Public
81- * License along with this library; if not, write to the
82- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83- * Boston, MA 02111-1307, USA.
84+ * You should have received a copy of the GNU Lesser General Public
85+ * License along with this program; if not, write to the
86+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
87+ * Boston, MA 02110-1301 USA
88 *
89 * Authored by: Corentin Noël <tintou@mailoo.org>
90 */
91@@ -195,4 +195,4 @@
92 }
93 }
94 }
95-}
96\ No newline at end of file
97+}
98
99=== modified file 'src/Views/FirewallPanel.vala'
100--- src/Views/FirewallPanel.vala 2017-02-27 20:49:21 +0000
101+++ src/Views/FirewallPanel.vala 2017-03-01 22:46:36 +0000
102@@ -1,21 +1,21 @@
103 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
104 /*-
105- * Copyright (c) 2014 Security & Privacy Plug (http://launchpad.net/your-project)
106+ * Copyright (c) 2014 elementary LLC. ((http://launchpad.net/switchboard-plug-security-privacy)
107 *
108 * This library is free software; you can redistribute it and/or
109- * modify it under the terms of the GNU Library General Public
110+ * modify it under the terms of the GNU Lesser General Public
111 * License as published by the Free Software Foundation; either
112 * version 3 of the License, or (at your option) any later version.
113 *
114 * This library is distributed in the hope that it will be useful,
115 * but WITHOUT ANY WARRANTY; without even the implied warranty of
116 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
117- * Library General Public License for more details.
118+ * Lesser General Public License for more details.
119 *
120- * You should have received a copy of the GNU Library General Public
121- * License along with this library; if not, write to the
122- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
123- * Boston, MA 02111-1307, USA.
124+ * You should have received a copy of the GNU Lesser General Public
125+ * License along with this program; if not, write to the
126+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
127+ * Boston, MA 02110-1301 USA
128 *
129 * Authored by: Corentin Noël <tintou@mailoo.org>
130 */
131
132=== modified file 'src/Views/LocationPanel.vala'
133--- src/Views/LocationPanel.vala 2017-02-28 22:10:20 +0000
134+++ src/Views/LocationPanel.vala 2017-03-01 22:46:36 +0000
135@@ -4,16 +4,16 @@
136 * Copyright (C) 2017 David Hewitt <davidmhewitt@gmail.com>
137 *
138 * This program is free software; you can redistribute it and/or modify
139- * it under the terms of the GNU General Public License as published by
140+ * it under the terms of the GNU Lesser General Public License as published by
141 * the Free Software Foundation; either version 3 of the License, or
142 * (at your option) any later version.
143 *
144 * This program is distributed in the hope that it will be useful,
145 * but WITHOUT ANY WARRANTY; without even the implied warranty of
146 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
147- * GNU General Public License for more details.
148+ * GNU Lesser General Public License for more details.
149 *
150- * You should have received a copy of the GNU General Public License
151+ * You should have received a copy of the GNU Lesser General Public License
152 * along with this program; if not, write to the Free Software Foundation,
153 * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
154 *
155
156=== modified file 'src/Views/LockPanel.vala'
157--- src/Views/LockPanel.vala 2017-02-26 20:21:42 +0000
158+++ src/Views/LockPanel.vala 2017-03-01 22:46:36 +0000
159@@ -1,21 +1,21 @@
160 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
161 /*-
162- * Copyright (c) 2014-2015 Security & Privacy Plug (https://launchpad.net/switchboard-plug-security-privacy)
163+ * Copyright (c) 2014-2015 elementary LLC. (https://launchpad.net/switchboard-plug-security-privacy)
164 *
165 * This library is free software; you can redistribute it and/or
166- * modify it under the terms of the GNU Library General Public
167+ * modify it under the terms of the GNU Lesser General Public
168 * License as published by the Free Software Foundation; either
169 * version 3 of the License, or (at your option) any later version.
170 *
171 * This library is distributed in the hope that it will be useful,
172 * but WITHOUT ANY WARRANTY; without even the implied warranty of
173 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
174- * Library General Public License for more details.
175+ * Lesser General Public License for more details.
176 *
177- * You should have received a copy of the GNU Library General Public
178- * License along with this library; if not, write to the
179- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
180- * Boston, MA 02111-1307, USA.
181+ * You should have received a copy of the GNU Lesser General Public
182+ * License along with this program; if not, write to the
183+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
184+ * Boston, MA 02110-1301 USA
185 *
186 * Authored by: Corentin Noël <corentin@elementary.io>
187 */
188
189=== modified file 'src/Views/TrackPanel.vala'
190--- src/Views/TrackPanel.vala 2017-02-28 17:09:23 +0000
191+++ src/Views/TrackPanel.vala 2017-03-01 22:46:36 +0000
192@@ -1,21 +1,21 @@
193 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
194 /*-
195- * Copyright (c) 2014 Security & Privacy Plug (http://launchpad.net/your-project)
196+ * Copyright (c) 2014 elementary LLC. ((http://launchpad.net/switchboard-plug-security-privacy)
197 *
198 * This library is free software; you can redistribute it and/or
199- * modify it under the terms of the GNU Library General Public
200+ * modify it under the terms of the GNU Lesser General Public
201 * License as published by the Free Software Foundation; either
202 * version 3 of the License, or (at your option) any later version.
203 *
204 * This library is distributed in the hope that it will be useful,
205 * but WITHOUT ANY WARRANTY; without even the implied warranty of
206 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
207- * Library General Public License for more details.
208+ * Lesser General Public License for more details.
209 *
210- * You should have received a copy of the GNU Library General Public
211- * License along with this library; if not, write to the
212- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
213- * Boston, MA 02111-1307, USA.
214+ * You should have received a copy of the GNU Lesser General Public
215+ * License along with this program; if not, write to the
216+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
217+ * Boston, MA 02110-1301 USA
218 *
219 * Authored by: Corentin Noël <tintou@mailoo.org>
220 */
221
222=== modified file 'src/Widgets/ClearUsagePopover.vala'
223--- src/Widgets/ClearUsagePopover.vala 2017-02-25 23:38:34 +0000
224+++ src/Widgets/ClearUsagePopover.vala 2017-03-01 22:46:36 +0000
225@@ -2,19 +2,19 @@
226 * Copyright (c) 2014-2017 elementary LLC. (http://launchpad.net/switchboard-plug-security-privacy)
227 *
228 * This library is free software; you can redistribute it and/or
229- * modify it under the terms of the GNU Library General Public
230+ * modify it under the terms of the GNU Lesser General Public
231 * License as published by the Free Software Foundation; either
232 * version 3 of the License, or (at your option) any later version.
233 *
234 * This library is distributed in the hope that it will be useful,
235 * but WITHOUT ANY WARRANTY; without even the implied warranty of
236 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
237- * Library General Public License for more details.
238+ * Lesser General Public License for more details.
239 *
240- * You should have received a copy of the GNU Library General Public
241- * License along with this library; if not, write to the
242- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
243- * Boston, MA 02111-1307, USA.
244+ * You should have received a copy of the GNU Lesser General Public
245+ * License along with this program; if not, write to the
246+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
247+ * Boston, MA 02110-1301 USA
248 *
249 * Authored by: Corentin Noël <corentin@elementaryos.org>
250 */
251
252=== modified file 'src/Widgets/ServiceItem.vala'
253--- src/Widgets/ServiceItem.vala 2017-02-27 20:49:21 +0000
254+++ src/Widgets/ServiceItem.vala 2017-03-01 22:46:36 +0000
255@@ -1,3 +1,23 @@
256+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
257+/*-
258+ * Copyright (c) 2017 elementary LLC. (http://launchpad.net/switchboard-plug-security-privacy)
259+ *
260+ * This library is free software; you can redistribute it and/or
261+ * modify it under the terms of the GNU Lesser General Public
262+ * License as published by the Free Software Foundation; either
263+ * version 3 of the License, or (at your option) any later version.
264+ *
265+ * This library is distributed in the hope that it will be useful,
266+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
267+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
268+ * Lesser General Public License for more details.
269+ *
270+ * You should have received a copy of the GNU Lesser General Public
271+ * License along with this program; if not, write to the
272+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
273+ * Boston, MA 02110-1301 USA
274+ */
275+
276 public class ServiceItem: Gtk.ListBoxRow {
277 public enum Status {
278 ENABLED,
279
280=== modified file 'src/Widgets/ServiceList.vala'
281--- src/Widgets/ServiceList.vala 2017-02-28 22:10:20 +0000
282+++ src/Widgets/ServiceList.vala 2017-03-01 22:46:36 +0000
283@@ -1,3 +1,23 @@
284+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
285+/*-
286+ * Copyright (c) 2017 elementary LLC. (http://launchpad.net/switchboard-plug-security-privacy)
287+ *
288+ * This library is free software; you can redistribute it and/or
289+ * modify it under the terms of the GNU Lesser General Public
290+ * License as published by the Free Software Foundation; either
291+ * version 3 of the License, or (at your option) any later version.
292+ *
293+ * This library is distributed in the hope that it will be useful,
294+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
295+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
296+ * Lesser General Public License for more details.
297+ *
298+ * You should have received a copy of the GNU Lesser General Public
299+ * License along with this program; if not, write to the
300+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
301+ * Boston, MA 02110-1301 USA
302+ */
303+
304 public class ServiceList : Gtk.ListBox {
305 Gee.HashMap<string, ServiceItem> services = new Gee.HashMap<string, ServiceItem> ();
306
307
308=== modified file 'src/ZGUtilities.vala'
309--- src/ZGUtilities.vala 2014-04-23 23:43:35 +0000
310+++ src/ZGUtilities.vala 2017-03-01 22:46:36 +0000
311@@ -2,7 +2,7 @@
312 /*-
313 * Copyright (c) 2011 Collabora Ltd.
314 * Copyright (c) 2012 Manish Sinha <manishsinha@ubuntu.com>
315- * Copyright (c) 2014 Security & Privacy Plug (http://launchpad.net/your-project)
316+ * Copyright (c) 2014 elementary LLC. ((http://launchpad.net/switchboard-plug-security-privacy)
317 *
318 * This library is free software; you can redistribute it and/or
319 * modify it under the terms of the GNU Lesser General Public
320@@ -12,12 +12,12 @@
321 * This library is distributed in the hope that it will be useful,
322 * but WITHOUT ANY WARRANTY; without even the implied warranty of
323 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
324- * Library General Public License for more details.
325+ * Lesser General Public License for more details.
326 *
327 * You should have received a copy of the GNU Lesser General Public
328- * License along with this library; if not, write to the
329- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
330- * Boston, MA 02111-1307, USA.
331+ * License along with this program; if not, write to the
332+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
333+ * Boston, MA 02110-1301 USA
334 *
335 * Authored by: Corentin Noël <tintou@mailoo.org>
336 * Siegfried-Angel Gevatter Pujals <siegfried@gevatter.com> (from Activity-Log-Manager)
337@@ -117,4 +117,4 @@
338
339 return vb.end ();
340 }
341-}
342\ No newline at end of file
343+}

Subscribers

People subscribed via source and target branches