loggerhead

Merge lp:~toshio/loggerhead/fsf-address-update into lp:loggerhead

  1. fsf-address-update
  2. Merge into trunk-rich
Proposed by Toshio Kuratomi
Status: Merged
Approved by: j.c.sackett
Approved revision: 468
Merged at revision: 473
Proposed branch: lp:~toshio/loggerhead/fsf-address-update
Merge into: lp:loggerhead
Diff against target: 388 lines (+30/-30)
30 files modified
__init__.py (+1/-1)
loggerhead.wsgi (+1/-1)
loggerhead/__init__.py (+1/-1)
loggerhead/apps/branch.py (+1/-1)
loggerhead/apps/error.py (+1/-1)
loggerhead/apps/http_head.py (+1/-1)
loggerhead/apps/transport.py (+1/-1)
loggerhead/changecache.py (+1/-1)
loggerhead/controllers/__init__.py (+1/-1)
loggerhead/controllers/annotate_ui.py (+1/-1)
loggerhead/controllers/atom_ui.py (+1/-1)
loggerhead/controllers/changelog_ui.py (+1/-1)
loggerhead/controllers/diff_ui.py (+1/-1)
loggerhead/controllers/directory_ui.py (+1/-1)
loggerhead/controllers/download_ui.py (+1/-1)
loggerhead/controllers/error_ui.py (+1/-1)
loggerhead/controllers/inventory_ui.py (+1/-1)
loggerhead/controllers/revision_ui.py (+1/-1)
loggerhead/controllers/search_ui.py (+1/-1)
loggerhead/controllers/view_ui.py (+1/-1)
loggerhead/highlight.py (+1/-1)
loggerhead/history.py (+1/-1)
loggerhead/load_test.py (+1/-1)
loggerhead/main.py (+1/-1)
loggerhead/search.py (+1/-1)
loggerhead/templatefunctions.py (+1/-1)
loggerhead/util.py (+1/-1)
loggerhead/wholehistory.py (+1/-1)
loggerhead/zptsupport.py (+1/-1)
serve-branches (+1/-1)
To merge this branch: bzr merge lp:~toshio/loggerhead/fsf-address-update
Reviewer Review Type Date Requested Status
j.c.sackett (community) Approve
Richard Harding (community) code* Approve
Review via email: mp+91963@code.launchpad.net

Description of the change

Minor change: Update the address of the Free Software Foundation in the GPL license headers.

Their current address is:

Free Software Foundation
51 Franklin Street, Suite 500
Boston, MA 02110-1335

Rather than the old, Temple Place address.

http://www.fsf.org/about/contact/

To post a comment you must log in.
Revision history for this message
Richard Harding (rharding) wrote :

Thanks for this update Toshio. Looks good.

review: Approve (code*)
Revision history for this message
j.c.sackett (jcsackett) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '__init__.py'
2--- __init__.py 2011-04-12 10:18:52 +0000
3+++ __init__.py 2012-02-08 01:55:20 +0000
4@@ -12,7 +12,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, Suite 500, Boston, MA 02110-1335 USA
10
11
12 # This file allows loggerhead to be treated as a plugin for bzr.
13
14=== modified file 'loggerhead.wsgi'
15--- loggerhead.wsgi 2010-04-18 17:58:04 +0000
16+++ loggerhead.wsgi 2012-02-08 01:55:20 +0000
17@@ -11,7 +11,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, Suite 500, Boston, MA 02110-1335 USA
23
24
25 import sys
26
27=== modified file 'loggerhead/__init__.py'
28--- loggerhead/__init__.py 2011-11-23 08:33:12 +0000
29+++ loggerhead/__init__.py 2012-02-08 01:55:20 +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, Suite 500, Boston, MA 02110-1335 USA
36
37 """A simple container to turn this into a python package.
38
39
40=== modified file 'loggerhead/apps/branch.py'
41--- loggerhead/apps/branch.py 2011-11-23 08:18:35 +0000
42+++ loggerhead/apps/branch.py 2012-02-08 01:55:20 +0000
43@@ -12,7 +12,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, Suite 500, Boston, MA 02110-1335 USA
49
50 """The WSGI application for serving a Bazaar branch."""
51
52
53=== modified file 'loggerhead/apps/error.py'
54--- loggerhead/apps/error.py 2009-10-17 08:47:38 +0000
55+++ loggerhead/apps/error.py 2012-02-08 01:55:20 +0000
56@@ -12,7 +12,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, Suite 500, Boston, MA 02110-1335 USA
62 #
63
64 from loggerhead.controllers.error_ui import ErrorUI
65
66=== modified file 'loggerhead/apps/http_head.py'
67--- loggerhead/apps/http_head.py 2011-02-10 02:33:15 +0000
68+++ loggerhead/apps/http_head.py 2012-02-08 01:55:20 +0000
69@@ -12,7 +12,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, Suite 500, Boston, MA 02110-1335 USA
75 #
76 """WSGI apps tend to return body content as part of a HEAD request.
77
78
79=== modified file 'loggerhead/apps/transport.py'
80--- loggerhead/apps/transport.py 2011-03-16 14:43:36 +0000
81+++ loggerhead/apps/transport.py 2012-02-08 01:55:20 +0000
82@@ -12,7 +12,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, Suite 500, Boston, MA 02110-1335 USA
88 #
89 """Serve branches at urls that mimic a transport's file system layout."""
90
91
92=== modified file 'loggerhead/changecache.py'
93--- loggerhead/changecache.py 2011-08-17 11:04:00 +0000
94+++ loggerhead/changecache.py 2012-02-08 01:55:20 +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, Suite 500, Boston, MA 02110-1335 USA
101 #
102
103 """
104
105=== modified file 'loggerhead/controllers/__init__.py'
106--- loggerhead/controllers/__init__.py 2011-07-07 19:09:11 +0000
107+++ loggerhead/controllers/__init__.py 2012-02-08 01:55:20 +0000
108@@ -15,7 +15,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, Suite 500, Boston, MA 02110-1335 USA
114
115 import bzrlib.errors
116 import simplejson
117
118=== modified file 'loggerhead/controllers/annotate_ui.py'
119--- loggerhead/controllers/annotate_ui.py 2011-08-09 14:06:49 +0000
120+++ loggerhead/controllers/annotate_ui.py 2012-02-08 01:55:20 +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, Suite 500, Boston, MA 02110-1335 USA
127 #
128
129 import itertools
130
131=== modified file 'loggerhead/controllers/atom_ui.py'
132--- loggerhead/controllers/atom_ui.py 2009-07-07 23:52:24 +0000
133+++ loggerhead/controllers/atom_ui.py 2012-02-08 01:55:20 +0000
134@@ -14,7 +14,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, Suite 500, Boston, MA 02110-1335 USA
140 #
141
142 from loggerhead.controllers import TemplatedBranchView
143
144=== modified file 'loggerhead/controllers/changelog_ui.py'
145--- loggerhead/controllers/changelog_ui.py 2011-03-12 13:25:52 +0000
146+++ loggerhead/controllers/changelog_ui.py 2012-02-08 01:55:20 +0000
147@@ -15,7 +15,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, Suite 500, Boston, MA 02110-1335 USA
153 #
154
155 import urllib
156
157=== modified file 'loggerhead/controllers/diff_ui.py'
158--- loggerhead/controllers/diff_ui.py 2011-06-28 16:51:55 +0000
159+++ loggerhead/controllers/diff_ui.py 2012-02-08 01:55:20 +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, Suite 500, Boston, MA 02110-1335 USA
166 #
167
168 from cStringIO import StringIO
169
170=== modified file 'loggerhead/controllers/directory_ui.py'
171--- loggerhead/controllers/directory_ui.py 2012-02-02 07:42:24 +0000
172+++ loggerhead/controllers/directory_ui.py 2012-02-08 01:55:20 +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, Suite 500, Boston, MA 02110-1335 USA
179 #
180
181 import datetime
182
183=== modified file 'loggerhead/controllers/download_ui.py'
184--- loggerhead/controllers/download_ui.py 2011-11-25 01:41:07 +0000
185+++ loggerhead/controllers/download_ui.py 2012-02-08 01:55:20 +0000
186@@ -14,7 +14,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, Suite 500, Boston, MA 02110-1335 USA
192 #
193
194 import logging
195
196=== modified file 'loggerhead/controllers/error_ui.py'
197--- loggerhead/controllers/error_ui.py 2009-10-17 08:47:38 +0000
198+++ loggerhead/controllers/error_ui.py 2012-02-08 01:55:20 +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, Suite 500, Boston, MA 02110-1335 USA
205 #
206
207 from StringIO import StringIO
208
209=== modified file 'loggerhead/controllers/inventory_ui.py'
210--- loggerhead/controllers/inventory_ui.py 2011-06-27 16:30:57 +0000
211+++ loggerhead/controllers/inventory_ui.py 2012-02-08 01:55:20 +0000
212@@ -15,7 +15,7 @@
213 #
214 # You should have received a copy of the GNU General Public License
215 # along with this program; if not, write to the Free Software
216-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
217+# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
218 #
219
220 import logging
221
222=== modified file 'loggerhead/controllers/revision_ui.py'
223--- loggerhead/controllers/revision_ui.py 2011-11-23 08:18:35 +0000
224+++ loggerhead/controllers/revision_ui.py 2012-02-08 01:55:20 +0000
225@@ -14,7 +14,7 @@
226 #
227 # You should have received a copy of the GNU General Public License
228 # along with this program; if not, write to the Free Software
229-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
230+# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
231 #
232
233 import simplejson
234
235=== modified file 'loggerhead/controllers/search_ui.py'
236--- loggerhead/controllers/search_ui.py 2008-12-05 18:52:44 +0000
237+++ loggerhead/controllers/search_ui.py 2012-02-08 01:55:20 +0000
238@@ -13,7 +13,7 @@
239 #
240 # You should have received a copy of the GNU General Public License
241 # along with this program; if not, write to the Free Software
242-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
243+# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
244 #
245
246 from loggerhead.controllers import TemplatedBranchView
247
248=== modified file 'loggerhead/controllers/view_ui.py'
249--- loggerhead/controllers/view_ui.py 2012-02-03 01:25:58 +0000
250+++ loggerhead/controllers/view_ui.py 2012-02-08 01:55:20 +0000
251@@ -14,7 +14,7 @@
252 #
253 # You should have received a copy of the GNU General Public License
254 # along with this program; if not, write to the Free Software
255-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
256+# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
257 #
258
259 import os
260
261=== modified file 'loggerhead/highlight.py'
262--- loggerhead/highlight.py 2010-12-01 08:30:02 +0000
263+++ loggerhead/highlight.py 2012-02-08 01:55:20 +0000
264@@ -13,7 +13,7 @@
265 #
266 # You should have received a copy of the GNU General Public License
267 # along with this program; if not, write to the Free Software
268-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
269+# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
270 #
271
272 import bzrlib.osutils
273
274=== modified file 'loggerhead/history.py'
275--- loggerhead/history.py 2012-01-23 21:10:46 +0000
276+++ loggerhead/history.py 2012-02-08 01:55:20 +0000
277@@ -17,7 +17,7 @@
278 #
279 # You should have received a copy of the GNU General Public License
280 # along with this program; if not, write to the Free Software
281-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
282+# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
283 #
284
285 #
286
287=== modified file 'loggerhead/load_test.py'
288--- loggerhead/load_test.py 2011-03-02 14:07:21 +0000
289+++ loggerhead/load_test.py 2012-02-08 01:55:20 +0000
290@@ -12,7 +12,7 @@
291 #
292 # You should have received a copy of the GNU General Public License
293 # along with this program; if not, write to the Free Software
294-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
295+# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
296
297 """Code to do some load testing against a loggerhead instance.
298
299
300=== modified file 'loggerhead/main.py'
301--- loggerhead/main.py 2011-03-16 11:39:27 +0000
302+++ loggerhead/main.py 2012-02-08 01:55:20 +0000
303@@ -13,7 +13,7 @@
304 #
305 # You should have received a copy of the GNU General Public License
306 # along with this program; if not, write to the Free Software
307-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
308+# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
309
310 """Search for branches underneath a directory and serve them all."""
311
312
313=== modified file 'loggerhead/search.py'
314--- loggerhead/search.py 2009-04-17 03:38:04 +0000
315+++ loggerhead/search.py 2012-02-08 01:55:20 +0000
316@@ -15,7 +15,7 @@
317 #
318 # You should have received a copy of the GNU General Public License
319 # along with this program; if not, write to the Free Software
320-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
321+# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
322 #
323
324 _mod_index = None
325
326=== modified file 'loggerhead/templatefunctions.py'
327--- loggerhead/templatefunctions.py 2011-09-08 00:33:28 +0000
328+++ loggerhead/templatefunctions.py 2012-02-08 01:55:20 +0000
329@@ -11,7 +11,7 @@
330 #
331 # You should have received a copy of the GNU General Public License
332 # along with this program; if not, write to the Free Software
333-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
334+# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
335 #
336
337 import os
338
339=== modified file 'loggerhead/util.py'
340--- loggerhead/util.py 2012-02-02 07:42:24 +0000
341+++ loggerhead/util.py 2012-02-08 01:55:20 +0000
342@@ -16,7 +16,7 @@
343 #
344 # You should have received a copy of the GNU General Public License
345 # along with this program; if not, write to the Free Software
346-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
347+# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
348 #
349
350 import base64
351
352=== modified file 'loggerhead/wholehistory.py'
353--- loggerhead/wholehistory.py 2010-04-26 19:37:26 +0000
354+++ loggerhead/wholehistory.py 2012-02-08 01:55:20 +0000
355@@ -13,7 +13,7 @@
356 #
357 # You should have received a copy of the GNU General Public License
358 # along with this program; if not, write to the Free Software
359-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
360+# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
361 #
362 """Cache the whole history data needed by loggerhead about a branch."""
363
364
365=== modified file 'loggerhead/zptsupport.py'
366--- loggerhead/zptsupport.py 2010-05-12 15:01:44 +0000
367+++ loggerhead/zptsupport.py 2012-02-08 01:55:20 +0000
368@@ -11,7 +11,7 @@
369 #
370 # You should have received a copy of the GNU General Public License
371 # along with this program; if not, write to the Free Software
372-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
373+# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
374 #
375 """Support for Zope Page Templates using the simpletal library."""
376
377
378=== modified file 'serve-branches'
379--- serve-branches 2009-06-26 09:42:43 +0000
380+++ serve-branches 2012-02-08 01:55:20 +0000
381@@ -14,7 +14,7 @@
382 #
383 # You should have received a copy of the GNU General Public License
384 # along with this program; if not, write to the Free Software
385-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
386+# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
387
388 """Search for branches underneath a directory and serve them all."""
389

Subscribers

People subscribed via source and target branches