Merge lp:~ted/indicator-me/distro-comments into lp:indicator-me
- distro-comments
- Merge into trunk
Proposed by
Ted Gould
Status: | Merged |
---|---|
Merged at revision: | not available |
Proposed branch: | lp:~ted/indicator-me/distro-comments |
Merge into: | lp:indicator-me |
Diff against target: |
546 lines (+8/-496) 4 files modified
.bzrignore (+1/-0) COPYING.LGPL (+0/-481) configure.ac (+5/-13) src/Makefile.am (+2/-2) |
To merge this branch: | bzr merge lp:~ted/indicator-me/distro-comments |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Cody Russell (community) | Approve | ||
Review via email:
|
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ted Gould (ted) wrote : | # |
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Cody Russell (bratsche) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file '.bzrignore' |
2 | --- .bzrignore 2010-01-03 02:15:48 +0000 |
3 | +++ .bzrignore 2010-01-11 16:50:24 +0000 |
4 | @@ -23,6 +23,7 @@ |
5 | indicator-session.service |
6 | indicator-status.service |
7 | indicator-users.service |
8 | +indicator-me.service |
9 | status-service-client.h |
10 | status-service-server.h |
11 | debian/indicator-fusa |
12 | |
13 | === removed file 'COPYING.LGPL' |
14 | --- COPYING.LGPL 2009-08-11 13:26:25 +0000 |
15 | +++ COPYING.LGPL 1970-01-01 00:00:00 +0000 |
16 | @@ -1,481 +0,0 @@ |
17 | - GNU LIBRARY GENERAL PUBLIC LICENSE |
18 | - Version 2, June 1991 |
19 | - |
20 | - Copyright (C) 1991 Free Software Foundation, Inc. |
21 | - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
22 | - Everyone is permitted to copy and distribute verbatim copies |
23 | - of this license document, but changing it is not allowed. |
24 | - |
25 | -[This is the first released version of the library GPL. It is |
26 | - numbered 2 because it goes with version 2 of the ordinary GPL.] |
27 | - |
28 | - Preamble |
29 | - |
30 | - The licenses for most software are designed to take away your |
31 | -freedom to share and change it. By contrast, the GNU General Public |
32 | -Licenses are intended to guarantee your freedom to share and change |
33 | -free software--to make sure the software is free for all its users. |
34 | - |
35 | - This license, the Library General Public License, applies to some |
36 | -specially designated Free Software Foundation software, and to any |
37 | -other libraries whose authors decide to use it. You can use it for |
38 | -your libraries, too. |
39 | - |
40 | - When we speak of free software, we are referring to freedom, not |
41 | -price. Our General Public Licenses are designed to make sure that you |
42 | -have the freedom to distribute copies of free software (and charge for |
43 | -this service if you wish), that you receive source code or can get it |
44 | -if you want it, that you can change the software or use pieces of it |
45 | -in new free programs; and that you know you can do these things. |
46 | - |
47 | - To protect your rights, we need to make restrictions that forbid |
48 | -anyone to deny you these rights or to ask you to surrender the rights. |
49 | -These restrictions translate to certain responsibilities for you if |
50 | -you distribute copies of the library, or if you modify it. |
51 | - |
52 | - For example, if you distribute copies of the library, whether gratis |
53 | -or for a fee, you must give the recipients all the rights that we gave |
54 | -you. You must make sure that they, too, receive or can get the source |
55 | -code. If you link a program with the library, you must provide |
56 | -complete object files to the recipients so that they can relink them |
57 | -with the library, after making changes to the library and recompiling |
58 | -it. And you must show them these terms so they know their rights. |
59 | - |
60 | - Our method of protecting your rights has two steps: (1) copyright |
61 | -the library, and (2) offer you this license which gives you legal |
62 | -permission to copy, distribute and/or modify the library. |
63 | - |
64 | - Also, for each distributor's protection, we want to make certain |
65 | -that everyone understands that there is no warranty for this free |
66 | -library. If the library is modified by someone else and passed on, we |
67 | -want its recipients to know that what they have is not the original |
68 | -version, so that any problems introduced by others will not reflect on |
69 | -the original authors' reputations. |
70 | - |
71 | |
72 | - Finally, any free program is threatened constantly by software |
73 | -patents. We wish to avoid the danger that companies distributing free |
74 | -software will individually obtain patent licenses, thus in effect |
75 | -transforming the program into proprietary software. To prevent this, |
76 | -we have made it clear that any patent must be licensed for everyone's |
77 | -free use or not licensed at all. |
78 | - |
79 | - Most GNU software, including some libraries, is covered by the ordinary |
80 | -GNU General Public License, which was designed for utility programs. This |
81 | -license, the GNU Library General Public License, applies to certain |
82 | -designated libraries. This license is quite different from the ordinary |
83 | -one; be sure to read it in full, and don't assume that anything in it is |
84 | -the same as in the ordinary license. |
85 | - |
86 | - The reason we have a separate public license for some libraries is that |
87 | -they blur the distinction we usually make between modifying or adding to a |
88 | -program and simply using it. Linking a program with a library, without |
89 | -changing the library, is in some sense simply using the library, and is |
90 | -analogous to running a utility program or application program. However, in |
91 | -a textual and legal sense, the linked executable is a combined work, a |
92 | -derivative of the original library, and the ordinary General Public License |
93 | -treats it as such. |
94 | - |
95 | - Because of this blurred distinction, using the ordinary General |
96 | -Public License for libraries did not effectively promote software |
97 | -sharing, because most developers did not use the libraries. We |
98 | -concluded that weaker conditions might promote sharing better. |
99 | - |
100 | - However, unrestricted linking of non-free programs would deprive the |
101 | -users of those programs of all benefit from the free status of the |
102 | -libraries themselves. This Library General Public License is intended to |
103 | -permit developers of non-free programs to use free libraries, while |
104 | -preserving your freedom as a user of such programs to change the free |
105 | -libraries that are incorporated in them. (We have not seen how to achieve |
106 | -this as regards changes in header files, but we have achieved it as regards |
107 | -changes in the actual functions of the Library.) The hope is that this |
108 | -will lead to faster development of free libraries. |
109 | - |
110 | - The precise terms and conditions for copying, distribution and |
111 | -modification follow. Pay close attention to the difference between a |
112 | -"work based on the library" and a "work that uses the library". The |
113 | -former contains code derived from the library, while the latter only |
114 | -works together with the library. |
115 | - |
116 | - Note that it is possible for a library to be covered by the ordinary |
117 | -General Public License rather than by this special one. |
118 | - |
119 | |
120 | - GNU LIBRARY GENERAL PUBLIC LICENSE |
121 | - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION |
122 | - |
123 | - 0. This License Agreement applies to any software library which |
124 | -contains a notice placed by the copyright holder or other authorized |
125 | -party saying it may be distributed under the terms of this Library |
126 | -General Public License (also called "this License"). Each licensee is |
127 | -addressed as "you". |
128 | - |
129 | - A "library" means a collection of software functions and/or data |
130 | -prepared so as to be conveniently linked with application programs |
131 | -(which use some of those functions and data) to form executables. |
132 | - |
133 | - The "Library", below, refers to any such software library or work |
134 | -which has been distributed under these terms. A "work based on the |
135 | -Library" means either the Library or any derivative work under |
136 | -copyright law: that is to say, a work containing the Library or a |
137 | -portion of it, either verbatim or with modifications and/or translated |
138 | -straightforwardly into another language. (Hereinafter, translation is |
139 | -included without limitation in the term "modification".) |
140 | - |
141 | - "Source code" for a work means the preferred form of the work for |
142 | -making modifications to it. For a library, complete source code means |
143 | -all the source code for all modules it contains, plus any associated |
144 | -interface definition files, plus the scripts used to control compilation |
145 | -and installation of the library. |
146 | - |
147 | - Activities other than copying, distribution and modification are not |
148 | -covered by this License; they are outside its scope. The act of |
149 | -running a program using the Library is not restricted, and output from |
150 | -such a program is covered only if its contents constitute a work based |
151 | -on the Library (independent of the use of the Library in a tool for |
152 | -writing it). Whether that is true depends on what the Library does |
153 | -and what the program that uses the Library does. |
154 | - |
155 | - 1. You may copy and distribute verbatim copies of the Library's |
156 | -complete source code as you receive it, in any medium, provided that |
157 | -you conspicuously and appropriately publish on each copy an |
158 | -appropriate copyright notice and disclaimer of warranty; keep intact |
159 | -all the notices that refer to this License and to the absence of any |
160 | -warranty; and distribute a copy of this License along with the |
161 | -Library. |
162 | - |
163 | - You may charge a fee for the physical act of transferring a copy, |
164 | -and you may at your option offer warranty protection in exchange for a |
165 | -fee. |
166 | - |
167 | |
168 | - 2. You may modify your copy or copies of the Library or any portion |
169 | -of it, thus forming a work based on the Library, and copy and |
170 | -distribute such modifications or work under the terms of Section 1 |
171 | -above, provided that you also meet all of these conditions: |
172 | - |
173 | - a) The modified work must itself be a software library. |
174 | - |
175 | - b) You must cause the files modified to carry prominent notices |
176 | - stating that you changed the files and the date of any change. |
177 | - |
178 | - c) You must cause the whole of the work to be licensed at no |
179 | - charge to all third parties under the terms of this License. |
180 | - |
181 | - d) If a facility in the modified Library refers to a function or a |
182 | - table of data to be supplied by an application program that uses |
183 | - the facility, other than as an argument passed when the facility |
184 | - is invoked, then you must make a good faith effort to ensure that, |
185 | - in the event an application does not supply such function or |
186 | - table, the facility still operates, and performs whatever part of |
187 | - its purpose remains meaningful. |
188 | - |
189 | - (For example, a function in a library to compute square roots has |
190 | - a purpose that is entirely well-defined independent of the |
191 | - application. Therefore, Subsection 2d requires that any |
192 | - application-supplied function or table used by this function must |
193 | - be optional: if the application does not supply it, the square |
194 | - root function must still compute square roots.) |
195 | - |
196 | -These requirements apply to the modified work as a whole. If |
197 | -identifiable sections of that work are not derived from the Library, |
198 | -and can be reasonably considered independent and separate works in |
199 | -themselves, then this License, and its terms, do not apply to those |
200 | -sections when you distribute them as separate works. But when you |
201 | -distribute the same sections as part of a whole which is a work based |
202 | -on the Library, the distribution of the whole must be on the terms of |
203 | -this License, whose permissions for other licensees extend to the |
204 | -entire whole, and thus to each and every part regardless of who wrote |
205 | -it. |
206 | - |
207 | -Thus, it is not the intent of this section to claim rights or contest |
208 | -your rights to work written entirely by you; rather, the intent is to |
209 | -exercise the right to control the distribution of derivative or |
210 | -collective works based on the Library. |
211 | - |
212 | -In addition, mere aggregation of another work not based on the Library |
213 | -with the Library (or with a work based on the Library) on a volume of |
214 | -a storage or distribution medium does not bring the other work under |
215 | -the scope of this License. |
216 | - |
217 | - 3. You may opt to apply the terms of the ordinary GNU General Public |
218 | -License instead of this License to a given copy of the Library. To do |
219 | -this, you must alter all the notices that refer to this License, so |
220 | -that they refer to the ordinary GNU General Public License, version 2, |
221 | -instead of to this License. (If a newer version than version 2 of the |
222 | -ordinary GNU General Public License has appeared, then you can specify |
223 | -that version instead if you wish.) Do not make any other change in |
224 | -these notices. |
225 | - |
226 | |
227 | - Once this change is made in a given copy, it is irreversible for |
228 | -that copy, so the ordinary GNU General Public License applies to all |
229 | -subsequent copies and derivative works made from that copy. |
230 | - |
231 | - This option is useful when you wish to copy part of the code of |
232 | -the Library into a program that is not a library. |
233 | - |
234 | - 4. You may copy and distribute the Library (or a portion or |
235 | -derivative of it, under Section 2) in object code or executable form |
236 | -under the terms of Sections 1 and 2 above provided that you accompany |
237 | -it with the complete corresponding machine-readable source code, which |
238 | -must be distributed under the terms of Sections 1 and 2 above on a |
239 | -medium customarily used for software interchange. |
240 | - |
241 | - If distribution of object code is made by offering access to copy |
242 | -from a designated place, then offering equivalent access to copy the |
243 | -source code from the same place satisfies the requirement to |
244 | -distribute the source code, even though third parties are not |
245 | -compelled to copy the source along with the object code. |
246 | - |
247 | - 5. A program that contains no derivative of any portion of the |
248 | -Library, but is designed to work with the Library by being compiled or |
249 | -linked with it, is called a "work that uses the Library". Such a |
250 | -work, in isolation, is not a derivative work of the Library, and |
251 | -therefore falls outside the scope of this License. |
252 | - |
253 | - However, linking a "work that uses the Library" with the Library |
254 | -creates an executable that is a derivative of the Library (because it |
255 | -contains portions of the Library), rather than a "work that uses the |
256 | -library". The executable is therefore covered by this License. |
257 | -Section 6 states terms for distribution of such executables. |
258 | - |
259 | - When a "work that uses the Library" uses material from a header file |
260 | -that is part of the Library, the object code for the work may be a |
261 | -derivative work of the Library even though the source code is not. |
262 | -Whether this is true is especially significant if the work can be |
263 | -linked without the Library, or if the work is itself a library. The |
264 | -threshold for this to be true is not precisely defined by law. |
265 | - |
266 | - If such an object file uses only numerical parameters, data |
267 | -structure layouts and accessors, and small macros and small inline |
268 | -functions (ten lines or less in length), then the use of the object |
269 | -file is unrestricted, regardless of whether it is legally a derivative |
270 | -work. (Executables containing this object code plus portions of the |
271 | -Library will still fall under Section 6.) |
272 | - |
273 | - Otherwise, if the work is a derivative of the Library, you may |
274 | -distribute the object code for the work under the terms of Section 6. |
275 | -Any executables containing that work also fall under Section 6, |
276 | -whether or not they are linked directly with the Library itself. |
277 | - |
278 | |
279 | - 6. As an exception to the Sections above, you may also compile or |
280 | -link a "work that uses the Library" with the Library to produce a |
281 | -work containing portions of the Library, and distribute that work |
282 | -under terms of your choice, provided that the terms permit |
283 | -modification of the work for the customer's own use and reverse |
284 | -engineering for debugging such modifications. |
285 | - |
286 | - You must give prominent notice with each copy of the work that the |
287 | -Library is used in it and that the Library and its use are covered by |
288 | -this License. You must supply a copy of this License. If the work |
289 | -during execution displays copyright notices, you must include the |
290 | -copyright notice for the Library among them, as well as a reference |
291 | -directing the user to the copy of this License. Also, you must do one |
292 | -of these things: |
293 | - |
294 | - a) Accompany the work with the complete corresponding |
295 | - machine-readable source code for the Library including whatever |
296 | - changes were used in the work (which must be distributed under |
297 | - Sections 1 and 2 above); and, if the work is an executable linked |
298 | - with the Library, with the complete machine-readable "work that |
299 | - uses the Library", as object code and/or source code, so that the |
300 | - user can modify the Library and then relink to produce a modified |
301 | - executable containing the modified Library. (It is understood |
302 | - that the user who changes the contents of definitions files in the |
303 | - Library will not necessarily be able to recompile the application |
304 | - to use the modified definitions.) |
305 | - |
306 | - b) Accompany the work with a written offer, valid for at |
307 | - least three years, to give the same user the materials |
308 | - specified in Subsection 6a, above, for a charge no more |
309 | - than the cost of performing this distribution. |
310 | - |
311 | - c) If distribution of the work is made by offering access to copy |
312 | - from a designated place, offer equivalent access to copy the above |
313 | - specified materials from the same place. |
314 | - |
315 | - d) Verify that the user has already received a copy of these |
316 | - materials or that you have already sent this user a copy. |
317 | - |
318 | - For an executable, the required form of the "work that uses the |
319 | -Library" must include any data and utility programs needed for |
320 | -reproducing the executable from it. However, as a special exception, |
321 | -the source code distributed need not include anything that is normally |
322 | -distributed (in either source or binary form) with the major |
323 | -components (compiler, kernel, and so on) of the operating system on |
324 | -which the executable runs, unless that component itself accompanies |
325 | -the executable. |
326 | - |
327 | - It may happen that this requirement contradicts the license |
328 | -restrictions of other proprietary libraries that do not normally |
329 | -accompany the operating system. Such a contradiction means you cannot |
330 | -use both them and the Library together in an executable that you |
331 | -distribute. |
332 | - |
333 | |
334 | - 7. You may place library facilities that are a work based on the |
335 | -Library side-by-side in a single library together with other library |
336 | -facilities not covered by this License, and distribute such a combined |
337 | -library, provided that the separate distribution of the work based on |
338 | -the Library and of the other library facilities is otherwise |
339 | -permitted, and provided that you do these two things: |
340 | - |
341 | - a) Accompany the combined library with a copy of the same work |
342 | - based on the Library, uncombined with any other library |
343 | - facilities. This must be distributed under the terms of the |
344 | - Sections above. |
345 | - |
346 | - b) Give prominent notice with the combined library of the fact |
347 | - that part of it is a work based on the Library, and explaining |
348 | - where to find the accompanying uncombined form of the same work. |
349 | - |
350 | - 8. You may not copy, modify, sublicense, link with, or distribute |
351 | -the Library except as expressly provided under this License. Any |
352 | -attempt otherwise to copy, modify, sublicense, link with, or |
353 | -distribute the Library is void, and will automatically terminate your |
354 | -rights under this License. However, parties who have received copies, |
355 | -or rights, from you under this License will not have their licenses |
356 | -terminated so long as such parties remain in full compliance. |
357 | - |
358 | - 9. You are not required to accept this License, since you have not |
359 | -signed it. However, nothing else grants you permission to modify or |
360 | -distribute the Library or its derivative works. These actions are |
361 | -prohibited by law if you do not accept this License. Therefore, by |
362 | -modifying or distributing the Library (or any work based on the |
363 | -Library), you indicate your acceptance of this License to do so, and |
364 | -all its terms and conditions for copying, distributing or modifying |
365 | -the Library or works based on it. |
366 | - |
367 | - 10. Each time you redistribute the Library (or any work based on the |
368 | -Library), the recipient automatically receives a license from the |
369 | -original licensor to copy, distribute, link with or modify the Library |
370 | -subject to these terms and conditions. You may not impose any further |
371 | -restrictions on the recipients' exercise of the rights granted herein. |
372 | -You are not responsible for enforcing compliance by third parties to |
373 | -this License. |
374 | - |
375 | |
376 | - 11. If, as a consequence of a court judgment or allegation of patent |
377 | -infringement or for any other reason (not limited to patent issues), |
378 | -conditions are imposed on you (whether by court order, agreement or |
379 | -otherwise) that contradict the conditions of this License, they do not |
380 | -excuse you from the conditions of this License. If you cannot |
381 | -distribute so as to satisfy simultaneously your obligations under this |
382 | -License and any other pertinent obligations, then as a consequence you |
383 | -may not distribute the Library at all. For example, if a patent |
384 | -license would not permit royalty-free redistribution of the Library by |
385 | -all those who receive copies directly or indirectly through you, then |
386 | -the only way you could satisfy both it and this License would be to |
387 | -refrain entirely from distribution of the Library. |
388 | - |
389 | -If any portion of this section is held invalid or unenforceable under any |
390 | -particular circumstance, the balance of the section is intended to apply, |
391 | -and the section as a whole is intended to apply in other circumstances. |
392 | - |
393 | -It is not the purpose of this section to induce you to infringe any |
394 | -patents or other property right claims or to contest validity of any |
395 | -such claims; this section has the sole purpose of protecting the |
396 | -integrity of the free software distribution system which is |
397 | -implemented by public license practices. Many people have made |
398 | -generous contributions to the wide range of software distributed |
399 | -through that system in reliance on consistent application of that |
400 | -system; it is up to the author/donor to decide if he or she is willing |
401 | -to distribute software through any other system and a licensee cannot |
402 | -impose that choice. |
403 | - |
404 | -This section is intended to make thoroughly clear what is believed to |
405 | -be a consequence of the rest of this License. |
406 | - |
407 | - 12. If the distribution and/or use of the Library is restricted in |
408 | -certain countries either by patents or by copyrighted interfaces, the |
409 | -original copyright holder who places the Library under this License may add |
410 | -an explicit geographical distribution limitation excluding those countries, |
411 | -so that distribution is permitted only in or among countries not thus |
412 | -excluded. In such case, this License incorporates the limitation as if |
413 | -written in the body of this License. |
414 | - |
415 | - 13. The Free Software Foundation may publish revised and/or new |
416 | -versions of the Library General Public License from time to time. |
417 | -Such new versions will be similar in spirit to the present version, |
418 | -but may differ in detail to address new problems or concerns. |
419 | - |
420 | -Each version is given a distinguishing version number. If the Library |
421 | -specifies a version number of this License which applies to it and |
422 | -"any later version", you have the option of following the terms and |
423 | -conditions either of that version or of any later version published by |
424 | -the Free Software Foundation. If the Library does not specify a |
425 | -license version number, you may choose any version ever published by |
426 | -the Free Software Foundation. |
427 | - |
428 | |
429 | - 14. If you wish to incorporate parts of the Library into other free |
430 | -programs whose distribution conditions are incompatible with these, |
431 | -write to the author to ask for permission. For software which is |
432 | -copyrighted by the Free Software Foundation, write to the Free |
433 | -Software Foundation; we sometimes make exceptions for this. Our |
434 | -decision will be guided by the two goals of preserving the free status |
435 | -of all derivatives of our free software and of promoting the sharing |
436 | -and reuse of software generally. |
437 | - |
438 | - NO WARRANTY |
439 | - |
440 | - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO |
441 | -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. |
442 | -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR |
443 | -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY |
444 | -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE |
445 | -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
446 | -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE |
447 | -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME |
448 | -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. |
449 | - |
450 | - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN |
451 | -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY |
452 | -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU |
453 | -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR |
454 | -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE |
455 | -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING |
456 | -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A |
457 | -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF |
458 | -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH |
459 | -DAMAGES. |
460 | - |
461 | - END OF TERMS AND CONDITIONS |
462 | - |
463 | |
464 | - How to Apply These Terms to Your New Libraries |
465 | - |
466 | - If you develop a new library, and you want it to be of the greatest |
467 | -possible use to the public, we recommend making it free software that |
468 | -everyone can redistribute and change. You can do so by permitting |
469 | -redistribution under these terms (or, alternatively, under the terms of the |
470 | -ordinary General Public License). |
471 | - |
472 | - To apply these terms, attach the following notices to the library. It is |
473 | -safest to attach them to the start of each source file to most effectively |
474 | -convey the exclusion of warranty; and each file should have at least the |
475 | -"copyright" line and a pointer to where the full notice is found. |
476 | - |
477 | - <one line to give the library's name and a brief idea of what it does.> |
478 | - Copyright (C) <year> <name of author> |
479 | - |
480 | - This library is free software; you can redistribute it and/or |
481 | - modify it under the terms of the GNU Library General Public |
482 | - License as published by the Free Software Foundation; either |
483 | - version 2 of the License, or (at your option) any later version. |
484 | - |
485 | - This library is distributed in the hope that it will be useful, |
486 | - but WITHOUT ANY WARRANTY; without even the implied warranty of |
487 | - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
488 | - Library General Public License for more details. |
489 | - |
490 | - You should have received a copy of the GNU Library General Public |
491 | - License along with this library; if not, write to the Free Software |
492 | - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA |
493 | - |
494 | -Also add information on how to contact you by electronic and paper mail. |
495 | - |
496 | -You should also get your employer (if you work as a programmer) or your |
497 | -school, if any, to sign a "copyright disclaimer" for the library, if |
498 | -necessary. Here is a sample; alter the names: |
499 | - |
500 | - Yoyodyne, Inc., hereby disclaims all copyright interest in the |
501 | - library `Frob' (a library for tweaking knobs) written by James Random Hacker. |
502 | - |
503 | - <signature of Ty Coon>, 1 April 1990 |
504 | - Ty Coon, President of Vice |
505 | - |
506 | -That's all there is to it! |
507 | |
508 | === modified file 'configure.ac' |
509 | --- configure.ac 2010-01-08 15:08:02 +0000 |
510 | +++ configure.ac 2010-01-11 16:50:24 +0000 |
511 | @@ -29,24 +29,16 @@ |
512 | GTK_REQUIRED_VERSION=2.12 |
513 | INDICATOR_REQUIRED_VERSION=0.3.0 |
514 | DBUSMENUGTK_REQUIRED_VERSION=0.2.0 |
515 | -POLKIT_REQUIRED_VERSION=0.92 |
516 | - |
517 | -PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION |
518 | - indicator >= $INDICATOR_REQUIRED_VERSION |
519 | - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) |
520 | -AC_SUBST(APPLET_CFLAGS) |
521 | -AC_SUBST(APPLET_LIBS) |
522 | - |
523 | -DBUSMENUGLIB_REQUIRED_VERSION=0.1.1 |
524 | +DBUSMENUGLIB_REQUIRED_VERSION=0.2.0 |
525 | TELEPATHYGLIB_REQUIRED_VERSION=0.9.0 |
526 | |
527 | -PKG_CHECK_MODULES(STATUSSERVICE, dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION |
528 | +PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION |
529 | + indicator >= $INDICATOR_REQUIRED_VERSION |
530 | + dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) |
531 | +PKG_CHECK_MODULES(MESERVICE, dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION |
532 | indicator >= $INDICATOR_REQUIRED_VERSION |
533 | telepathy-glib >= $TELEPATHYGLIB_REQUIRED_VERSION) |
534 | |
535 | -AC_SUBST(STATUSERVICE_CFLAGS) |
536 | -AC_SUBST(STATUSERVICE_LIBS) |
537 | - |
538 | ########################### |
539 | # Check to see if we're local |
540 | ########################### |
541 | |
542 | === modified file 'src/Makefile.am' |
543 | --- src/Makefile.am 2010-01-06 05:29:29 +0000 |
544 | +++ src/Makefile.am 2010-01-11 16:50:24 +0000 |
545 | @@ -38,8 +38,8 @@ |
546 | status-provider-telepathy.c \ |
547 | status-provider-telepathy-marshal.h \ |
548 | status-provider-telepathy-marshal.c |
549 | -indicator_me_service_CFLAGS = $(STATUSSERVICE_CFLAGS) -Wall -Werror |
550 | -indicator_me_service_LDADD = $(STATUSSERVICE_LIBS) |
551 | +indicator_me_service_CFLAGS = $(MESERVICE_CFLAGS) -Wall -Werror |
552 | +indicator_me_service_LDADD = $(MESERVICE_LIBS) |
553 | |
554 | me-service-client.h: $(srcdir)/me-service.xml |
555 | dbus-binding-tool \ |
Updates coming from comments from lool and seb128 during a packaging
review. Various cleanups to build system and licensing.