Merge lp:nautilus-fontinstall into lp:nautilus-fontinstall/jaunty
- trunk
- Merge into jaunty
Proposed by
Amian
Status: | Merged |
---|---|
Approved by: | Juanje Ojeda |
Approved revision: | 12 |
Merged at revision: | 10 |
Proposed branch: | lp:nautilus-fontinstall |
Merge into: | lp:nautilus-fontinstall/jaunty |
Diff against target: | None lines |
To merge this branch: | bzr merge lp:nautilus-fontinstall |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juanje Ojeda | Approve | ||
Review via email: mp+11598@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Amian (amialinux) wrote : | # |
Revision history for this message
Juanje Ojeda (juanje) wrote : | # |
> Merge revno 10 to fixed problem in script nautilus-
This change seems good to me. Make the "cherrypicking" of that revision.
$ bzr merge -r 9..10 lp:nautilus-fontinstall
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file 'LICENSE' | |||
2 | --- LICENSE 1970-01-01 00:00:00 +0000 | |||
3 | +++ LICENSE 2009-09-08 12:05:47 +0000 | |||
4 | @@ -0,0 +1,339 @@ | |||
5 | 1 | GNU GENERAL PUBLIC LICENSE | ||
6 | 2 | Version 2, June 1991 | ||
7 | 3 | |||
8 | 4 | Copyright (C) 1989, 1991 Free Software Foundation, Inc., | ||
9 | 5 | 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
10 | 6 | Everyone is permitted to copy and distribute verbatim copies | ||
11 | 7 | of this license document, but changing it is not allowed. | ||
12 | 8 | |||
13 | 9 | Preamble | ||
14 | 10 | |||
15 | 11 | The licenses for most software are designed to take away your | ||
16 | 12 | freedom to share and change it. By contrast, the GNU General Public | ||
17 | 13 | License is intended to guarantee your freedom to share and change free | ||
18 | 14 | software--to make sure the software is free for all its users. This | ||
19 | 15 | General Public License applies to most of the Free Software | ||
20 | 16 | Foundation's software and to any other program whose authors commit to | ||
21 | 17 | using it. (Some other Free Software Foundation software is covered by | ||
22 | 18 | the GNU Lesser General Public License instead.) You can apply it to | ||
23 | 19 | your programs, too. | ||
24 | 20 | |||
25 | 21 | When we speak of free software, we are referring to freedom, not | ||
26 | 22 | price. Our General Public Licenses are designed to make sure that you | ||
27 | 23 | have the freedom to distribute copies of free software (and charge for | ||
28 | 24 | this service if you wish), that you receive source code or can get it | ||
29 | 25 | if you want it, that you can change the software or use pieces of it | ||
30 | 26 | in new free programs; and that you know you can do these things. | ||
31 | 27 | |||
32 | 28 | To protect your rights, we need to make restrictions that forbid | ||
33 | 29 | anyone to deny you these rights or to ask you to surrender the rights. | ||
34 | 30 | These restrictions translate to certain responsibilities for you if you | ||
35 | 31 | distribute copies of the software, or if you modify it. | ||
36 | 32 | |||
37 | 33 | For example, if you distribute copies of such a program, whether | ||
38 | 34 | gratis or for a fee, you must give the recipients all the rights that | ||
39 | 35 | you have. You must make sure that they, too, receive or can get the | ||
40 | 36 | source code. And you must show them these terms so they know their | ||
41 | 37 | rights. | ||
42 | 38 | |||
43 | 39 | We protect your rights with two steps: (1) copyright the software, and | ||
44 | 40 | (2) offer you this license which gives you legal permission to copy, | ||
45 | 41 | distribute and/or modify the software. | ||
46 | 42 | |||
47 | 43 | Also, for each author's protection and ours, we want to make certain | ||
48 | 44 | that everyone understands that there is no warranty for this free | ||
49 | 45 | software. If the software is modified by someone else and passed on, we | ||
50 | 46 | want its recipients to know that what they have is not the original, so | ||
51 | 47 | that any problems introduced by others will not reflect on the original | ||
52 | 48 | authors' reputations. | ||
53 | 49 | |||
54 | 50 | Finally, any free program is threatened constantly by software | ||
55 | 51 | patents. We wish to avoid the danger that redistributors of a free | ||
56 | 52 | program will individually obtain patent licenses, in effect making the | ||
57 | 53 | program proprietary. To prevent this, we have made it clear that any | ||
58 | 54 | patent must be licensed for everyone's free use or not licensed at all. | ||
59 | 55 | |||
60 | 56 | The precise terms and conditions for copying, distribution and | ||
61 | 57 | modification follow. | ||
62 | 58 | |||
63 | 59 | GNU GENERAL PUBLIC LICENSE | ||
64 | 60 | TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION | ||
65 | 61 | |||
66 | 62 | 0. This License applies to any program or other work which contains | ||
67 | 63 | a notice placed by the copyright holder saying it may be distributed | ||
68 | 64 | under the terms of this General Public License. The "Program", below, | ||
69 | 65 | refers to any such program or work, and a "work based on the Program" | ||
70 | 66 | means either the Program or any derivative work under copyright law: | ||
71 | 67 | that is to say, a work containing the Program or a portion of it, | ||
72 | 68 | either verbatim or with modifications and/or translated into another | ||
73 | 69 | language. (Hereinafter, translation is included without limitation in | ||
74 | 70 | the term "modification".) Each licensee is addressed as "you". | ||
75 | 71 | |||
76 | 72 | Activities other than copying, distribution and modification are not | ||
77 | 73 | covered by this License; they are outside its scope. The act of | ||
78 | 74 | running the Program is not restricted, and the output from the Program | ||
79 | 75 | is covered only if its contents constitute a work based on the | ||
80 | 76 | Program (independent of having been made by running the Program). | ||
81 | 77 | Whether that is true depends on what the Program does. | ||
82 | 78 | |||
83 | 79 | 1. You may copy and distribute verbatim copies of the Program's | ||
84 | 80 | source code as you receive it, in any medium, provided that you | ||
85 | 81 | conspicuously and appropriately publish on each copy an appropriate | ||
86 | 82 | copyright notice and disclaimer of warranty; keep intact all the | ||
87 | 83 | notices that refer to this License and to the absence of any warranty; | ||
88 | 84 | and give any other recipients of the Program a copy of this License | ||
89 | 85 | along with the Program. | ||
90 | 86 | |||
91 | 87 | You may charge a fee for the physical act of transferring a copy, and | ||
92 | 88 | you may at your option offer warranty protection in exchange for a fee. | ||
93 | 89 | |||
94 | 90 | 2. You may modify your copy or copies of the Program or any portion | ||
95 | 91 | of it, thus forming a work based on the Program, and copy and | ||
96 | 92 | distribute such modifications or work under the terms of Section 1 | ||
97 | 93 | above, provided that you also meet all of these conditions: | ||
98 | 94 | |||
99 | 95 | a) You must cause the modified files to carry prominent notices | ||
100 | 96 | stating that you changed the files and the date of any change. | ||
101 | 97 | |||
102 | 98 | b) You must cause any work that you distribute or publish, that in | ||
103 | 99 | whole or in part contains or is derived from the Program or any | ||
104 | 100 | part thereof, to be licensed as a whole at no charge to all third | ||
105 | 101 | parties under the terms of this License. | ||
106 | 102 | |||
107 | 103 | c) If the modified program normally reads commands interactively | ||
108 | 104 | when run, you must cause it, when started running for such | ||
109 | 105 | interactive use in the most ordinary way, to print or display an | ||
110 | 106 | announcement including an appropriate copyright notice and a | ||
111 | 107 | notice that there is no warranty (or else, saying that you provide | ||
112 | 108 | a warranty) and that users may redistribute the program under | ||
113 | 109 | these conditions, and telling the user how to view a copy of this | ||
114 | 110 | License. (Exception: if the Program itself is interactive but | ||
115 | 111 | does not normally print such an announcement, your work based on | ||
116 | 112 | the Program is not required to print an announcement.) | ||
117 | 113 | |||
118 | 114 | These requirements apply to the modified work as a whole. If | ||
119 | 115 | identifiable sections of that work are not derived from the Program, | ||
120 | 116 | and can be reasonably considered independent and separate works in | ||
121 | 117 | themselves, then this License, and its terms, do not apply to those | ||
122 | 118 | sections when you distribute them as separate works. But when you | ||
123 | 119 | distribute the same sections as part of a whole which is a work based | ||
124 | 120 | on the Program, the distribution of the whole must be on the terms of | ||
125 | 121 | this License, whose permissions for other licensees extend to the | ||
126 | 122 | entire whole, and thus to each and every part regardless of who wrote it. | ||
127 | 123 | |||
128 | 124 | Thus, it is not the intent of this section to claim rights or contest | ||
129 | 125 | your rights to work written entirely by you; rather, the intent is to | ||
130 | 126 | exercise the right to control the distribution of derivative or | ||
131 | 127 | collective works based on the Program. | ||
132 | 128 | |||
133 | 129 | In addition, mere aggregation of another work not based on the Program | ||
134 | 130 | with the Program (or with a work based on the Program) on a volume of | ||
135 | 131 | a storage or distribution medium does not bring the other work under | ||
136 | 132 | the scope of this License. | ||
137 | 133 | |||
138 | 134 | 3. You may copy and distribute the Program (or a work based on it, | ||
139 | 135 | under Section 2) in object code or executable form under the terms of | ||
140 | 136 | Sections 1 and 2 above provided that you also do one of the following: | ||
141 | 137 | |||
142 | 138 | a) Accompany it with the complete corresponding machine-readable | ||
143 | 139 | source code, which must be distributed under the terms of Sections | ||
144 | 140 | 1 and 2 above on a medium customarily used for software interchange; or, | ||
145 | 141 | |||
146 | 142 | b) Accompany it with a written offer, valid for at least three | ||
147 | 143 | years, to give any third party, for a charge no more than your | ||
148 | 144 | cost of physically performing source distribution, a complete | ||
149 | 145 | machine-readable copy of the corresponding source code, to be | ||
150 | 146 | distributed under the terms of Sections 1 and 2 above on a medium | ||
151 | 147 | customarily used for software interchange; or, | ||
152 | 148 | |||
153 | 149 | c) Accompany it with the information you received as to the offer | ||
154 | 150 | to distribute corresponding source code. (This alternative is | ||
155 | 151 | allowed only for noncommercial distribution and only if you | ||
156 | 152 | received the program in object code or executable form with such | ||
157 | 153 | an offer, in accord with Subsection b above.) | ||
158 | 154 | |||
159 | 155 | The source code for a work means the preferred form of the work for | ||
160 | 156 | making modifications to it. For an executable work, complete source | ||
161 | 157 | code means all the source code for all modules it contains, plus any | ||
162 | 158 | associated interface definition files, plus the scripts used to | ||
163 | 159 | control compilation and installation of the executable. However, as a | ||
164 | 160 | special exception, the source code distributed need not include | ||
165 | 161 | anything that is normally distributed (in either source or binary | ||
166 | 162 | form) with the major components (compiler, kernel, and so on) of the | ||
167 | 163 | operating system on which the executable runs, unless that component | ||
168 | 164 | itself accompanies the executable. | ||
169 | 165 | |||
170 | 166 | If distribution of executable or object code is made by offering | ||
171 | 167 | access to copy from a designated place, then offering equivalent | ||
172 | 168 | access to copy the source code from the same place counts as | ||
173 | 169 | distribution of the source code, even though third parties are not | ||
174 | 170 | compelled to copy the source along with the object code. | ||
175 | 171 | |||
176 | 172 | 4. You may not copy, modify, sublicense, or distribute the Program | ||
177 | 173 | except as expressly provided under this License. Any attempt | ||
178 | 174 | otherwise to copy, modify, sublicense or distribute the Program is | ||
179 | 175 | void, and will automatically terminate your rights under this License. | ||
180 | 176 | However, parties who have received copies, or rights, from you under | ||
181 | 177 | this License will not have their licenses terminated so long as such | ||
182 | 178 | parties remain in full compliance. | ||
183 | 179 | |||
184 | 180 | 5. You are not required to accept this License, since you have not | ||
185 | 181 | signed it. However, nothing else grants you permission to modify or | ||
186 | 182 | distribute the Program or its derivative works. These actions are | ||
187 | 183 | prohibited by law if you do not accept this License. Therefore, by | ||
188 | 184 | modifying or distributing the Program (or any work based on the | ||
189 | 185 | Program), you indicate your acceptance of this License to do so, and | ||
190 | 186 | all its terms and conditions for copying, distributing or modifying | ||
191 | 187 | the Program or works based on it. | ||
192 | 188 | |||
193 | 189 | 6. Each time you redistribute the Program (or any work based on the | ||
194 | 190 | Program), the recipient automatically receives a license from the | ||
195 | 191 | original licensor to copy, distribute or modify the Program subject to | ||
196 | 192 | these terms and conditions. You may not impose any further | ||
197 | 193 | restrictions on the recipients' exercise of the rights granted herein. | ||
198 | 194 | You are not responsible for enforcing compliance by third parties to | ||
199 | 195 | this License. | ||
200 | 196 | |||
201 | 197 | 7. If, as a consequence of a court judgment or allegation of patent | ||
202 | 198 | infringement or for any other reason (not limited to patent issues), | ||
203 | 199 | conditions are imposed on you (whether by court order, agreement or | ||
204 | 200 | otherwise) that contradict the conditions of this License, they do not | ||
205 | 201 | excuse you from the conditions of this License. If you cannot | ||
206 | 202 | distribute so as to satisfy simultaneously your obligations under this | ||
207 | 203 | License and any other pertinent obligations, then as a consequence you | ||
208 | 204 | may not distribute the Program at all. For example, if a patent | ||
209 | 205 | license would not permit royalty-free redistribution of the Program by | ||
210 | 206 | all those who receive copies directly or indirectly through you, then | ||
211 | 207 | the only way you could satisfy both it and this License would be to | ||
212 | 208 | refrain entirely from distribution of the Program. | ||
213 | 209 | |||
214 | 210 | If any portion of this section is held invalid or unenforceable under | ||
215 | 211 | any particular circumstance, the balance of the section is intended to | ||
216 | 212 | apply and the section as a whole is intended to apply in other | ||
217 | 213 | circumstances. | ||
218 | 214 | |||
219 | 215 | It is not the purpose of this section to induce you to infringe any | ||
220 | 216 | patents or other property right claims or to contest validity of any | ||
221 | 217 | such claims; this section has the sole purpose of protecting the | ||
222 | 218 | integrity of the free software distribution system, which is | ||
223 | 219 | implemented by public license practices. Many people have made | ||
224 | 220 | generous contributions to the wide range of software distributed | ||
225 | 221 | through that system in reliance on consistent application of that | ||
226 | 222 | system; it is up to the author/donor to decide if he or she is willing | ||
227 | 223 | to distribute software through any other system and a licensee cannot | ||
228 | 224 | impose that choice. | ||
229 | 225 | |||
230 | 226 | This section is intended to make thoroughly clear what is believed to | ||
231 | 227 | be a consequence of the rest of this License. | ||
232 | 228 | |||
233 | 229 | 8. If the distribution and/or use of the Program is restricted in | ||
234 | 230 | certain countries either by patents or by copyrighted interfaces, the | ||
235 | 231 | original copyright holder who places the Program under this License | ||
236 | 232 | may add an explicit geographical distribution limitation excluding | ||
237 | 233 | those countries, so that distribution is permitted only in or among | ||
238 | 234 | countries not thus excluded. In such case, this License incorporates | ||
239 | 235 | the limitation as if written in the body of this License. | ||
240 | 236 | |||
241 | 237 | 9. The Free Software Foundation may publish revised and/or new versions | ||
242 | 238 | of the General Public License from time to time. Such new versions will | ||
243 | 239 | be similar in spirit to the present version, but may differ in detail to | ||
244 | 240 | address new problems or concerns. | ||
245 | 241 | |||
246 | 242 | Each version is given a distinguishing version number. If the Program | ||
247 | 243 | specifies a version number of this License which applies to it and "any | ||
248 | 244 | later version", you have the option of following the terms and conditions | ||
249 | 245 | either of that version or of any later version published by the Free | ||
250 | 246 | Software Foundation. If the Program does not specify a version number of | ||
251 | 247 | this License, you may choose any version ever published by the Free Software | ||
252 | 248 | Foundation. | ||
253 | 249 | |||
254 | 250 | 10. If you wish to incorporate parts of the Program into other free | ||
255 | 251 | programs whose distribution conditions are different, write to the author | ||
256 | 252 | to ask for permission. For software which is copyrighted by the Free | ||
257 | 253 | Software Foundation, write to the Free Software Foundation; we sometimes | ||
258 | 254 | make exceptions for this. Our decision will be guided by the two goals | ||
259 | 255 | of preserving the free status of all derivatives of our free software and | ||
260 | 256 | of promoting the sharing and reuse of software generally. | ||
261 | 257 | |||
262 | 258 | NO WARRANTY | ||
263 | 259 | |||
264 | 260 | 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY | ||
265 | 261 | FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN | ||
266 | 262 | OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES | ||
267 | 263 | PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED | ||
268 | 264 | OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
269 | 265 | MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS | ||
270 | 266 | TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE | ||
271 | 267 | PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, | ||
272 | 268 | REPAIR OR CORRECTION. | ||
273 | 269 | |||
274 | 270 | 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING | ||
275 | 271 | WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR | ||
276 | 272 | REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, | ||
277 | 273 | INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING | ||
278 | 274 | OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED | ||
279 | 275 | TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY | ||
280 | 276 | YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER | ||
281 | 277 | PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE | ||
282 | 278 | POSSIBILITY OF SUCH DAMAGES. | ||
283 | 279 | |||
284 | 280 | END OF TERMS AND CONDITIONS | ||
285 | 281 | |||
286 | 282 | How to Apply These Terms to Your New Programs | ||
287 | 283 | |||
288 | 284 | If you develop a new program, and you want it to be of the greatest | ||
289 | 285 | possible use to the public, the best way to achieve this is to make it | ||
290 | 286 | free software which everyone can redistribute and change under these terms. | ||
291 | 287 | |||
292 | 288 | To do so, attach the following notices to the program. It is safest | ||
293 | 289 | to attach them to the start of each source file to most effectively | ||
294 | 290 | convey the exclusion of warranty; and each file should have at least | ||
295 | 291 | the "copyright" line and a pointer to where the full notice is found. | ||
296 | 292 | |||
297 | 293 | <one line to give the program's name and a brief idea of what it does.> | ||
298 | 294 | Copyright (C) <year> <name of author> | ||
299 | 295 | |||
300 | 296 | This program is free software; you can redistribute it and/or modify | ||
301 | 297 | it under the terms of the GNU General Public License as published by | ||
302 | 298 | the Free Software Foundation; either version 2 of the License, or | ||
303 | 299 | (at your option) any later version. | ||
304 | 300 | |||
305 | 301 | This program is distributed in the hope that it will be useful, | ||
306 | 302 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
307 | 303 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
308 | 304 | GNU General Public License for more details. | ||
309 | 305 | |||
310 | 306 | You should have received a copy of the GNU General Public License along | ||
311 | 307 | with this program; if not, write to the Free Software Foundation, Inc., | ||
312 | 308 | 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
313 | 309 | |||
314 | 310 | Also add information on how to contact you by electronic and paper mail. | ||
315 | 311 | |||
316 | 312 | If the program is interactive, make it output a short notice like this | ||
317 | 313 | when it starts in an interactive mode: | ||
318 | 314 | |||
319 | 315 | Gnomovision version 69, Copyright (C) year name of author | ||
320 | 316 | Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. | ||
321 | 317 | This is free software, and you are welcome to redistribute it | ||
322 | 318 | under certain conditions; type `show c' for details. | ||
323 | 319 | |||
324 | 320 | The hypothetical commands `show w' and `show c' should show the appropriate | ||
325 | 321 | parts of the General Public License. Of course, the commands you use may | ||
326 | 322 | be called something other than `show w' and `show c'; they could even be | ||
327 | 323 | mouse-clicks or menu items--whatever suits your program. | ||
328 | 324 | |||
329 | 325 | You should also get your employer (if you work as a programmer) or your | ||
330 | 326 | school, if any, to sign a "copyright disclaimer" for the program, if | ||
331 | 327 | necessary. Here is a sample; alter the names: | ||
332 | 328 | |||
333 | 329 | Yoyodyne, Inc., hereby disclaims all copyright interest in the program | ||
334 | 330 | `Gnomovision' (which makes passes at compilers) written by James Hacker. | ||
335 | 331 | |||
336 | 332 | <signature of Ty Coon>, 1 April 1989 | ||
337 | 333 | Ty Coon, President of Vice | ||
338 | 334 | |||
339 | 335 | This General Public License does not permit incorporating your program into | ||
340 | 336 | proprietary programs. If your program is a subroutine library, you may | ||
341 | 337 | consider it more useful to permit linking proprietary applications with the | ||
342 | 338 | library. If this is what you want to do, use the GNU Lesser General | ||
343 | 339 | Public License instead of this License. | ||
344 | 0 | 340 | ||
345 | === modified file 'debian/changelog' | |||
346 | --- debian/changelog 2009-09-03 08:31:18 +0000 | |||
347 | +++ debian/changelog 2009-09-11 11:52:02 +0000 | |||
348 | @@ -1,3 +1,20 @@ | |||
349 | 1 | nautilus-fontinstall (0.2.4-0ubuntu1) karmic; urgency=low | ||
350 | 2 | |||
351 | 3 | * Fixed script nautilus-fontinstall.py: | ||
352 | 4 | - It's freeze in updating cache fonts | ||
353 | 5 | * Update changelog and setup.py | ||
354 | 6 | |||
355 | 7 | |||
356 | 8 | -- David Amián Valle <amialinux@gmail.com> Fri, 11 Sep 2009 13:49:54 +0200 | ||
357 | 9 | |||
358 | 10 | nautilus-fontinstall (0.2.3-0ubuntu1) karmic; urgency=low | ||
359 | 11 | |||
360 | 12 | * Changed Standards-version to current version (3.8.3) | ||
361 | 13 | * Changed maintainer to @ubuntu.com one | ||
362 | 14 | * Added LICENSE file | ||
363 | 15 | |||
364 | 16 | -- David Amián Valle <amialinux@gmail.com> Tue, 08 Sep 2009 14:04:42 +0200 | ||
365 | 17 | |||
366 | 1 | nautilus-fontinstall (0.2.3-0guada1) jaunty; urgency=low | 18 | nautilus-fontinstall (0.2.3-0guada1) jaunty; urgency=low |
367 | 2 | 19 | ||
368 | 3 | * Changed package structure and added fontinstall-ico | 20 | * Changed package structure and added fontinstall-ico |
369 | 4 | 21 | ||
370 | === modified file 'debian/control' | |||
371 | --- debian/control 2009-08-28 07:16:30 +0000 | |||
372 | +++ debian/control 2009-09-08 12:05:47 +0000 | |||
373 | @@ -1,11 +1,13 @@ | |||
374 | 1 | Source: nautilus-fontinstall | 1 | Source: nautilus-fontinstall |
375 | 2 | Section: utils | 2 | Section: utils |
376 | 3 | Priority: optional | 3 | Priority: optional |
378 | 4 | Maintainer: Junta de Andalucía <packmaster@guadalinex.org> | 4 | XSBC-Original-Maintainer: Junta de Andalucía <packmaster@guadalinex.org> |
379 | 5 | Maintainer: Juanje Ojeda Croissier <juanje@ubuntu.com> | ||
380 | 5 | Uploaders: David Amián <amialinux@gmail.com> | 6 | Uploaders: David Amián <amialinux@gmail.com> |
381 | 7 | Juanje Ojeda Croissier <juanje@ubuntu.com> | ||
382 | 6 | Build-Depends: debhelper (>=7), cdbs (>=0.4.43), python-all-dev (>=2.3.5-11) | 8 | Build-Depends: debhelper (>=7), cdbs (>=0.4.43), python-all-dev (>=2.3.5-11) |
383 | 7 | Build-Depends-Indep: python-central (>=0.5.6), gettext, python-distutils-extra | 9 | Build-Depends-Indep: python-central (>=0.5.6), gettext, python-distutils-extra |
385 | 8 | Standards-Version: 3.8.0 | 10 | Standards-Version: 3.8.3 |
386 | 9 | Homepage: http://launchpad.net/nautilus-fontinstall | 11 | Homepage: http://launchpad.net/nautilus-fontinstall |
387 | 10 | Vcs-Browser: http://codebrowse.launchpad.net/~guadalinex-members/nautilus-fontinstall/trunk/changes | 12 | Vcs-Browser: http://codebrowse.launchpad.net/~guadalinex-members/nautilus-fontinstall/trunk/changes |
388 | 11 | Vcs-Bzr: http://bazaar.launchpad.net/~guadalinex-members/nautilus-fontinstall/trunk | 13 | Vcs-Bzr: http://bazaar.launchpad.net/~guadalinex-members/nautilus-fontinstall/trunk |
389 | 12 | 14 | ||
390 | === modified file 'scripts/nautilus-fontinstall.py' | |||
391 | --- scripts/nautilus-fontinstall.py 2009-09-03 07:45:27 +0000 | |||
392 | +++ scripts/nautilus-fontinstall.py 2009-09-11 11:48:06 +0000 | |||
393 | @@ -133,3 +133,4 @@ | |||
394 | 133 | os.system ("gksudo -u root -k -m " + "\""+ _("Enter your user password") + "\"" + " /bin/echo " + "\"" + _("Do you have root access?") + "\"") | 133 | os.system ("gksudo -u root -k -m " + "\""+ _("Enter your user password") + "\"" + " /bin/echo " + "\"" + _("Do you have root access?") + "\"") |
395 | 134 | os.system("sudo cp -r '" + filefont + "' '" + FONT_PATH + "'") | 134 | os.system("sudo cp -r '" + filefont + "' '" + FONT_PATH + "'") |
396 | 135 | fontinst = FONTDialog(filefont) | 135 | fontinst = FONTDialog(filefont) |
397 | 136 | fontinst.main() | ||
398 | 136 | 137 | ||
399 | === modified file 'setup.py' | |||
400 | --- setup.py 2009-09-03 08:31:18 +0000 | |||
401 | +++ setup.py 2009-09-11 11:52:27 +0000 | |||
402 | @@ -2,7 +2,7 @@ | |||
403 | 2 | from DistUtilsExtra.command import * | 2 | from DistUtilsExtra.command import * |
404 | 3 | 3 | ||
405 | 4 | setup(name='nautilus-fontinstall', | 4 | setup(name='nautilus-fontinstall', |
407 | 5 | version='0.2.3', | 5 | version='0.2.4', |
408 | 6 | author='David Amian', | 6 | author='David Amian', |
409 | 7 | author_email='amialinux@gmail.com', | 7 | author_email='amialinux@gmail.com', |
410 | 8 | data_files=[('lib/nautilus/extensions-2.0/python/', ['scripts/nautilus-fontinstall.py']), | 8 | data_files=[('lib/nautilus/extensions-2.0/python/', ['scripts/nautilus-fontinstall.py']), |
Merge revno 10 to fixed problem in script nautilus- fontinstall. py