Merge lp:~clint-fewbar/cobbler/strip-embedded-files into lp:~ubuntu-virt/cobbler/ubuntu
- strip-embedded-files
- Merge into ubuntu
Proposed by
Clint Byrum
Status: | Merged |
---|---|
Merged at revision: | 1974 |
Proposed branch: | lp:~clint-fewbar/cobbler/strip-embedded-files |
Merge into: | lp:~ubuntu-virt/cobbler/ubuntu |
Diff against target: |
326 lines (+299/-0) 2 files modified
debian/copyright (+284/-0) debian/rules (+15/-0) |
To merge this branch: | bzr merge lp:~clint-fewbar/cobbler/strip-embedded-files |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Virtualisation team | Pending | ||
Review via email: mp+46718@code.launchpad.net |
This proposal supersedes a proposal from 2011-01-18.
Commit message
Description of the change
Removes embedded libs that were copied from python from the binary packages and documents their license.
-- Re-targetted at the ubuntu branch instead of trunk
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/copyright' |
2 | --- debian/copyright 2011-01-14 21:15:36 +0000 |
3 | +++ debian/copyright 2011-01-18 23:59:18 +0000 |
4 | @@ -97,6 +97,290 @@ |
5 | Copyright: 2010, Kelsey Hightower |
6 | License: GPL-2+ |
7 | |
8 | +Files: koan/opt_parse.py |
9 | +Comment: Copied from Optik v1.5.3 to support older python releases. Not |
10 | + installed in any binary packages. |
11 | +Copyright: 2001-2006 Gregory P. Ward. |
12 | + 2002-2006 Python Software Foundation |
13 | +License: BSD |
14 | + |
15 | +Files: koan/sub_process.py, cobbler/sub_process.py |
16 | +Comment: Copied from Python 2.4 to support older python releases. Not |
17 | + installed in any binary packages. |
18 | +Copyright: 2003-2005 Peter Astrand <astrand@lysator.liu.se> |
19 | +License: Python |
20 | + A. HISTORY OF THE SOFTWARE |
21 | + ========================== |
22 | + . |
23 | + Python was created in the early 1990s by Guido van Rossum at Stichting |
24 | + Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands |
25 | + as a successor of a language called ABC. Guido remains Python's |
26 | + principal author, although it includes many contributions from others. |
27 | + . |
28 | + In 1995, Guido continued his work on Python at the Corporation for |
29 | + National Research Initiatives (CNRI, see http://www.cnri.reston.va.us) |
30 | + in Reston, Virginia where he released several versions of the |
31 | + software. |
32 | + . |
33 | + In May 2000, Guido and the Python core development team moved to |
34 | + BeOpen.com to form the BeOpen PythonLabs team. In October of the same |
35 | + year, the PythonLabs team moved to Digital Creations (now Zope |
36 | + Corporation, see http://www.zope.com). In 2001, the Python Software |
37 | + Foundation (PSF, see http://www.python.org/psf/) was formed, a |
38 | + non-profit organization created specifically to own Python-related |
39 | + Intellectual Property. Zope Corporation is a sponsoring member of |
40 | + the PSF. |
41 | + . |
42 | + All Python releases are Open Source (see http://www.opensource.org for |
43 | + the Open Source Definition). Historically, most, but not all, Python |
44 | + releases have also been GPL-compatible; the table below summarizes |
45 | + the various releases. |
46 | + . |
47 | + Release Derived Year Owner GPL- |
48 | + from compatible? (1) |
49 | + . |
50 | + 0.9.0 thru 1.2 1991-1995 CWI yes |
51 | + 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes |
52 | + 1.6 1.5.2 2000 CNRI no |
53 | + 2.0 1.6 2000 BeOpen.com no |
54 | + 1.6.1 1.6 2001 CNRI yes (2) |
55 | + 2.1 2.0+1.6.1 2001 PSF no |
56 | + 2.0.1 2.0+1.6.1 2001 PSF yes |
57 | + 2.1.1 2.1+2.0.1 2001 PSF yes |
58 | + 2.2 2.1.1 2001 PSF yes |
59 | + 2.1.2 2.1.1 2002 PSF yes |
60 | + 2.1.3 2.1.2 2002 PSF yes |
61 | + 2.2.1 2.2 2002 PSF yes |
62 | + 2.2.2 2.2.1 2002 PSF yes |
63 | + 2.2.3 2.2.2 2003 PSF yes |
64 | + 2.3 2.2.2 2002-2003 PSF yes |
65 | + 2.3.1 2.3 2002-2003 PSF yes |
66 | + 2.3.2 2.3.1 2002-2003 PSF yes |
67 | + 2.3.3 2.3.2 2002-2003 PSF yes |
68 | + 2.3.4 2.3.3 2004 PSF yes |
69 | + 2.4 2.3 2004 PSF yes |
70 | + . |
71 | + Footnotes: |
72 | + . |
73 | + (1) GPL-compatible doesn't mean that we're distributing Python under |
74 | + the GPL. All Python licenses, unlike the GPL, let you distribute |
75 | + a modified version without making your changes open source. The |
76 | + GPL-compatible licenses make it possible to combine Python with |
77 | + other software that is released under the GPL; the others don't. |
78 | + . |
79 | + (2) According to Richard Stallman, 1.6.1 is not GPL-compatible, |
80 | + because its license has a choice of law clause. According to |
81 | + CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1 |
82 | + is "not incompatible" with the GPL. |
83 | + . |
84 | + Thanks to the many outside volunteers who have worked under Guido's |
85 | + direction to make these releases possible. |
86 | + . |
87 | + . |
88 | + B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON |
89 | + =============================================================== |
90 | + . |
91 | + PSF LICENSE AGREEMENT FOR PYTHON 2.4 |
92 | + ------------------------------------ |
93 | + . |
94 | + 1. This LICENSE AGREEMENT is between the Python Software Foundation |
95 | + ("PSF"), and the Individual or Organization ("Licensee") accessing and |
96 | + otherwise using Python 2.4 software in source or binary form and its |
97 | + associated documentation. |
98 | + . |
99 | + 2. Subject to the terms and conditions of this License Agreement, PSF |
100 | + hereby grants Licensee a nonexclusive, royalty-free, world-wide |
101 | + license to reproduce, analyze, test, perform and/or display publicly, |
102 | + prepare derivative works, distribute, and otherwise use Python 2.4 |
103 | + alone or in any derivative version, provided, however, that PSF's |
104 | + License Agreement and PSF's notice of copyright, i.e., "Copyright (c) |
105 | + 2001, 2002, 2003, 2004 Python Software Foundation; All Rights Reserved" |
106 | + are retained in Python 2.4 alone or in any derivative version prepared |
107 | + by Licensee. |
108 | + . |
109 | + 3. In the event Licensee prepares a derivative work that is based on |
110 | + or incorporates Python 2.4 or any part thereof, and wants to make |
111 | + the derivative work available to others as provided herein, then |
112 | + Licensee hereby agrees to include in any such work a brief summary of |
113 | + the changes made to Python 2.4. |
114 | + . |
115 | + 4. PSF is making Python 2.4 available to Licensee on an "AS IS" |
116 | + basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR |
117 | + IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND |
118 | + DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS |
119 | + FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.4 WILL NOT |
120 | + INFRINGE ANY THIRD PARTY RIGHTS. |
121 | + . |
122 | + 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON |
123 | + 2.4 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS |
124 | + A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.4, |
125 | + OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. |
126 | + . |
127 | + 6. This License Agreement will automatically terminate upon a material |
128 | + breach of its terms and conditions. |
129 | + . |
130 | + 7. Nothing in this License Agreement shall be deemed to create any |
131 | + relationship of agency, partnership, or joint venture between PSF and |
132 | + Licensee. This License Agreement does not grant permission to use PSF |
133 | + trademarks or trade name in a trademark sense to endorse or promote |
134 | + products or services of Licensee, or any third party. |
135 | + . |
136 | + 8. By copying, installing or otherwise using Python 2.4, Licensee |
137 | + agrees to be bound by the terms and conditions of this License |
138 | + Agreement. |
139 | + . |
140 | + . |
141 | + BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 |
142 | + ------------------------------------------- |
143 | + . |
144 | + BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 |
145 | + . |
146 | + 1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an |
147 | + office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the |
148 | + Individual or Organization ("Licensee") accessing and otherwise using |
149 | + this software in source or binary form and its associated |
150 | + documentation ("the Software"). |
151 | + . |
152 | + 2. Subject to the terms and conditions of this BeOpen Python License |
153 | + Agreement, BeOpen hereby grants Licensee a non-exclusive, |
154 | + royalty-free, world-wide license to reproduce, analyze, test, perform |
155 | + and/or display publicly, prepare derivative works, distribute, and |
156 | + otherwise use the Software alone or in any derivative version, |
157 | + provided, however, that the BeOpen Python License is retained in the |
158 | + Software, alone or in any derivative version prepared by Licensee. |
159 | + . |
160 | + 3. BeOpen is making the Software available to Licensee on an "AS IS" |
161 | + basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR |
162 | + IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND |
163 | + DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS |
164 | + FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT |
165 | + INFRINGE ANY THIRD PARTY RIGHTS. |
166 | + . |
167 | + 4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE |
168 | + SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS |
169 | + AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY |
170 | + DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. |
171 | + . |
172 | + 5. This License Agreement will automatically terminate upon a material |
173 | + breach of its terms and conditions. |
174 | + . |
175 | + 6. This License Agreement shall be governed by and interpreted in all |
176 | + respects by the law of the State of California, excluding conflict of |
177 | + law provisions. Nothing in this License Agreement shall be deemed to |
178 | + create any relationship of agency, partnership, or joint venture |
179 | + between BeOpen and Licensee. This License Agreement does not grant |
180 | + permission to use BeOpen trademarks or trade names in a trademark |
181 | + sense to endorse or promote products or services of Licensee, or any |
182 | + third party. As an exception, the "BeOpen Python" logos available at |
183 | + http://www.pythonlabs.com/logos.html may be used according to the |
184 | + permissions granted on that web page. |
185 | + . |
186 | + 7. By copying, installing or otherwise using the software, Licensee |
187 | + agrees to be bound by the terms and conditions of this License |
188 | + Agreement. |
189 | + . |
190 | + . |
191 | + CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 |
192 | + --------------------------------------- |
193 | + . |
194 | + 1. This LICENSE AGREEMENT is between the Corporation for National |
195 | + Research Initiatives, having an office at 1895 Preston White Drive, |
196 | + Reston, VA 20191 ("CNRI"), and the Individual or Organization |
197 | + ("Licensee") accessing and otherwise using Python 1.6.1 software in |
198 | + source or binary form and its associated documentation. |
199 | + . |
200 | + 2. Subject to the terms and conditions of this License Agreement, CNRI |
201 | + hereby grants Licensee a nonexclusive, royalty-free, world-wide |
202 | + license to reproduce, analyze, test, perform and/or display publicly, |
203 | + prepare derivative works, distribute, and otherwise use Python 1.6.1 |
204 | + alone or in any derivative version, provided, however, that CNRI's |
205 | + License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) |
206 | + 1995-2001 Corporation for National Research Initiatives; All Rights |
207 | + Reserved" are retained in Python 1.6.1 alone or in any derivative |
208 | + version prepared by Licensee. Alternately, in lieu of CNRI's License |
209 | + Agreement, Licensee may substitute the following text (omitting the |
210 | + quotes): "Python 1.6.1 is made available subject to the terms and |
211 | + conditions in CNRI's License Agreement. This Agreement together with |
212 | + Python 1.6.1 may be located on the Internet using the following |
213 | + unique, persistent identifier (known as a handle): 1895.22/1013. This |
214 | + Agreement may also be obtained from a proxy server on the Internet |
215 | + using the following URL: http://hdl.handle.net/1895.22/1013". |
216 | + . |
217 | + 3. In the event Licensee prepares a derivative work that is based on |
218 | + or incorporates Python 1.6.1 or any part thereof, and wants to make |
219 | + the derivative work available to others as provided herein, then |
220 | + Licensee hereby agrees to include in any such work a brief summary of |
221 | + the changes made to Python 1.6.1. |
222 | + . |
223 | + 4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" |
224 | + basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR |
225 | + IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND |
226 | + DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS |
227 | + FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT |
228 | + INFRINGE ANY THIRD PARTY RIGHTS. |
229 | + . |
230 | + 5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON |
231 | + 1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS |
232 | + A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, |
233 | + OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. |
234 | + . |
235 | + 6. This License Agreement will automatically terminate upon a material |
236 | + breach of its terms and conditions. |
237 | + . |
238 | + 7. This License Agreement shall be governed by the federal |
239 | + intellectual property law of the United States, including without |
240 | + limitation the federal copyright law, and, to the extent such |
241 | + U.S. federal law does not apply, by the law of the Commonwealth of |
242 | + Virginia, excluding Virginia's conflict of law provisions. |
243 | + Notwithstanding the foregoing, with regard to derivative works based |
244 | + on Python 1.6.1 that incorporate non-separable material that was |
245 | + previously distributed under the GNU General Public License (GPL), the |
246 | + law of the Commonwealth of Virginia shall govern this License |
247 | + Agreement only as to issues arising under or with respect to |
248 | + Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this |
249 | + License Agreement shall be deemed to create any relationship of |
250 | + agency, partnership, or joint venture between CNRI and Licensee. This |
251 | + License Agreement does not grant permission to use CNRI trademarks or |
252 | + trade name in a trademark sense to endorse or promote products or |
253 | + services of Licensee, or any third party. |
254 | + . |
255 | + 8. By clicking on the "ACCEPT" button where indicated, or by copying, |
256 | + installing or otherwise using Python 1.6.1, Licensee agrees to be |
257 | + bound by the terms and conditions of this License Agreement. |
258 | + . |
259 | + ACCEPT |
260 | + . |
261 | + . |
262 | + CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 |
263 | + -------------------------------------------------- |
264 | + . |
265 | + Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, |
266 | + The Netherlands. All rights reserved. |
267 | + . |
268 | + Permission to use, copy, modify, and distribute this software and its |
269 | + documentation for any purpose and without fee is hereby granted, |
270 | + provided that the above copyright notice appear in all copies and that |
271 | + both that copyright notice and this permission notice appear in |
272 | + supporting documentation, and that the name of Stichting Mathematisch |
273 | + Centrum or CWI not be used in advertising or publicity pertaining to |
274 | + distribution of the software without specific, written prior |
275 | + permission. |
276 | + . |
277 | + STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO |
278 | + THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND |
279 | + FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE |
280 | + FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
281 | + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
282 | + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT |
283 | + OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
284 | + |
285 | +Files: koan/text_wrap.py |
286 | +Copyright: 1999-2001 Gregory P. Ward. |
287 | + 2002, 2003 Python Software Foundation |
288 | +Comment: Copied in the same operation as koan/sub_process.py |
289 | +License: Python |
290 | + see above |
291 | + |
292 | Files: web/content/jquery-*.js |
293 | Copyright: 2009 John Resig |
294 | 2009 The Dojo Foundation |
295 | |
296 | === modified file 'debian/rules' |
297 | --- debian/rules 2011-01-18 20:42:10 +0000 |
298 | +++ debian/rules 2011-01-18 23:59:18 +0000 |
299 | @@ -7,12 +7,27 @@ |
300 | dh $@ --with python2,javahelper |
301 | |
302 | override_dh_auto_build: |
303 | + [ -d excluded_files/cobbler ] || mkdir -p excluded_files/cobbler |
304 | + [ -d excluded_files/koan ] || mkdir -p excluded_files/koan |
305 | + mv -f cobbler/sub_process.py excluded_files/cobbler |
306 | + mv -f koan/sub_process.py excluded_files/koan |
307 | + mv -f koan/opt_parse.py excluded_files/koan |
308 | + mv -f koan/text_wrap.py excluded_files/koan |
309 | $(MAKE) |
310 | ant -f cobbler4j/build.xml |
311 | |
312 | override_dh_auto_clean: |
313 | dh_auto_clean |
314 | ant -f cobbler4j/build.xml clean |
315 | + if [ -d excluded_files/cobbler ] ; then \ |
316 | + mv excluded_files/cobbler/* cobbler ;\ |
317 | + fi |
318 | + if [ -d excluded_files/koan ] ; then \ |
319 | + mv excluded_files/koan/* koan ;\ |
320 | + fi |
321 | + if [ -d excluded_files ] ; then \ |
322 | + rm -rf excluded_files ;\ |
323 | + fi |
324 | |
325 | override_dh_auto_test: |
326 | nosetests cobbler/*.py || true |