Merge lp:~thalexander/unity/update-fsf-address into lp:unity

Proposed by Alexander T Hale on 2017-11-18
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2018-09-26
Approved revision: 4266
Merged at revision: 4279
Proposed branch: lp:~thalexander/unity/update-fsf-address
Merge into: lp:unity
Diff against target: 207 lines (+16/-16)
16 files modified
plugins/unityshell/src/compizminimizedwindowhandler.h (+1/-1)
plugins/unityshell/src/comptransientfor.cpp (+1/-1)
plugins/unityshell/src/comptransientfor.h (+1/-1)
plugins/unityshell/src/inputremover.cpp (+1/-1)
plugins/unityshell/src/inputremover.h (+1/-1)
plugins/unityshell/src/minimizedwindowhandler.cpp (+1/-1)
plugins/unityshell/src/minimizedwindowhandler.h (+1/-1)
plugins/unityshell/src/transientfor.cpp (+1/-1)
plugins/unityshell/src/transientfor.h (+1/-1)
tests/test-get-transients/test-get-transients.cpp (+1/-1)
tests/test-input-remover/test-input-remover.cpp (+1/-1)
tests/test-minimize-window-handler/test-minimize-handler.cpp (+1/-1)
tests/x11-window-read-transients.cpp (+1/-1)
tests/x11-window-read-transients.h (+1/-1)
tests/x11-window.cpp (+1/-1)
tests/x11-window.h (+1/-1)
To merge this branch: bzr merge lp:~thalexander/unity/update-fsf-address
Reviewer Review Type Date Requested Status
Khurshid Alam (community) Approve on 2018-04-11
Unity Team 2017-11-18 Pending
Review via email: mp+333935@code.launchpad.net

Commit message

Update the Free Software Foundation address in license headers

Description of the change

Updates the Free Software Foundation address in license headers.

To post a comment you must log in.
Khurshid Alam (khurshid-alam) wrote :

Approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/compizminimizedwindowhandler.h'
2--- plugins/unityshell/src/compizminimizedwindowhandler.h 2012-11-06 18:19:09 +0000
3+++ plugins/unityshell/src/compizminimizedwindowhandler.h 2017-11-18 18:32:51 +0000
4@@ -14,7 +14,7 @@
5 *
6 * You should have received a copy of the GNU General Public License
7 * along with this program; if not, write to the Free Software
8- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
9+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
10 *
11 * Authored By:
12 * Sam Spilsbury <sam.spilsbury@canonical.com>
13
14=== modified file 'plugins/unityshell/src/comptransientfor.cpp'
15--- plugins/unityshell/src/comptransientfor.cpp 2012-03-14 06:24:18 +0000
16+++ plugins/unityshell/src/comptransientfor.cpp 2017-11-18 18:32:51 +0000
17@@ -13,7 +13,7 @@
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software
21- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
22+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
23 *
24 * Authored By:
25 * Sam Spilsbury <sam.spilsbury@canonical.com>
26
27=== modified file 'plugins/unityshell/src/comptransientfor.h'
28--- plugins/unityshell/src/comptransientfor.h 2012-07-09 13:34:41 +0000
29+++ plugins/unityshell/src/comptransientfor.h 2017-11-18 18:32:51 +0000
30@@ -13,7 +13,7 @@
31 *
32 * You should have received a copy of the GNU General Public License
33 * along with this program; if not, write to the Free Software
34- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
35+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
36 *
37 * Authored By:
38 * Sam Spilsbury <sam.spilsbury@canonical.com>
39
40=== modified file 'plugins/unityshell/src/inputremover.cpp'
41--- plugins/unityshell/src/inputremover.cpp 2016-04-26 10:34:18 +0000
42+++ plugins/unityshell/src/inputremover.cpp 2017-11-18 18:32:51 +0000
43@@ -13,7 +13,7 @@
44 *
45 * You should have received a copy of the GNU General Public License
46 * along with this program; if not, write to the Free Software
47- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
48+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
49 *
50 * Authored By:
51 * Sam Spilsbury <sam.spilsbury@canonical.com>
52
53=== modified file 'plugins/unityshell/src/inputremover.h'
54--- plugins/unityshell/src/inputremover.h 2016-03-09 17:25:16 +0000
55+++ plugins/unityshell/src/inputremover.h 2017-11-18 18:32:51 +0000
56@@ -13,7 +13,7 @@
57 *
58 * You should have received a copy of the GNU General Public License
59 * along with this program; if not, write to the Free Software
60- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
61+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
62 *
63 * Authored By:
64 * Sam Spilsbury <sam.spilsbury@canonical.com>
65
66=== modified file 'plugins/unityshell/src/minimizedwindowhandler.cpp'
67--- plugins/unityshell/src/minimizedwindowhandler.cpp 2013-02-09 13:36:15 +0000
68+++ plugins/unityshell/src/minimizedwindowhandler.cpp 2017-11-18 18:32:51 +0000
69@@ -13,7 +13,7 @@
70 *
71 * You should have received a copy of the GNU General Public License
72 * along with this program; if not, write to the Free Software
73- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
74+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
75 *
76 * Authored By:
77 * Sam Spilsbury <sam.spilsbury@canonical.com>
78
79=== modified file 'plugins/unityshell/src/minimizedwindowhandler.h'
80--- plugins/unityshell/src/minimizedwindowhandler.h 2012-04-18 09:19:44 +0000
81+++ plugins/unityshell/src/minimizedwindowhandler.h 2017-11-18 18:32:51 +0000
82@@ -13,7 +13,7 @@
83 *
84 * You should have received a copy of the GNU General Public License
85 * along with this program; if not, write to the Free Software
86- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
87+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
88 *
89 * Authored By:
90 * Sam Spilsbury <sam.spilsbury@canonical.com>
91
92=== modified file 'plugins/unityshell/src/transientfor.cpp'
93--- plugins/unityshell/src/transientfor.cpp 2012-03-14 06:24:18 +0000
94+++ plugins/unityshell/src/transientfor.cpp 2017-11-18 18:32:51 +0000
95@@ -13,7 +13,7 @@
96 *
97 * You should have received a copy of the GNU General Public License
98 * along with this program; if not, write to the Free Software
99- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
100+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
101 *
102 * Authored By:
103 * Sam Spilsbury <sam.spilsbury@canonical.com>
104
105=== modified file 'plugins/unityshell/src/transientfor.h'
106--- plugins/unityshell/src/transientfor.h 2012-07-09 13:34:41 +0000
107+++ plugins/unityshell/src/transientfor.h 2017-11-18 18:32:51 +0000
108@@ -13,7 +13,7 @@
109 *
110 * You should have received a copy of the GNU General Public License
111 * along with this program; if not, write to the Free Software
112- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
113+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
114 *
115 * Authored By:
116 * Sam Spilsbury <sam.spilsbury@canonical.com>
117
118=== modified file 'tests/test-get-transients/test-get-transients.cpp'
119--- tests/test-get-transients/test-get-transients.cpp 2011-08-24 16:46:09 +0000
120+++ tests/test-get-transients/test-get-transients.cpp 2017-11-18 18:32:51 +0000
121@@ -13,7 +13,7 @@
122 *
123 * You should have received a copy of the GNU General Public License
124 * along with this program; if not, write to the Free Software
125- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
126+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
127 *
128 * Authored By:
129 * Sam Spilsbury <sam.spilsbury@canonical.com>
130
131=== modified file 'tests/test-input-remover/test-input-remover.cpp'
132--- tests/test-input-remover/test-input-remover.cpp 2013-02-09 13:36:15 +0000
133+++ tests/test-input-remover/test-input-remover.cpp 2017-11-18 18:32:51 +0000
134@@ -13,7 +13,7 @@
135 *
136 * You should have received a copy of the GNU General Public License
137 * along with this program; if not, write to the Free Software
138- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
139+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
140 *
141 * Authored By:
142 * Sam Spilsbury <sam.spilsbury@canonical.com>
143
144=== modified file 'tests/test-minimize-window-handler/test-minimize-handler.cpp'
145--- tests/test-minimize-window-handler/test-minimize-handler.cpp 2013-02-09 13:36:15 +0000
146+++ tests/test-minimize-window-handler/test-minimize-handler.cpp 2017-11-18 18:32:51 +0000
147@@ -13,7 +13,7 @@
148 *
149 * You should have received a copy of the GNU General Public License
150 * along with this program; if not, write to the Free Software
151- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
152+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
153 *
154 * Authored By:
155 * Sam Spilsbury <sam.spilsbury@canonical.com>
156
157=== modified file 'tests/x11-window-read-transients.cpp'
158--- tests/x11-window-read-transients.cpp 2011-08-24 16:46:09 +0000
159+++ tests/x11-window-read-transients.cpp 2017-11-18 18:32:51 +0000
160@@ -13,7 +13,7 @@
161 *
162 * You should have received a copy of the GNU General Public License
163 * along with this program; if not, write to the Free Software
164- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
165+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
166 *
167 * Authored By:
168 * Sam Spilsbury <sam.spilsbury@canonical.com>
169
170=== modified file 'tests/x11-window-read-transients.h'
171--- tests/x11-window-read-transients.h 2011-08-24 16:52:38 +0000
172+++ tests/x11-window-read-transients.h 2017-11-18 18:32:51 +0000
173@@ -13,7 +13,7 @@
174 *
175 * You should have received a copy of the GNU General Public License
176 * along with this program; if not, write to the Free Software
177- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
178+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
179 *
180 * Authored By:
181 * Sam Spilsbury <sam.spilsbury@canonical.com>
182
183=== modified file 'tests/x11-window.cpp'
184--- tests/x11-window.cpp 2011-08-24 16:46:09 +0000
185+++ tests/x11-window.cpp 2017-11-18 18:32:51 +0000
186@@ -13,7 +13,7 @@
187 *
188 * You should have received a copy of the GNU General Public License
189 * along with this program; if not, write to the Free Software
190- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
191+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
192 *
193 * Authored By:
194 * Sam Spilsbury <sam.spilsbury@canonical.com>
195
196=== modified file 'tests/x11-window.h'
197--- tests/x11-window.h 2011-08-24 16:46:09 +0000
198+++ tests/x11-window.h 2017-11-18 18:32:51 +0000
199@@ -13,7 +13,7 @@
200 *
201 * You should have received a copy of the GNU General Public License
202 * along with this program; if not, write to the Free Software
203- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
204+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
205 *
206 * Authored By:
207 * Sam Spilsbury <sam.spilsbury@canonical.com>