Merge lp:~dobey/ubuntu-sso-client/setup-license-fix into lp:ubuntu-sso-client

Proposed by dobey
Status: Merged
Merged at revision: 542
Proposed branch: lp:~dobey/ubuntu-sso-client/setup-license-fix
Merge into: lp:ubuntu-sso-client
Diff against target: 1004 lines (+629/-306)
2 files modified
COPYING (+624/-301)
setup.py (+5/-5)
To merge this branch: bzr merge lp:~dobey/ubuntu-sso-client/setup-license-fix
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Rodrigo Moya (community) Approve
Review via email: mp+27735@code.launchpad.net

Commit message

Fix COPYING to be GPLv3
Fix setup.py license block to be GPLv3

To post a comment you must log in.
Revision history for this message
Rodrigo Moya (rodrigo-moya) wrote :

Approved

review: Approve
Revision history for this message
Natalia Bidart (nataliabidart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'COPYING'
2--- COPYING 2010-06-09 21:35:20 +0000
3+++ COPYING 2010-06-16 15:45:41 +0000
4@@ -1,296 +1,626 @@
5-**********************************************************************
6-The following license applies to the Nautilus software but does not
7-apply to the Eazel Trademarks. Please read the TRADEMARK_NOTICE file
8-for licensing information about the Eazel Trademarks.
9-**********************************************************************
10-
11- GNU GENERAL PUBLIC LICENSE
12- Version 2, June 1991
13-
14- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
15- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16+ GNU GENERAL PUBLIC LICENSE
17+ Version 3, 29 June 2007
18+
19+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
20 Everyone is permitted to copy and distribute verbatim copies
21 of this license document, but changing it is not allowed.
22
23- Preamble
24-
25- The licenses for most software are designed to take away your
26-freedom to share and change it. By contrast, the GNU General Public
27-License is intended to guarantee your freedom to share and change free
28-software--to make sure the software is free for all its users. This
29-General Public License applies to most of the Free Software
30-Foundation's software and to any other program whose authors commit to
31-using it. (Some other Free Software Foundation software is covered by
32-the GNU Library General Public License instead.) You can apply it to
33+ Preamble
34+
35+ The GNU General Public License is a free, copyleft license for
36+software and other kinds of works.
37+
38+ The licenses for most software and other practical works are designed
39+to take away your freedom to share and change the works. By contrast,
40+the GNU General Public License is intended to guarantee your freedom to
41+share and change all versions of a program--to make sure it remains free
42+software for all its users. We, the Free Software Foundation, use the
43+GNU General Public License for most of our software; it applies also to
44+any other work released this way by its authors. You can apply it to
45 your programs, too.
46
47 When we speak of free software, we are referring to freedom, not
48 price. Our General Public Licenses are designed to make sure that you
49 have the freedom to distribute copies of free software (and charge for
50-this service if you wish), that you receive source code or can get it
51-if you want it, that you can change the software or use pieces of it
52-in new free programs; and that you know you can do these things.
53+them if you wish), that you receive source code or can get it if you
54+want it, that you can change the software or use pieces of it in new
55+free programs, and that you know you can do these things.
56
57- To protect your rights, we need to make restrictions that forbid
58-anyone to deny you these rights or to ask you to surrender the rights.
59-These restrictions translate to certain responsibilities for you if you
60-distribute copies of the software, or if you modify it.
61+ To protect your rights, we need to prevent others from denying you
62+these rights or asking you to surrender the rights. Therefore, you have
63+certain responsibilities if you distribute copies of the software, or if
64+you modify it: responsibilities to respect the freedom of others.
65
66 For example, if you distribute copies of such a program, whether
67-gratis or for a fee, you must give the recipients all the rights that
68-you have. You must make sure that they, too, receive or can get the
69-source code. And you must show them these terms so they know their
70-rights.
71-
72- We protect your rights with two steps: (1) copyright the software, and
73-(2) offer you this license which gives you legal permission to copy,
74-distribute and/or modify the software.
75-
76- Also, for each author's protection and ours, we want to make certain
77-that everyone understands that there is no warranty for this free
78-software. If the software is modified by someone else and passed on, we
79-want its recipients to know that what they have is not the original, so
80-that any problems introduced by others will not reflect on the original
81-authors' reputations.
82-
83- Finally, any free program is threatened constantly by software
84-patents. We wish to avoid the danger that redistributors of a free
85-program will individually obtain patent licenses, in effect making the
86-program proprietary. To prevent this, we have made it clear that any
87-patent must be licensed for everyone's free use or not licensed at all.
88+gratis or for a fee, you must pass on to the recipients the same
89+freedoms that you received. You must make sure that they, too, receive
90+or can get the source code. And you must show them these terms so they
91+know their rights.
92+
93+ Developers that use the GNU GPL protect your rights with two steps:
94+(1) assert copyright on the software, and (2) offer you this License
95+giving you legal permission to copy, distribute and/or modify it.
96+
97+ For the developers' and authors' protection, the GPL clearly explains
98+that there is no warranty for this free software. For both users' and
99+authors' sake, the GPL requires that modified versions be marked as
100+changed, so that their problems will not be attributed erroneously to
101+authors of previous versions.
102+
103+ Some devices are designed to deny users access to install or run
104+modified versions of the software inside them, although the manufacturer
105+can do so. This is fundamentally incompatible with the aim of
106+protecting users' freedom to change the software. The systematic
107+pattern of such abuse occurs in the area of products for individuals to
108+use, which is precisely where it is most unacceptable. Therefore, we
109+have designed this version of the GPL to prohibit the practice for those
110+products. If such problems arise substantially in other domains, we
111+stand ready to extend this provision to those domains in future versions
112+of the GPL, as needed to protect the freedom of users.
113+
114+ Finally, every program is threatened constantly by software patents.
115+States should not allow patents to restrict development and use of
116+software on general-purpose computers, but in those that do, we wish to
117+avoid the special danger that patents applied to a free program could
118+make it effectively proprietary. To prevent this, the GPL assures that
119+patents cannot be used to render the program non-free.
120
121 The precise terms and conditions for copying, distribution and
122 modification follow.
123
124-
125- GNU GENERAL PUBLIC LICENSE
126- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
127-
128- 0. This License applies to any program or other work which contains
129-a notice placed by the copyright holder saying it may be distributed
130-under the terms of this General Public License. The "Program", below,
131-refers to any such program or work, and a "work based on the Program"
132-means either the Program or any derivative work under copyright law:
133-that is to say, a work containing the Program or a portion of it,
134-either verbatim or with modifications and/or translated into another
135-language. (Hereinafter, translation is included without limitation in
136-the term "modification".) Each licensee is addressed as "you".
137-
138-Activities other than copying, distribution and modification are not
139-covered by this License; they are outside its scope. The act of
140-running the Program is not restricted, and the output from the Program
141-is covered only if its contents constitute a work based on the
142-Program (independent of having been made by running the Program).
143-Whether that is true depends on what the Program does.
144-
145- 1. You may copy and distribute verbatim copies of the Program's
146-source code as you receive it, in any medium, provided that you
147-conspicuously and appropriately publish on each copy an appropriate
148-copyright notice and disclaimer of warranty; keep intact all the
149-notices that refer to this License and to the absence of any warranty;
150-and give any other recipients of the Program a copy of this License
151-along with the Program.
152-
153-You may charge a fee for the physical act of transferring a copy, and
154-you may at your option offer warranty protection in exchange for a fee.
155-
156- 2. You may modify your copy or copies of the Program or any portion
157-of it, thus forming a work based on the Program, and copy and
158-distribute such modifications or work under the terms of Section 1
159-above, provided that you also meet all of these conditions:
160-
161- a) You must cause the modified files to carry prominent notices
162- stating that you changed the files and the date of any change.
163-
164- b) You must cause any work that you distribute or publish, that in
165- whole or in part contains or is derived from the Program or any
166- part thereof, to be licensed as a whole at no charge to all third
167- parties under the terms of this License.
168-
169- c) If the modified program normally reads commands interactively
170- when run, you must cause it, when started running for such
171- interactive use in the most ordinary way, to print or display an
172- announcement including an appropriate copyright notice and a
173- notice that there is no warranty (or else, saying that you provide
174- a warranty) and that users may redistribute the program under
175- these conditions, and telling the user how to view a copy of this
176- License. (Exception: if the Program itself is interactive but
177- does not normally print such an announcement, your work based on
178- the Program is not required to print an announcement.)
179-
180-
181-These requirements apply to the modified work as a whole. If
182-identifiable sections of that work are not derived from the Program,
183-and can be reasonably considered independent and separate works in
184-themselves, then this License, and its terms, do not apply to those
185-sections when you distribute them as separate works. But when you
186-distribute the same sections as part of a whole which is a work based
187-on the Program, the distribution of the whole must be on the terms of
188-this License, whose permissions for other licensees extend to the
189-entire whole, and thus to each and every part regardless of who wrote it.
190-
191-Thus, it is not the intent of this section to claim rights or contest
192-your rights to work written entirely by you; rather, the intent is to
193-exercise the right to control the distribution of derivative or
194-collective works based on the Program.
195-
196-In addition, mere aggregation of another work not based on the Program
197-with the Program (or with a work based on the Program) on a volume of
198-a storage or distribution medium does not bring the other work under
199-the scope of this License.
200-
201- 3. You may copy and distribute the Program (or a work based on it,
202-under Section 2) in object code or executable form under the terms of
203-Sections 1 and 2 above provided that you also do one of the following:
204-
205- a) Accompany it with the complete corresponding machine-readable
206- source code, which must be distributed under the terms of Sections
207- 1 and 2 above on a medium customarily used for software interchange; or,
208-
209- b) Accompany it with a written offer, valid for at least three
210- years, to give any third party, for a charge no more than your
211- cost of physically performing source distribution, a complete
212- machine-readable copy of the corresponding source code, to be
213- distributed under the terms of Sections 1 and 2 above on a medium
214- customarily used for software interchange; or,
215-
216- c) Accompany it with the information you received as to the offer
217- to distribute corresponding source code. (This alternative is
218- allowed only for noncommercial distribution and only if you
219- received the program in object code or executable form with such
220- an offer, in accord with Subsection b above.)
221-
222-The source code for a work means the preferred form of the work for
223-making modifications to it. For an executable work, complete source
224-code means all the source code for all modules it contains, plus any
225-associated interface definition files, plus the scripts used to
226-control compilation and installation of the executable. However, as a
227-special exception, the source code distributed need not include
228-anything that is normally distributed (in either source or binary
229-form) with the major components (compiler, kernel, and so on) of the
230-operating system on which the executable runs, unless that component
231-itself accompanies the executable.
232-
233-If distribution of executable or object code is made by offering
234-access to copy from a designated place, then offering equivalent
235-access to copy the source code from the same place counts as
236-distribution of the source code, even though third parties are not
237-compelled to copy the source along with the object code.
238-
239-
240- 4. You may not copy, modify, sublicense, or distribute the Program
241-except as expressly provided under this License. Any attempt
242-otherwise to copy, modify, sublicense or distribute the Program is
243-void, and will automatically terminate your rights under this License.
244-However, parties who have received copies, or rights, from you under
245-this License will not have their licenses terminated so long as such
246-parties remain in full compliance.
247-
248- 5. You are not required to accept this License, since you have not
249-signed it. However, nothing else grants you permission to modify or
250-distribute the Program or its derivative works. These actions are
251-prohibited by law if you do not accept this License. Therefore, by
252-modifying or distributing the Program (or any work based on the
253-Program), you indicate your acceptance of this License to do so, and
254-all its terms and conditions for copying, distributing or modifying
255-the Program or works based on it.
256-
257- 6. Each time you redistribute the Program (or any work based on the
258-Program), the recipient automatically receives a license from the
259-original licensor to copy, distribute or modify the Program subject to
260-these terms and conditions. You may not impose any further
261-restrictions on the recipients' exercise of the rights granted herein.
262-You are not responsible for enforcing compliance by third parties to
263+ TERMS AND CONDITIONS
264+
265+ 0. Definitions.
266+
267+ "This License" refers to version 3 of the GNU General Public License.
268+
269+ "Copyright" also means copyright-like laws that apply to other kinds of
270+works, such as semiconductor masks.
271+
272+ "The Program" refers to any copyrightable work licensed under this
273+License. Each licensee is addressed as "you". "Licensees" and
274+"recipients" may be individuals or organizations.
275+
276+ To "modify" a work means to copy from or adapt all or part of the work
277+in a fashion requiring copyright permission, other than the making of an
278+exact copy. The resulting work is called a "modified version" of the
279+earlier work or a work "based on" the earlier work.
280+
281+ A "covered work" means either the unmodified Program or a work based
282+on the Program.
283+
284+ To "propagate" a work means to do anything with it that, without
285+permission, would make you directly or secondarily liable for
286+infringement under applicable copyright law, except executing it on a
287+computer or modifying a private copy. Propagation includes copying,
288+distribution (with or without modification), making available to the
289+public, and in some countries other activities as well.
290+
291+ To "convey" a work means any kind of propagation that enables other
292+parties to make or receive copies. Mere interaction with a user through
293+a computer network, with no transfer of a copy, is not conveying.
294+
295+ An interactive user interface displays "Appropriate Legal Notices"
296+to the extent that it includes a convenient and prominently visible
297+feature that (1) displays an appropriate copyright notice, and (2)
298+tells the user that there is no warranty for the work (except to the
299+extent that warranties are provided), that licensees may convey the
300+work under this License, and how to view a copy of this License. If
301+the interface presents a list of user commands or options, such as a
302+menu, a prominent item in the list meets this criterion.
303+
304+ 1. Source Code.
305+
306+ The "source code" for a work means the preferred form of the work
307+for making modifications to it. "Object code" means any non-source
308+form of a work.
309+
310+ A "Standard Interface" means an interface that either is an official
311+standard defined by a recognized standards body, or, in the case of
312+interfaces specified for a particular programming language, one that
313+is widely used among developers working in that language.
314+
315+ The "System Libraries" of an executable work include anything, other
316+than the work as a whole, that (a) is included in the normal form of
317+packaging a Major Component, but which is not part of that Major
318+Component, and (b) serves only to enable use of the work with that
319+Major Component, or to implement a Standard Interface for which an
320+implementation is available to the public in source code form. A
321+"Major Component", in this context, means a major essential component
322+(kernel, window system, and so on) of the specific operating system
323+(if any) on which the executable work runs, or a compiler used to
324+produce the work, or an object code interpreter used to run it.
325+
326+ The "Corresponding Source" for a work in object code form means all
327+the source code needed to generate, install, and (for an executable
328+work) run the object code and to modify the work, including scripts to
329+control those activities. However, it does not include the work's
330+System Libraries, or general-purpose tools or generally available free
331+programs which are used unmodified in performing those activities but
332+which are not part of the work. For example, Corresponding Source
333+includes interface definition files associated with source files for
334+the work, and the source code for shared libraries and dynamically
335+linked subprograms that the work is specifically designed to require,
336+such as by intimate data communication or control flow between those
337+subprograms and other parts of the work.
338+
339+ The Corresponding Source need not include anything that users
340+can regenerate automatically from other parts of the Corresponding
341+Source.
342+
343+ The Corresponding Source for a work in source code form is that
344+same work.
345+
346+ 2. Basic Permissions.
347+
348+ All rights granted under this License are granted for the term of
349+copyright on the Program, and are irrevocable provided the stated
350+conditions are met. This License explicitly affirms your unlimited
351+permission to run the unmodified Program. The output from running a
352+covered work is covered by this License only if the output, given its
353+content, constitutes a covered work. This License acknowledges your
354+rights of fair use or other equivalent, as provided by copyright law.
355+
356+ You may make, run and propagate covered works that you do not
357+convey, without conditions so long as your license otherwise remains
358+in force. You may convey covered works to others for the sole purpose
359+of having them make modifications exclusively for you, or provide you
360+with facilities for running those works, provided that you comply with
361+the terms of this License in conveying all material for which you do
362+not control copyright. Those thus making or running the covered works
363+for you must do so exclusively on your behalf, under your direction
364+and control, on terms that prohibit them from making any copies of
365+your copyrighted material outside their relationship with you.
366+
367+ Conveying under any other circumstances is permitted solely under
368+the conditions stated below. Sublicensing is not allowed; section 10
369+makes it unnecessary.
370+
371+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
372+
373+ No covered work shall be deemed part of an effective technological
374+measure under any applicable law fulfilling obligations under article
375+11 of the WIPO copyright treaty adopted on 20 December 1996, or
376+similar laws prohibiting or restricting circumvention of such
377+measures.
378+
379+ When you convey a covered work, you waive any legal power to forbid
380+circumvention of technological measures to the extent such circumvention
381+is effected by exercising rights under this License with respect to
382+the covered work, and you disclaim any intention to limit operation or
383+modification of the work as a means of enforcing, against the work's
384+users, your or third parties' legal rights to forbid circumvention of
385+technological measures.
386+
387+ 4. Conveying Verbatim Copies.
388+
389+ You may convey verbatim copies of the Program's source code as you
390+receive it, in any medium, provided that you conspicuously and
391+appropriately publish on each copy an appropriate copyright notice;
392+keep intact all notices stating that this License and any
393+non-permissive terms added in accord with section 7 apply to the code;
394+keep intact all notices of the absence of any warranty; and give all
395+recipients a copy of this License along with the Program.
396+
397+ You may charge any price or no price for each copy that you convey,
398+and you may offer support or warranty protection for a fee.
399+
400+ 5. Conveying Modified Source Versions.
401+
402+ You may convey a work based on the Program, or the modifications to
403+produce it from the Program, in the form of source code under the
404+terms of section 4, provided that you also meet all of these conditions:
405+
406+ a) The work must carry prominent notices stating that you modified
407+ it, and giving a relevant date.
408+
409+ b) The work must carry prominent notices stating that it is
410+ released under this License and any conditions added under section
411+ 7. This requirement modifies the requirement in section 4 to
412+ "keep intact all notices".
413+
414+ c) You must license the entire work, as a whole, under this
415+ License to anyone who comes into possession of a copy. This
416+ License will therefore apply, along with any applicable section 7
417+ additional terms, to the whole of the work, and all its parts,
418+ regardless of how they are packaged. This License gives no
419+ permission to license the work in any other way, but it does not
420+ invalidate such permission if you have separately received it.
421+
422+ d) If the work has interactive user interfaces, each must display
423+ Appropriate Legal Notices; however, if the Program has interactive
424+ interfaces that do not display Appropriate Legal Notices, your
425+ work need not make them do so.
426+
427+ A compilation of a covered work with other separate and independent
428+works, which are not by their nature extensions of the covered work,
429+and which are not combined with it such as to form a larger program,
430+in or on a volume of a storage or distribution medium, is called an
431+"aggregate" if the compilation and its resulting copyright are not
432+used to limit the access or legal rights of the compilation's users
433+beyond what the individual works permit. Inclusion of a covered work
434+in an aggregate does not cause this License to apply to the other
435+parts of the aggregate.
436+
437+ 6. Conveying Non-Source Forms.
438+
439+ You may convey a covered work in object code form under the terms
440+of sections 4 and 5, provided that you also convey the
441+machine-readable Corresponding Source under the terms of this License,
442+in one of these ways:
443+
444+ a) Convey the object code in, or embodied in, a physical product
445+ (including a physical distribution medium), accompanied by the
446+ Corresponding Source fixed on a durable physical medium
447+ customarily used for software interchange.
448+
449+ b) Convey the object code in, or embodied in, a physical product
450+ (including a physical distribution medium), accompanied by a
451+ written offer, valid for at least three years and valid for as
452+ long as you offer spare parts or customer support for that product
453+ model, to give anyone who possesses the object code either (1) a
454+ copy of the Corresponding Source for all the software in the
455+ product that is covered by this License, on a durable physical
456+ medium customarily used for software interchange, for a price no
457+ more than your reasonable cost of physically performing this
458+ conveying of source, or (2) access to copy the
459+ Corresponding Source from a network server at no charge.
460+
461+ c) Convey individual copies of the object code with a copy of the
462+ written offer to provide the Corresponding Source. This
463+ alternative is allowed only occasionally and noncommercially, and
464+ only if you received the object code with such an offer, in accord
465+ with subsection 6b.
466+
467+ d) Convey the object code by offering access from a designated
468+ place (gratis or for a charge), and offer equivalent access to the
469+ Corresponding Source in the same way through the same place at no
470+ further charge. You need not require recipients to copy the
471+ Corresponding Source along with the object code. If the place to
472+ copy the object code is a network server, the Corresponding Source
473+ may be on a different server (operated by you or a third party)
474+ that supports equivalent copying facilities, provided you maintain
475+ clear directions next to the object code saying where to find the
476+ Corresponding Source. Regardless of what server hosts the
477+ Corresponding Source, you remain obligated to ensure that it is
478+ available for as long as needed to satisfy these requirements.
479+
480+ e) Convey the object code using peer-to-peer transmission, provided
481+ you inform other peers where the object code and Corresponding
482+ Source of the work are being offered to the general public at no
483+ charge under subsection 6d.
484+
485+ A separable portion of the object code, whose source code is excluded
486+from the Corresponding Source as a System Library, need not be
487+included in conveying the object code work.
488+
489+ A "User Product" is either (1) a "consumer product", which means any
490+tangible personal property which is normally used for personal, family,
491+or household purposes, or (2) anything designed or sold for incorporation
492+into a dwelling. In determining whether a product is a consumer product,
493+doubtful cases shall be resolved in favor of coverage. For a particular
494+product received by a particular user, "normally used" refers to a
495+typical or common use of that class of product, regardless of the status
496+of the particular user or of the way in which the particular user
497+actually uses, or expects or is expected to use, the product. A product
498+is a consumer product regardless of whether the product has substantial
499+commercial, industrial or non-consumer uses, unless such uses represent
500+the only significant mode of use of the product.
501+
502+ "Installation Information" for a User Product means any methods,
503+procedures, authorization keys, or other information required to install
504+and execute modified versions of a covered work in that User Product from
505+a modified version of its Corresponding Source. The information must
506+suffice to ensure that the continued functioning of the modified object
507+code is in no case prevented or interfered with solely because
508+modification has been made.
509+
510+ If you convey an object code work under this section in, or with, or
511+specifically for use in, a User Product, and the conveying occurs as
512+part of a transaction in which the right of possession and use of the
513+User Product is transferred to the recipient in perpetuity or for a
514+fixed term (regardless of how the transaction is characterized), the
515+Corresponding Source conveyed under this section must be accompanied
516+by the Installation Information. But this requirement does not apply
517+if neither you nor any third party retains the ability to install
518+modified object code on the User Product (for example, the work has
519+been installed in ROM).
520+
521+ The requirement to provide Installation Information does not include a
522+requirement to continue to provide support service, warranty, or updates
523+for a work that has been modified or installed by the recipient, or for
524+the User Product in which it has been modified or installed. Access to a
525+network may be denied when the modification itself materially and
526+adversely affects the operation of the network or violates the rules and
527+protocols for communication across the network.
528+
529+ Corresponding Source conveyed, and Installation Information provided,
530+in accord with this section must be in a format that is publicly
531+documented (and with an implementation available to the public in
532+source code form), and must require no special password or key for
533+unpacking, reading or copying.
534+
535+ 7. Additional Terms.
536+
537+ "Additional permissions" are terms that supplement the terms of this
538+License by making exceptions from one or more of its conditions.
539+Additional permissions that are applicable to the entire Program shall
540+be treated as though they were included in this License, to the extent
541+that they are valid under applicable law. If additional permissions
542+apply only to part of the Program, that part may be used separately
543+under those permissions, but the entire Program remains governed by
544+this License without regard to the additional permissions.
545+
546+ When you convey a copy of a covered work, you may at your option
547+remove any additional permissions from that copy, or from any part of
548+it. (Additional permissions may be written to require their own
549+removal in certain cases when you modify the work.) You may place
550+additional permissions on material, added by you to a covered work,
551+for which you have or can give appropriate copyright permission.
552+
553+ Notwithstanding any other provision of this License, for material you
554+add to a covered work, you may (if authorized by the copyright holders of
555+that material) supplement the terms of this License with terms:
556+
557+ a) Disclaiming warranty or limiting liability differently from the
558+ terms of sections 15 and 16 of this License; or
559+
560+ b) Requiring preservation of specified reasonable legal notices or
561+ author attributions in that material or in the Appropriate Legal
562+ Notices displayed by works containing it; or
563+
564+ c) Prohibiting misrepresentation of the origin of that material, or
565+ requiring that modified versions of such material be marked in
566+ reasonable ways as different from the original version; or
567+
568+ d) Limiting the use for publicity purposes of names of licensors or
569+ authors of the material; or
570+
571+ e) Declining to grant rights under trademark law for use of some
572+ trade names, trademarks, or service marks; or
573+
574+ f) Requiring indemnification of licensors and authors of that
575+ material by anyone who conveys the material (or modified versions of
576+ it) with contractual assumptions of liability to the recipient, for
577+ any liability that these contractual assumptions directly impose on
578+ those licensors and authors.
579+
580+ All other non-permissive additional terms are considered "further
581+restrictions" within the meaning of section 10. If the Program as you
582+received it, or any part of it, contains a notice stating that it is
583+governed by this License along with a term that is a further
584+restriction, you may remove that term. If a license document contains
585+a further restriction but permits relicensing or conveying under this
586+License, you may add to a covered work material governed by the terms
587+of that license document, provided that the further restriction does
588+not survive such relicensing or conveying.
589+
590+ If you add terms to a covered work in accord with this section, you
591+must place, in the relevant source files, a statement of the
592+additional terms that apply to those files, or a notice indicating
593+where to find the applicable terms.
594+
595+ Additional terms, permissive or non-permissive, may be stated in the
596+form of a separately written license, or stated as exceptions;
597+the above requirements apply either way.
598+
599+ 8. Termination.
600+
601+ You may not propagate or modify a covered work except as expressly
602+provided under this License. Any attempt otherwise to propagate or
603+modify it is void, and will automatically terminate your rights under
604+this License (including any patent licenses granted under the third
605+paragraph of section 11).
606+
607+ However, if you cease all violation of this License, then your
608+license from a particular copyright holder is reinstated (a)
609+provisionally, unless and until the copyright holder explicitly and
610+finally terminates your license, and (b) permanently, if the copyright
611+holder fails to notify you of the violation by some reasonable means
612+prior to 60 days after the cessation.
613+
614+ Moreover, your license from a particular copyright holder is
615+reinstated permanently if the copyright holder notifies you of the
616+violation by some reasonable means, this is the first time you have
617+received notice of violation of this License (for any work) from that
618+copyright holder, and you cure the violation prior to 30 days after
619+your receipt of the notice.
620+
621+ Termination of your rights under this section does not terminate the
622+licenses of parties who have received copies or rights from you under
623+this License. If your rights have been terminated and not permanently
624+reinstated, you do not qualify to receive new licenses for the same
625+material under section 10.
626+
627+ 9. Acceptance Not Required for Having Copies.
628+
629+ You are not required to accept this License in order to receive or
630+run a copy of the Program. Ancillary propagation of a covered work
631+occurring solely as a consequence of using peer-to-peer transmission
632+to receive a copy likewise does not require acceptance. However,
633+nothing other than this License grants you permission to propagate or
634+modify any covered work. These actions infringe copyright if you do
635+not accept this License. Therefore, by modifying or propagating a
636+covered work, you indicate your acceptance of this License to do so.
637+
638+ 10. Automatic Licensing of Downstream Recipients.
639+
640+ Each time you convey a covered work, the recipient automatically
641+receives a license from the original licensors, to run, modify and
642+propagate that work, subject to this License. You are not responsible
643+for enforcing compliance by third parties with this License.
644+
645+ An "entity transaction" is a transaction transferring control of an
646+organization, or substantially all assets of one, or subdividing an
647+organization, or merging organizations. If propagation of a covered
648+work results from an entity transaction, each party to that
649+transaction who receives a copy of the work also receives whatever
650+licenses to the work the party's predecessor in interest had or could
651+give under the previous paragraph, plus a right to possession of the
652+Corresponding Source of the work from the predecessor in interest, if
653+the predecessor has it or can get it with reasonable efforts.
654+
655+ You may not impose any further restrictions on the exercise of the
656+rights granted or affirmed under this License. For example, you may
657+not impose a license fee, royalty, or other charge for exercise of
658+rights granted under this License, and you may not initiate litigation
659+(including a cross-claim or counterclaim in a lawsuit) alleging that
660+any patent claim is infringed by making, using, selling, offering for
661+sale, or importing the Program or any portion of it.
662+
663+ 11. Patents.
664+
665+ A "contributor" is a copyright holder who authorizes use under this
666+License of the Program or a work on which the Program is based. The
667+work thus licensed is called the contributor's "contributor version".
668+
669+ A contributor's "essential patent claims" are all patent claims
670+owned or controlled by the contributor, whether already acquired or
671+hereafter acquired, that would be infringed by some manner, permitted
672+by this License, of making, using, or selling its contributor version,
673+but do not include claims that would be infringed only as a
674+consequence of further modification of the contributor version. For
675+purposes of this definition, "control" includes the right to grant
676+patent sublicenses in a manner consistent with the requirements of
677 this License.
678
679- 7. If, as a consequence of a court judgment or allegation of patent
680-infringement or for any other reason (not limited to patent issues),
681-conditions are imposed on you (whether by court order, agreement or
682+ Each contributor grants you a non-exclusive, worldwide, royalty-free
683+patent license under the contributor's essential patent claims, to
684+make, use, sell, offer for sale, import and otherwise run, modify and
685+propagate the contents of its contributor version.
686+
687+ In the following three paragraphs, a "patent license" is any express
688+agreement or commitment, however denominated, not to enforce a patent
689+(such as an express permission to practice a patent or covenant not to
690+sue for patent infringement). To "grant" such a patent license to a
691+party means to make such an agreement or commitment not to enforce a
692+patent against the party.
693+
694+ If you convey a covered work, knowingly relying on a patent license,
695+and the Corresponding Source of the work is not available for anyone
696+to copy, free of charge and under the terms of this License, through a
697+publicly available network server or other readily accessible means,
698+then you must either (1) cause the Corresponding Source to be so
699+available, or (2) arrange to deprive yourself of the benefit of the
700+patent license for this particular work, or (3) arrange, in a manner
701+consistent with the requirements of this License, to extend the patent
702+license to downstream recipients. "Knowingly relying" means you have
703+actual knowledge that, but for the patent license, your conveying the
704+covered work in a country, or your recipient's use of the covered work
705+in a country, would infringe one or more identifiable patents in that
706+country that you have reason to believe are valid.
707+
708+ If, pursuant to or in connection with a single transaction or
709+arrangement, you convey, or propagate by procuring conveyance of, a
710+covered work, and grant a patent license to some of the parties
711+receiving the covered work authorizing them to use, propagate, modify
712+or convey a specific copy of the covered work, then the patent license
713+you grant is automatically extended to all recipients of the covered
714+work and works based on it.
715+
716+ A patent license is "discriminatory" if it does not include within
717+the scope of its coverage, prohibits the exercise of, or is
718+conditioned on the non-exercise of one or more of the rights that are
719+specifically granted under this License. You may not convey a covered
720+work if you are a party to an arrangement with a third party that is
721+in the business of distributing software, under which you make payment
722+to the third party based on the extent of your activity of conveying
723+the work, and under which the third party grants, to any of the
724+parties who would receive the covered work from you, a discriminatory
725+patent license (a) in connection with copies of the covered work
726+conveyed by you (or copies made from those copies), or (b) primarily
727+for and in connection with specific products or compilations that
728+contain the covered work, unless you entered into that arrangement,
729+or that patent license was granted, prior to 28 March 2007.
730+
731+ Nothing in this License shall be construed as excluding or limiting
732+any implied license or other defenses to infringement that may
733+otherwise be available to you under applicable patent law.
734+
735+ 12. No Surrender of Others' Freedom.
736+
737+ If conditions are imposed on you (whether by court order, agreement or
738 otherwise) that contradict the conditions of this License, they do not
739-excuse you from the conditions of this License. If you cannot
740-distribute so as to satisfy simultaneously your obligations under this
741-License and any other pertinent obligations, then as a consequence you
742-may not distribute the Program at all. For example, if a patent
743-license would not permit royalty-free redistribution of the Program by
744-all those who receive copies directly or indirectly through you, then
745-the only way you could satisfy both it and this License would be to
746-refrain entirely from distribution of the Program.
747-
748-If any portion of this section is held invalid or unenforceable under
749-any particular circumstance, the balance of the section is intended to
750-apply and the section as a whole is intended to apply in other
751-circumstances.
752-
753-It is not the purpose of this section to induce you to infringe any
754-patents or other property right claims or to contest validity of any
755-such claims; this section has the sole purpose of protecting the
756-integrity of the free software distribution system, which is
757-implemented by public license practices. Many people have made
758-generous contributions to the wide range of software distributed
759-through that system in reliance on consistent application of that
760-system; it is up to the author/donor to decide if he or she is willing
761-to distribute software through any other system and a licensee cannot
762-impose that choice.
763-
764-This section is intended to make thoroughly clear what is believed to
765-be a consequence of the rest of this License.
766-
767-
768- 8. If the distribution and/or use of the Program is restricted in
769-certain countries either by patents or by copyrighted interfaces, the
770-original copyright holder who places the Program under this License
771-may add an explicit geographical distribution limitation excluding
772-those countries, so that distribution is permitted only in or among
773-countries not thus excluded. In such case, this License incorporates
774-the limitation as if written in the body of this License.
775-
776- 9. The Free Software Foundation may publish revised and/or new versions
777-of the General Public License from time to time. Such new versions will
778+excuse you from the conditions of this License. If you cannot convey a
779+covered work so as to satisfy simultaneously your obligations under this
780+License and any other pertinent obligations, then as a consequence you may
781+not convey it at all. For example, if you agree to terms that obligate you
782+to collect a royalty for further conveying from those to whom you convey
783+the Program, the only way you could satisfy both those terms and this
784+License would be to refrain entirely from conveying the Program.
785+
786+ 13. Use with the GNU Affero General Public License.
787+
788+ Notwithstanding any other provision of this License, you have
789+permission to link or combine any covered work with a work licensed
790+under version 3 of the GNU Affero General Public License into a single
791+combined work, and to convey the resulting work. The terms of this
792+License will continue to apply to the part which is the covered work,
793+but the special requirements of the GNU Affero General Public License,
794+section 13, concerning interaction through a network will apply to the
795+combination as such.
796+
797+ 14. Revised Versions of this License.
798+
799+ The Free Software Foundation may publish revised and/or new versions of
800+the GNU General Public License from time to time. Such new versions will
801 be similar in spirit to the present version, but may differ in detail to
802 address new problems or concerns.
803
804-Each version is given a distinguishing version number. If the Program
805-specifies a version number of this License which applies to it and "any
806-later version", you have the option of following the terms and conditions
807-either of that version or of any later version published by the Free
808-Software Foundation. If the Program does not specify a version number of
809-this License, you may choose any version ever published by the Free Software
810-Foundation.
811-
812- 10. If you wish to incorporate parts of the Program into other free
813-programs whose distribution conditions are different, write to the author
814-to ask for permission. For software which is copyrighted by the Free
815-Software Foundation, write to the Free Software Foundation; we sometimes
816-make exceptions for this. Our decision will be guided by the two goals
817-of preserving the free status of all derivatives of our free software and
818-of promoting the sharing and reuse of software generally.
819-
820- NO WARRANTY
821-
822- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
823-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
824-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
825-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
826-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
827-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
828-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
829-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
830-REPAIR OR CORRECTION.
831-
832- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
833-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
834-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
835-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
836-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
837-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
838-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
839-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
840-POSSIBILITY OF SUCH DAMAGES.
841-
842- END OF TERMS AND CONDITIONS
843-
844-
845- How to Apply These Terms to Your New Programs
846+ Each version is given a distinguishing version number. If the
847+Program specifies that a certain numbered version of the GNU General
848+Public License "or any later version" applies to it, you have the
849+option of following the terms and conditions either of that numbered
850+version or of any later version published by the Free Software
851+Foundation. If the Program does not specify a version number of the
852+GNU General Public License, you may choose any version ever published
853+by the Free Software Foundation.
854+
855+ If the Program specifies that a proxy can decide which future
856+versions of the GNU General Public License can be used, that proxy's
857+public statement of acceptance of a version permanently authorizes you
858+to choose that version for the Program.
859+
860+ Later license versions may give you additional or different
861+permissions. However, no additional obligations are imposed on any
862+author or copyright holder as a result of your choosing to follow a
863+later version.
864+
865+ 15. Disclaimer of Warranty.
866+
867+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
868+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
869+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
870+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
871+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
872+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
873+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
874+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
875+
876+ 16. Limitation of Liability.
877+
878+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
879+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
880+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
881+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
882+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
883+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
884+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
885+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
886+SUCH DAMAGES.
887+
888+ 17. Interpretation of Sections 15 and 16.
889+
890+ If the disclaimer of warranty and limitation of liability provided
891+above cannot be given local legal effect according to their terms,
892+reviewing courts shall apply local law that most closely approximates
893+an absolute waiver of all civil liability in connection with the
894+Program, unless a warranty or assumption of liability accompanies a
895+copy of the Program in return for a fee.
896+
897+ END OF TERMS AND CONDITIONS
898+
899+ How to Apply These Terms to Your New Programs
900
901 If you develop a new program, and you want it to be of the greatest
902 possible use to the public, the best way to achieve this is to make it
903@@ -298,15 +628,15 @@
904
905 To do so, attach the following notices to the program. It is safest
906 to attach them to the start of each source file to most effectively
907-convey the exclusion of warranty; and each file should have at least
908+state the exclusion of warranty; and each file should have at least
909 the "copyright" line and a pointer to where the full notice is found.
910
911 <one line to give the program's name and a brief idea of what it does.>
912 Copyright (C) <year> <name of author>
913
914- This program is free software; you can redistribute it and/or modify
915+ This program is free software: you can redistribute it and/or modify
916 it under the terms of the GNU General Public License as published by
917- the Free Software Foundation; either version 2 of the License, or
918+ the Free Software Foundation, either version 3 of the License, or
919 (at your option) any later version.
920
921 This program is distributed in the hope that it will be useful,
922@@ -315,37 +645,30 @@
923 GNU General Public License for more details.
924
925 You should have received a copy of the GNU General Public License
926- along with this program; if not, write to the Free Software
927- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
928-
929+ along with this program. If not, see <http://www.gnu.org/licenses/>.
930
931 Also add information on how to contact you by electronic and paper mail.
932
933-If the program is interactive, make it output a short notice like this
934-when it starts in an interactive mode:
935+ If the program does terminal interaction, make it output a short
936+notice like this when it starts in an interactive mode:
937
938- Gnomovision version 69, Copyright (C) year name of author
939- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
940+ <program> Copyright (C) <year> <name of author>
941+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
942 This is free software, and you are welcome to redistribute it
943 under certain conditions; type `show c' for details.
944
945 The hypothetical commands `show w' and `show c' should show the appropriate
946-parts of the General Public License. Of course, the commands you use may
947-be called something other than `show w' and `show c'; they could even be
948-mouse-clicks or menu items--whatever suits your program.
949-
950-You should also get your employer (if you work as a programmer) or your
951-school, if any, to sign a "copyright disclaimer" for the program, if
952-necessary. Here is a sample; alter the names:
953-
954- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
955- `Gnomovision' (which makes passes at compilers) written by James Hacker.
956-
957- <signature of Ty Coon>, 1 April 1989
958- Ty Coon, President of Vice
959-
960-This General Public License does not permit incorporating your program into
961-proprietary programs. If your program is a subroutine library, you may
962-consider it more useful to permit linking proprietary applications with the
963-library. If this is what you want to do, use the GNU Library General
964-Public License instead of this License.
965+parts of the General Public License. Of course, your program's commands
966+might be different; for a GUI interface, you would use an "about box".
967+
968+ You should also get your employer (if you work as a programmer) or school,
969+if any, to sign a "copyright disclaimer" for the program, if necessary.
970+For more information on this, and how to apply and follow the GNU GPL, see
971+<http://www.gnu.org/licenses/>.
972+
973+ The GNU General Public License does not permit incorporating your program
974+into proprietary programs. If your program is a subroutine library, you
975+may consider it more useful to permit linking proprietary applications with
976+the library. If this is what you want to do, use the GNU Lesser General
977+Public License instead of this License. But first, please read
978+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
979
980=== modified file 'setup.py'
981--- setup.py 2010-06-15 11:42:18 +0000
982+++ setup.py 2010-06-16 15:45:41 +0000
983@@ -4,16 +4,16 @@
984 # Copyright 2010 Canonical Ltd.
985 #
986 # This program is free software: you can redistribute it and/or modify it
987-# under the terms of the GNU Affero General Public License version 3,
988-# as published by the Free Software Foundation.
989+# under the terms of the GNU General Public License version 3, as published
990+# by the Free Software Foundation.
991 #
992 # This program is distributed in the hope that it will be useful, but
993 # WITHOUT ANY WARRANTY; without even the implied warranties of
994 # MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
995-# PURPOSE. See the GNU Affero General Public License for more details.
996+# PURPOSE. See the GNU General Public License for more details.
997 #
998-# You should have received a copy of the GNU Affero General Public License
999-# along with this program. If not, see <http://www.gnu.org/licenses/>.
1000+# You should have received a copy of the GNU General Public License along
1001+# with this program. If not, see <http://www.gnu.org/licenses/>.
1002 """setup.py"""
1003
1004 import os

Subscribers

People subscribed via source and target branches