usb-creator

Merge lp:~jbicha/usb-creator/dont-override-logo into lp:usb-creator

  1. dont-override-logo
  2. Merge into trunk
Proposed by Jeremy Bícha
Status: Needs review
Proposed branch: lp:~jbicha/usb-creator/dont-override-logo
Merge into: lp:usb-creator
Diff against target: 795 lines (+30/-652)
9 files modified
Makefile (+2/-2)
debian/Ubuntu/usb-creator-gtk.svg (+0/-622)
debian/changelog (+10/-0)
debian/usb-creator-common.install (+5/-5)
po/POTFILES.in (+4/-4)
setup.cfg (+1/-1)
setup.py (+5/-15)
usbcreator/frontends/gtk/frontend.py (+2/-2)
usbcreator/frontends/kde/frontend.py (+1/-1)
To merge this branch: bzr merge lp:~jbicha/usb-creator/dont-override-logo
Reviewer Review Type Date Requested Status
usb-creator hackers Pending
Review via email: mp+171443@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

417. By Jeremy Bícha

* Don't override the usb-creator-gtk logo on Ubuntu;
  Humanity already includes the Ubuntu logo and the "upstream" logo is
  probably better for derivatives
* Use python-distutils-extra in auto mode and reorganize a few things
  so that it works

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2009-09-16 16:37:56 +0000
3+++ Makefile 2013-06-26 01:00:37 +0000
4@@ -5,7 +5,7 @@
5 RESULT="build/usb-creator-r$(REV)-$(RVER).exe"
6
7 update-po:
8- find -regex "./\(usbcreator\|dbus\|gui\|desktop\).*\.\(py\|glade\|ui\|in\)" \
9+ find -regex "./\(usbcreator\|dbus\|data\).*\.\(py\|glade\|ui\|in\)" \
10 | sed '/gtk\.ui/ s,^,[type: gettext/glade],' > po/POTFILES.in
11 echo ./main.py >> po/POTFILES.in
12 echo ./bin/usb-creator-gtk >> po/POTFILES.in
13@@ -31,7 +31,7 @@
14 build_pylauncher: clean check_external_deps
15 cp -r tools/pylauncher build
16 cp wine/drive_c/windows/system32/python26.dll build/pylauncher
17- cp desktop/usb-creator.ico build/pylauncher/application.ico
18+ cp data/usb-creator.ico build/pylauncher/application.ico
19 cd build/pylauncher; $(MAKE)
20
21 test_windows: build_windows
22
23=== added directory 'apport'
24=== renamed file 'debian/source_usb-creator.py' => 'apport/source_usb-creator.py'
25=== renamed directory 'desktop' => 'data'
26=== added directory 'data/icons'
27=== added directory 'data/icons/scalable'
28=== added directory 'data/icons/scalable/apps'
29=== renamed file 'desktop/usb-creator-gtk.svg' => 'data/icons/scalable/apps/usb-creator-gtk.svg'
30=== renamed file 'desktop/usb-creator-kde.svg' => 'data/icons/scalable/apps/usb-creator-kde.svg'
31=== renamed file 'gui/ubuntu-nexus7-USAGE-NOTICE-en.txt' => 'data/ubuntu-nexus7-USAGE-NOTICE-en.txt'
32=== renamed file 'gui/usbcreator-gtk.ui' => 'data/usbcreator-gtk.ui'
33=== renamed file 'gui/usbcreator-kde.ui' => 'data/usbcreator-kde.ui'
34=== removed file 'debian/Ubuntu/usb-creator-gtk.svg'
35--- debian/Ubuntu/usb-creator-gtk.svg 2010-05-24 07:00:59 +0000
36+++ debian/Ubuntu/usb-creator-gtk.svg 1970-01-01 00:00:00 +0000
37@@ -1,622 +0,0 @@
38-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
39-<!-- Created with Inkscape (http://www.inkscape.org/) -->
40-
41-<svg
42- xmlns:dc="http://purl.org/dc/elements/1.1/"
43- xmlns:cc="http://creativecommons.org/ns#"
44- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
45- xmlns:svg="http://www.w3.org/2000/svg"
46- xmlns="http://www.w3.org/2000/svg"
47- xmlns:xlink="http://www.w3.org/1999/xlink"
48- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
49- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
50- version="1.0"
51- width="48"
52- height="48"
53- id="svg3786"
54- inkscape:version="0.47 r22583"
55- sodipodi:docname="usb-creator-gtk.svg">
56- <metadata
57- id="metadata121">
58- <rdf:RDF>
59- <cc:Work
60- rdf:about="">
61- <dc:format>image/svg+xml</dc:format>
62- <dc:type
63- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
64- </cc:Work>
65- </rdf:RDF>
66- </metadata>
67- <sodipodi:namedview
68- pagecolor="#ffffff"
69- bordercolor="#666666"
70- borderopacity="1"
71- objecttolerance="10"
72- gridtolerance="10"
73- guidetolerance="10"
74- inkscape:pageopacity="0"
75- inkscape:pageshadow="2"
76- inkscape:window-width="640"
77- inkscape:window-height="498"
78- id="namedview119"
79- showgrid="false"
80- inkscape:zoom="4.9166667"
81- inkscape:cx="24"
82- inkscape:cy="24"
83- inkscape:window-x="0"
84- inkscape:window-y="0"
85- inkscape:window-maximized="0"
86- inkscape:current-layer="svg3786" />
87- <defs
88- id="defs3788">
89- <radialGradient
90- cx="113.0654"
91- cy="97.587898"
92- r="2.5631001"
93- fx="113.667"
94- fy="98"
95- id="radialGradient4241"
96- gradientUnits="userSpaceOnUse">
97- <stop
98- id="stop4243"
99- style="stop-color:#eeeeee;stop-opacity:1"
100- offset="0" />
101- <stop
102- id="stop4245"
103- style="stop-color:#cecece;stop-opacity:1"
104- offset="0.16" />
105- <stop
106- id="stop4247"
107- style="stop-color:#888888;stop-opacity:1"
108- offset="0.4675" />
109- <stop
110- id="stop4249"
111- style="stop-color:#555555;stop-opacity:1"
112- offset="1" />
113- </radialGradient>
114- <linearGradient
115- id="linearGradient4035">
116- <stop
117- id="stop4037"
118- style="stop-color:#f5f5f5;stop-opacity:1"
119- offset="0" />
120- <stop
121- id="stop4039"
122- style="stop-color:#e7e7e7;stop-opacity:1"
123- offset="0.47025558" />
124- <stop
125- id="stop4041"
126- style="stop-color:#8c8c8c;stop-opacity:1"
127- offset="0.69348532" />
128- <stop
129- id="stop4043"
130- style="stop-color:#dddddd;stop-opacity:1"
131- offset="0.83542866" />
132- <stop
133- id="stop4045"
134- style="stop-color:#a8a8a8;stop-opacity:1"
135- offset="1" />
136- </linearGradient>
137- <linearGradient
138- id="linearGradient5060">
139- <stop
140- id="stop5062"
141- style="stop-color:#000000;stop-opacity:1"
142- offset="0" />
143- <stop
144- id="stop5064"
145- style="stop-color:#000000;stop-opacity:0"
146- offset="1" />
147- </linearGradient>
148- <linearGradient
149- id="linearGradient5048">
150- <stop
151- id="stop5050"
152- style="stop-color:#000000;stop-opacity:0"
153- offset="0" />
154- <stop
155- id="stop5056"
156- style="stop-color:#000000;stop-opacity:1"
157- offset="0.5" />
158- <stop
159- id="stop5052"
160- style="stop-color:#000000;stop-opacity:0"
161- offset="1" />
162- </linearGradient>
163- <linearGradient
164- id="linearGradient2215">
165- <stop
166- id="stop2223"
167- style="stop-color:#7a7a7a;stop-opacity:1"
168- offset="0" />
169- <stop
170- id="stop2219"
171- style="stop-color:#474747;stop-opacity:1"
172- offset="1" />
173- </linearGradient>
174- <linearGradient
175- id="linearGradient7609">
176- <stop
177- id="stop7611"
178- style="stop-color:#ffffff;stop-opacity:1"
179- offset="0" />
180- <stop
181- id="stop7677"
182- style="stop-color:#e7e7e7;stop-opacity:1"
183- offset="0.47025558" />
184- <stop
185- id="stop7613"
186- style="stop-color:#8c8c8c;stop-opacity:1"
187- offset="0.67183787" />
188- <stop
189- id="stop7617"
190- style="stop-color:#dddddd;stop-opacity:1"
191- offset="0.83542866" />
192- <stop
193- id="stop7615"
194- style="stop-color:#a8a8a8;stop-opacity:1"
195- offset="1" />
196- </linearGradient>
197- <linearGradient
198- id="linearGradient4236">
199- <stop
200- id="stop4238"
201- style="stop-color:#eeeeee;stop-opacity:1"
202- offset="0" />
203- <stop
204- id="stop4240"
205- style="stop-color:#eeeeee;stop-opacity:0"
206- offset="1" />
207- </linearGradient>
208- <linearGradient
209- id="linearGradient7056">
210- <stop
211- id="stop7064"
212- style="stop-color:#e6e6e6;stop-opacity:1"
213- offset="0" />
214- <stop
215- id="stop7060"
216- style="stop-color:#c8c8c8;stop-opacity:1"
217- offset="1" />
218- </linearGradient>
219- <linearGradient
220- id="linearGradient3484">
221- <stop
222- id="stop3486"
223- style="stop-color:#969696;stop-opacity:1"
224- offset="0" />
225- <stop
226- id="stop3488"
227- style="stop-color:#b4b4b4;stop-opacity:1"
228- offset="1" />
229- </linearGradient>
230- <linearGradient
231- id="linearGradient6310-8">
232- <stop
233- id="stop6312-6"
234- style="stop-color:#ffffff;stop-opacity:1"
235- offset="0" />
236- <stop
237- id="stop6314-6"
238- style="stop-color:#ffffff;stop-opacity:0"
239- offset="1" />
240- </linearGradient>
241- <radialGradient
242- cx="24"
243- cy="42"
244- r="21"
245- fx="24"
246- fy="42"
247- id="radialGradient2896"
248- xlink:href="#linearGradient6310-8"
249- gradientUnits="userSpaceOnUse"
250- gradientTransform="matrix(1,-1.0652117e-8,2.7812622e-8,0.3571428,1.0762331e-6,24.500003)" />
251- <radialGradient
252- cx="127.31733"
253- cy="143.82751"
254- r="78.728165"
255- fx="127.31733"
256- fy="143.82751"
257- id="radialGradient2902"
258- xlink:href="#linearGradient4035"
259- gradientUnits="userSpaceOnUse"
260- gradientTransform="matrix(0.1905422,-2.505584e-2,6.19351e-3,0.1007346,-7.4371744,4.4286866)" />
261- <linearGradient
262- x1="12.277412"
263- y1="37.205811"
264- x2="12.221823"
265- y2="33.758667"
266- id="linearGradient2905"
267- xlink:href="#linearGradient4236"
268- gradientUnits="userSpaceOnUse"
269- gradientTransform="matrix(1.0212766,0,0,0.8988764,-2.517836e-2,8.978263)" />
270- <linearGradient
271- x1="7.0625"
272- y1="35.28125"
273- x2="24.6875"
274- y2="35.28125"
275- id="linearGradient2908"
276- xlink:href="#linearGradient5060"
277- gradientUnits="userSpaceOnUse"
278- gradientTransform="matrix(1.0212766,0,0,0.8988764,0.78724,7.7865138)" />
279- <radialGradient
280- cx="142.62215"
281- cy="191.85428"
282- r="78.728165"
283- fx="142.62215"
284- fy="191.85428"
285- id="radialGradient2920"
286- xlink:href="#linearGradient7609"
287- gradientUnits="userSpaceOnUse"
288- gradientTransform="matrix(0.1879109,0,0,-0.1348017,-3.6328039,45.981293)" />
289- <radialGradient
290- cx="141.74666"
291- cy="206.42612"
292- r="78.728165"
293- fx="141.74666"
294- fy="206.42612"
295- id="radialGradient2923"
296- xlink:href="#linearGradient4035"
297- gradientUnits="userSpaceOnUse"
298- gradientTransform="matrix(0.3516088,-5.0244e-3,2.60227e-3,0.2890927,-27.02434,-25.217538)" />
299- <radialGradient
300- cx="11.734284"
301- cy="8.4900017"
302- r="23.047892"
303- fx="11.734284"
304- fy="8.4900017"
305- id="radialGradient2927"
306- xlink:href="#linearGradient7056"
307- gradientUnits="userSpaceOnUse"
308- gradientTransform="matrix(1.3767077,0.6971943,-0.4681085,0.9243458,-4.915651e-2,-2.9386274)" />
309- <linearGradient
310- x1="17.813944"
311- y1="29.796696"
312- x2="18.072828"
313- y2="10.000001"
314- id="linearGradient2929"
315- xlink:href="#linearGradient3484"
316- gradientUnits="userSpaceOnUse"
317- gradientTransform="translate(0,-1.0001465)" />
318- <linearGradient
319- x1="29.9375"
320- y1="41"
321- x2="30"
322- y2="49.999996"
323- id="linearGradient2933"
324- xlink:href="#linearGradient2215"
325- gradientUnits="userSpaceOnUse"
326- gradientTransform="matrix(1.0017502,0,0,0.7596403,-5.0508975,4.9363745)" />
327- <radialGradient
328- cx="605.71429"
329- cy="486.64789"
330- r="117.14286"
331- fx="605.71429"
332- fy="486.64789"
333- id="radialGradient2936"
334- xlink:href="#linearGradient5060"
335- gradientUnits="userSpaceOnUse"
336- gradientTransform="matrix(-4.484747e-2,0,0,2.058824e-2,32.61113,32.451372)" />
337- <radialGradient
338- cx="605.71429"
339- cy="486.64789"
340- r="117.14286"
341- fx="605.71429"
342- fy="486.64789"
343- id="radialGradient2939"
344- xlink:href="#linearGradient5060"
345- gradientUnits="userSpaceOnUse"
346- gradientTransform="matrix(4.484747e-2,0,0,2.058824e-2,15.38888,32.451372)" />
347- <linearGradient
348- x1="302.85715"
349- y1="366.64789"
350- x2="302.85715"
351- y2="609.50507"
352- id="linearGradient2942"
353- xlink:href="#linearGradient5048"
354- gradientUnits="userSpaceOnUse"
355- gradientTransform="matrix(7.635654e-2,0,0,2.058824e-2,-3.5974283,32.451372)" />
356- <radialGradient
357- cx="113.0654"
358- cy="97.587898"
359- r="2.5631001"
360- fx="113.667"
361- fy="98"
362- id="radialGradient2947"
363- xlink:href="#radialGradient4241"
364- gradientUnits="userSpaceOnUse"
365- gradientTransform="matrix(0.3294887,0,0,0.3497464,6.0549235,0.4938257)" />
366- <radialGradient
367- cx="113.0654"
368- cy="97.587898"
369- r="2.5631001"
370- fx="113.667"
371- fy="98"
372- id="radialGradient2953"
373- xlink:href="#radialGradient4241"
374- gradientUnits="userSpaceOnUse"
375- gradientTransform="matrix(0.2233321,3.439303e-2,-2.300572e-2,0.1493884,14.791441,-7.6318403)" />
376- <radialGradient
377- cx="113.0654"
378- cy="97.587898"
379- r="2.5631001"
380- fx="113.667"
381- fy="98"
382- id="radialGradient2965"
383- xlink:href="#radialGradient4241"
384- gradientUnits="userSpaceOnUse"
385- gradientTransform="matrix(-0.3294887,0,0,0.3497464,41.963041,0.4938257)" />
386- <radialGradient
387- cx="11.25"
388- cy="19.03125"
389- r="8.0625"
390- fx="11.25"
391- fy="19.03125"
392- id="radialGradient2505"
393- xlink:href="#linearGradient5105-262-943-861"
394- gradientUnits="userSpaceOnUse"
395- gradientTransform="matrix(1,0,0,0.282946,0,13.64644)" />
396- <linearGradient
397- id="linearGradient5105-262-943-861">
398- <stop
399- id="stop2487"
400- style="stop-color:#0d0d0d;stop-opacity:1"
401- offset="0" />
402- <stop
403- id="stop2489"
404- style="stop-color:#0d0d0d;stop-opacity:0"
405- offset="1" />
406- </linearGradient>
407- <linearGradient
408- id="linearGradient5113">
409- <stop
410- id="stop5115"
411- style="stop-color:#ffffff;stop-opacity:1"
412- offset="0" />
413- <stop
414- id="stop5117"
415- style="stop-color:#ffffff;stop-opacity:0"
416- offset="1" />
417- </linearGradient>
418- <linearGradient
419- id="linearGradient2264">
420- <stop
421- id="stop2266"
422- style="stop-color:#d7e866;stop-opacity:1"
423- offset="0" />
424- <stop
425- id="stop2268"
426- style="stop-color:#8cab2a;stop-opacity:1"
427- offset="1" />
428- </linearGradient>
429- <linearGradient
430- id="linearGradient6280">
431- <stop
432- id="stop6282"
433- style="stop-color:#ffffff;stop-opacity:1"
434- offset="0" />
435- <stop
436- id="stop6284"
437- style="stop-color:#ffffff;stop-opacity:0"
438- offset="1" />
439- </linearGradient>
440- <linearGradient
441- id="linearGradient6316-673-936-474">
442- <stop
443- id="stop6158"
444- style="stop-color:#ffc391;stop-opacity:1"
445- offset="0" />
446- <stop
447- id="stop6160"
448- style="stop-color:#fa650b;stop-opacity:1"
449- offset="1" />
450- </linearGradient>
451- <linearGradient
452- id="linearGradient6332-24-473-272">
453- <stop
454- id="stop6164"
455- style="stop-color:#f9650d;stop-opacity:1"
456- offset="0" />
457- <stop
458- id="stop6166"
459- style="stop-color:#c15619;stop-opacity:1"
460- offset="1" />
461- </linearGradient>
462- <linearGradient
463- x1="58.748795"
464- y1="2.047786"
465- x2="105.32369"
466- y2="58.047787"
467- id="linearGradient2756"
468- xlink:href="#linearGradient5113"
469- gradientUnits="userSpaceOnUse"
470- gradientTransform="matrix(0.6162702,0,0,0.6095496,-18.496484,1.0633455)" />
471- <linearGradient
472- x1="25"
473- y1="11.923377"
474- x2="25"
475- y2="40.32198"
476- id="linearGradient2759"
477- xlink:href="#linearGradient2264"
478- gradientUnits="userSpaceOnUse"
479- gradientTransform="matrix(0.6134245,0,0,0.6095496,15.25495,2.9211251)" />
480- <radialGradient
481- cx="100.62272"
482- cy="-22.827475"
483- r="116.21894"
484- fx="100.62272"
485- fy="-22.827475"
486- id="radialGradient3576"
487- xlink:href="#linearGradient6280"
488- gradientUnits="userSpaceOnUse"
489- gradientTransform="matrix(1.1591085e-3,2.1664108e-2,0.1275146,-7.1251725e-3,18.062496,1.5441737)" />
490- <radialGradient
491- cx="26.685698"
492- cy="30.945623"
493- r="26.269466"
494- fx="26.685698"
495- fy="30.945623"
496- id="radialGradient3579"
497- xlink:href="#linearGradient6280"
498- gradientUnits="userSpaceOnUse"
499- gradientTransform="matrix(7.3777652e-2,-2.6279972e-3,3.7287401e-3,0.1026761,20.693288,-1.1936799)" />
500- <radialGradient
501- cx="26.685698"
502- cy="30.945623"
503- r="26.269466"
504- fx="26.685698"
505- fy="30.945623"
506- id="radialGradient3582"
507- xlink:href="#linearGradient6280"
508- gradientUnits="userSpaceOnUse"
509- gradientTransform="matrix(8.0271918e-2,-2.8593263e-3,4.0569619e-3,0.1117142,-0.3342571,10.351081)" />
510- <radialGradient
511- cx="100.62272"
512- cy="-22.827475"
513- r="116.21894"
514- fx="100.62272"
515- fy="-22.827475"
516- id="radialGradient3585"
517- xlink:href="#linearGradient6280"
518- gradientUnits="userSpaceOnUse"
519- gradientTransform="matrix(1.8666389e-2,1.2282602e-2,-7.2640945e-2,0.1082825,4.7320256,9.1150114)" />
520- <radialGradient
521- cx="103.93583"
522- cy="-34.003952"
523- r="38.212933"
524- fx="103.93583"
525- fy="-34.003952"
526- id="radialGradient3588"
527- xlink:href="#linearGradient6316-673-936-474"
528- gradientUnits="userSpaceOnUse"
529- gradientTransform="matrix(-2.6660283e-4,0.4769771,-0.7574445,0,-20.254028,-48.237726)" />
530- <radialGradient
531- cx="96.124382"
532- cy="-26.100422"
533- r="38.212933"
534- fx="96.124382"
535- fy="-26.100426"
536- id="radialGradient3590"
537- xlink:href="#linearGradient6332-24-473-272"
538- gradientUnits="userSpaceOnUse"
539- gradientTransform="matrix(-2.6655826e-4,0.4769771,-0.7504712,-4.9252264e-4,-14.087622,-44.524706)" />
540- </defs>
541- <rect
542- width="36.869301"
543- height="5"
544- x="5.5653324"
545- y="40"
546- id="rect2723"
547- style="opacity:0.3;fill:url(#linearGradient2942);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible" />
548- <path
549- d="M 42.41667,40.000174 C 42.41667,40.000174 42.41667,44.999897 42.41667,44.999897 C 44.7262,45.009311 48,43.879712 48,42.499715 C 48,41.119718 45.42274,40.000174 42.41667,40.000174 z"
550- id="path2725"
551- style="opacity:0.3;fill:url(#radialGradient2939);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible" />
552- <path
553- d="M 5.58333,40.000174 C 5.58333,40.000174 5.58333,44.999897 5.58333,44.999897 C 3.2737899,45.009311 0,43.879712 0,42.499715 C 0,41.119718 2.5772699,40.000174 5.58333,40.000174 z"
554- id="path2727"
555- style="opacity:0.3;fill:url(#radialGradient2936);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
556- <path
557- d="M 1.4638537,36.464001 L 46.535854,36.464001 L 45.634652,42.536001 L 2.4652334,42.536001 L 1.4638537,36.464001 L 1.4638537,36.464001 z"
558- id="rect6431"
559- style="fill:url(#linearGradient2933);fill-opacity:1;fill-rule:evenodd;stroke:#353537;stroke-width:0.9279989;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline;enable-background:new" />
560- <rect
561- width="45"
562- height="1"
563- x="1.5"
564- y="35.999855"
565- id="rect6381"
566- style="fill:#d2d2d3;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline;enable-background:new" />
567- <path
568- d="M 46.55,36.601962 L 39.740367,10.827625 C 39.547814,10.093652 38.539167,9.497746 37.691201,9.497746 L 10.073983,9.497746 C 8.771243,9.497746 8.024726,9.696319 7.750024,10.827625 L 1.45,36.576866"
569- id="path6345"
570- style="fill:url(#radialGradient2927);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2929);stroke-width:0.99578345;stroke-linecap:round;stroke-linejoin:round;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
571- <path
572- d="M 45.500002,36.499854 L 2.5000001,36.475803"
573- id="path7046"
574- style="opacity:0.4;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
575- <path
576- d="M 40.971397,25.373814 C 40.753717,23.375839 39.294888,21.470692 36.870997,19.967342 C 36.822237,19.38948 36.200942,11.997153 36.200942,11.997153 C 36.153322,11.428888 35.429193,11 34.515926,11 L 28.784658,11 C 27.864824,11 27.153776,11.434524 27.130585,12.010704 C 27.025415,14.61391 23.81856,15.97308 19.034961,17.209506 C 17.358841,17.499846 12.988956,18.864662 11.985997,19.463689 C 9.0335593,21.037294 7.2727707,23.135159 7.0287933,25.373814 C 6.8068536,27.409883 7.8736194,29.447365 10.032659,31.110982 C 13.192718,33.546027 18.414005,35 23.999896,35 C 29.585796,35 34.807072,33.546027 37.967531,31.110982 C 39.939434,29.591833 41,27.760327 41,25.903156 C 41,25.726796 40.98969,25.550164 40.97134,25.373814 L 40.971397,25.373814 L 40.971397,25.373814 z M 23.999896,33.99015 C 14.696398,33.99015 7.572413,29.909825 8.0878175,25.179971 C 8.3101455,23.140798 9.9421793,20.963935 12.644839,19.529432 C 13.150961,19.14795 17.721912,17.664065 19.361677,17.403346 C 23.906332,16.231256 28.062408,14.71013 28.192703,11.504506 C 28.198403,11.351005 28.46026,11.229399 28.784658,11.229399 L 34.51516,11.229399 C 34.8469,11.229399 35.126858,11.35693 35.14,11.514383 L 35.835941,19.796357 C 38.244757,21.1922 39.704351,23.275666 39.911596,25.179971 C 40.427377,29.909825 33.303405,33.99015 23.999896,33.99015 L 23.999896,33.99015 L 23.999896,33.99015 z"
577- id="path9001"
578- style="fill:url(#radialGradient2923);fill-opacity:1" />
579- <path
580- d="M 23.911802,28.403628 C 20.493013,28.403628 17.872163,27.097179 17.816921,25.364295 C 17.816486,25.345556 17.816061,25.327138 17.816061,25.30872 C 17.816061,24.681666 18.159568,24.085301 18.812309,23.58036 C 19.916498,22.726839 21.822918,22.217373 23.912225,22.217373 C 26.00111,22.217373 27.907518,22.726839 29.011707,23.58036 C 29.683728,24.099512 30.028104,24.716556 30.007106,25.363968 C 29.950983,27.096852 27.330156,28.403623 23.911802,28.403623 L 23.911802,28.403626 L 23.911802,28.403628 z M 23.911802,23.186884 C 20.69945,23.186884 19.06287,24.481699 19.10142,25.66377 C 19.138677,26.827429 21.292246,27.757192 23.911802,27.757192 C 26.531359,27.757192 28.684905,26.827101 28.722174,25.66377 C 28.760264,24.481372 27.124143,23.186884 23.911802,23.186884 L 23.911802,23.186884 L 23.911802,23.186884 z"
581- id="path9003"
582- style="fill:url(#radialGradient2920);fill-opacity:1;fill-rule:nonzero;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
583- <path
584- d="M 6.0158229,34.619284 C 5.9743063,35.214553 5.3525618,35.7 4.6276859,35.7 C 3.9031401,35.7 3.3545414,35.214553 3.4029762,34.619284 C 3.4510822,34.027163 4.0724979,33.549059 4.7901243,33.549059 C 5.5080807,33.54934 6.0566794,34.027163 6.0158229,34.619284 L 6.0158229,34.619284 z"
585- id="path9007"
586- style="fill:#e1e1e1;fill-opacity:1" />
587- <path
588- d="M 5.5469595,34.200637 C 5.6131875,34.276177 5.6889697,34.397195 5.6889697,34.558078 C 5.6889697,34.569628 5.6883095,34.581158 5.6876497,34.593408 C 5.6589827,35.00366 5.1736469,35.350259 4.6280136,35.350259 C 4.3173057,35.350259 4.0332867,35.236591 3.8685419,35.04563 C 3.7977029,34.96414 3.716977,34.829137 3.7314747,34.649367 C 3.7647527,34.242612 4.2494303,33.898811 4.790452,33.898811 C 5.0988534,33.899091 5.3818835,34.011779 5.5469572,34.200642 L 5.5469598,34.200642 L 5.5469595,34.200637 z"
589- id="path9009"
590- style="fill:url(#radialGradient2965);fill-opacity:1" />
591- <path
592- d="M 36.912257,10.696563 C 36.901247,10.955156 37.290737,11.227406 37.782068,11.303071 C 38.273176,11.378701 38.676955,11.228611 38.683281,10.9693 C 38.689581,10.711364 38.299868,10.442285 37.81345,10.367377 C 37.326791,10.292557 36.923513,10.439387 36.912257,10.696563 z"
593- id="path9025"
594- style="fill:#e1e1e1;fill-opacity:1" />
595- <path
596- d="M 37.257597,10.566686 C 37.207737,10.592036 37.148412,10.635816 37.137829,10.704538 C 37.137069,10.709438 37.136729,10.714438 37.136429,10.719768 C 37.128829,10.897993 37.435043,11.096698 37.804881,11.153652 C 38.015483,11.186082 38.215472,11.167182 38.3397,11.102812 C 38.39308,11.075402 38.456673,11.026162 38.458671,10.947862 C 38.462871,10.77065 38.156964,10.573209 37.790252,10.516736 C 37.581195,10.484666 37.38194,10.503256 37.257628,10.566696 L 37.257626,10.566695 L 37.257597,10.566686 z"
597- id="path9027"
598- style="fill:url(#radialGradient2953);fill-opacity:1" />
599- <path
600- d="M 7.5000002,36.999999 L 26.000009,36.999999 L 26.000009,42 L 8.0000091,42 L 7.5000002,36.999999 z"
601- id="rect8993"
602- style="fill:url(#linearGradient2908);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.40899992;marker:none;visibility:visible;display:inline;overflow:visible" />
603- <path
604- d="M 8.0000077,41.999996 C 8.0000077,41.999996 7.6000002,38.394169 7.6000002,38.394169 C 9.4745813,41.2519 16.473019,41.999996 21.212771,41.999996 C 21.212771,41.999996 8.0000077,41.999996 8.0000077,41.999996 L 8.0000077,41.999996 z"
605- id="path8995"
606- style="opacity:0.81142853;fill:url(#linearGradient2905);fill-opacity:1;fill-rule:evenodd;stroke:none" />
607- <path
608- d="M 10.906579,11 L 10.803305,11.381009 L 9.2615551,17.051898 L 9,18 L 9.7639975,17.796205 L 22.758771,14.2519 L 22.800041,14.23419 L 22.834461,14.21648 C 23.522596,13.862126 23.890291,13.14603 23.977009,12.488631 C 24.020409,12.159929 24.007399,11.838056 23.894469,11.540532 C 23.787827,11.259656 23.510193,11.009755 23.219953,11.017745 L 23.219953,11.000035 L 23.171743,11.000035 L 11.216282,11.000035 L 10.906552,11.000035 L 10.906585,11.000036 L 10.906579,11 z M 11.346415,11.350376 L 23.322959,11.350376 C 23.328559,11.398246 23.342019,11.424806 23.329659,11.515376 C 23.292089,11.800397 23.130464,12.820075 22.724417,13.042517 L 10.128359,16.480002 L 11.345951,11.350378 L 11.346342,11.350378 L 11.346415,11.350376 z"
609- id="path9039"
610- style="fill:url(#radialGradient2902);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
611- <path
612- d="M 42.002142,34.619284 C 42.043659,35.214553 42.665403,35.7 43.390279,35.7 C 44.114825,35.7 44.663424,35.214553 44.614989,34.619284 C 44.566879,34.027163 43.945467,33.549059 43.227841,33.549059 C 42.509884,33.54934 41.961286,34.027163 42.002142,34.619284 L 42.002142,34.619284 z"
613- id="path9091"
614- style="fill:#e1e1e1;fill-opacity:1" />
615- <path
616- d="M 42.471006,34.200637 C 42.404776,34.276177 42.328995,34.397195 42.328995,34.558078 C 42.328995,34.569628 42.329655,34.581158 42.330295,34.593408 C 42.358965,35.00366 42.844297,35.350259 43.389931,35.350259 C 43.700639,35.350259 43.984658,35.236591 44.149402,35.04563 C 44.220242,34.96414 44.300967,34.829137 44.28647,34.649367 C 44.25319,34.242612 43.768514,33.898811 43.227492,33.898811 C 42.919091,33.899091 42.636061,34.011779 42.470987,34.200642 L 42.470985,34.200642 L 42.471006,34.200637 z"
617- id="path9093"
618- style="fill:url(#radialGradient2947);fill-opacity:1" />
619- <rect
620- width="42"
621- height="5"
622- x="3"
623- y="37"
624- id="rect6300-3"
625- style="opacity:0.3;fill:url(#radialGradient2896);fill-opacity:1;stroke:none" />
626- <path
627- d="M 19.3125,19.03125 A 8.0625,2.28125 0 1 1 3.1875,19.03125 A 8.0625,2.28125 0 1 1 19.3125,19.03125 z"
628- transform="matrix(2.2325581,0,0,1.5342466,-1.1162791,-2.6986301)"
629- id="path2638"
630- style="opacity:0.16292138;fill:url(#radialGradient2505);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
631- <path
632- d="M 23.928189,0.50089335 C 22.490433,0.50089335 21.333916,1.6545795 21.334163,3.0785122 C 21.333916,4.5024448 22.490434,5.6561312 23.928189,5.6561311 C 25.365945,5.6561311 26.542725,4.5024446 26.54248,3.0785122 C 26.542726,1.6545796 25.365946,0.50089335 23.928189,0.50089335 z M 16.206909,3.0785122 C 14.911159,3.1733902 13.668521,3.4944123 12.518528,3.9645687 L 14.849099,7.9115476 C 15.443939,7.7246837 16.06224,7.6220784 16.713555,7.5893453 C 16.841047,7.5829657 16.969514,7.5893453 17.098605,7.5893453 C 20.670094,7.5893453 23.650554,10.072718 24.394302,13.388987 L 29.035176,13.388987 C 28.705844,10.978257 27.636706,8.7966658 26.076366,7.0657664 C 25.435536,7.4067048 24.706104,7.5893453 23.928189,7.5893453 C 21.485748,7.5893453 19.480698,5.6916324 19.368378,3.3000264 C 18.633302,3.1609306 17.874117,3.0785122 17.098605,3.0785122 C 16.942855,3.0785121 16.786814,3.0726932 16.632492,3.0785122 C 16.582258,3.0804067 16.540707,3.0760119 16.49063,3.0785122 C 16.443452,3.0808706 16.395829,3.0756124 16.34877,3.0785122 C 16.303186,3.0813217 16.252374,3.0751806 16.206909,3.0785122 z M 9.7218449,5.5755805 C 7.8530538,7.0166312 6.4277483,9.0007527 5.6686793,11.274534 C 6.8676964,12.08743 7.6547302,13.453294 7.6547302,14.999999 C 7.6547302,16.546702 6.8676964,17.912569 5.6686793,18.725464 C 6.4274961,20.999799 7.8524028,22.984795 9.7218449,24.424419 L 12.032149,20.457302 C 10.546135,19.102755 9.6205154,17.155869 9.6205154,14.999999 C 9.6205154,12.844908 10.547941,10.900614 12.032149,9.5426971 L 9.7218449,5.5755805 z M 3.1151852,12.422381 C 1.6774296,12.422381 0.50064731,13.576066 0.50089374,14.999999 C 0.50064731,16.423931 1.677429,17.577617 3.1151852,17.577618 C 4.5529416,17.577618 5.709458,16.423931 5.7092109,14.999999 C 5.7094574,13.576067 4.5529409,12.422381 3.1151852,12.422381 z M 24.394302,16.611011 C 23.650556,19.927279 20.670093,22.410653 17.098605,22.410653 C 16.307922,22.410653 15.562801,22.292413 14.849099,22.068314 L 12.518528,26.015293 C 13.93074,26.592694 15.476238,26.921486 17.098605,26.921486 C 17.874117,26.921488 18.633303,26.839069 19.368378,26.699973 C 19.481611,24.408739 21.340406,22.555439 23.644467,22.410653 C 23.741151,22.404595 23.829968,22.410654 23.928189,22.410653 C 24.706104,22.410653 25.435536,22.593295 26.076366,22.934232 C 27.636707,21.203335 28.705843,19.021741 29.035176,16.611011 L 24.394302,16.611011 z M 23.928189,24.343867 C 22.490433,24.343867 21.333916,25.497553 21.334163,26.921486 C 21.333916,28.345419 22.490434,29.499107 23.928189,29.499105 C 25.365945,29.499105 26.542725,28.345419 26.54248,26.921486 C 26.542726,25.497553 25.365946,24.343868 23.928189,24.343867 z"
633- id="path2317"
634- style="fill:url(#radialGradient3588);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient3590);stroke-width:1.00178742;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
635- <path
636- d="M 9.6096427,6.3451474 C 8.0415181,7.6374979 6.8292503,9.3423438 6.1381684,11.287402 C 7.2689401,12.144255 8.0119748,13.48219 8.0119748,14.998976 C 8.0119748,16.51576 7.2689401,17.853696 6.1381684,18.710549 C 6.8289194,20.656143 8.0413217,22.361521 9.6096427,23.652805 L 11.542621,20.331922 C 10.147789,18.971012 9.2743291,17.087695 9.2743291,14.998976 C 9.2743291,12.910125 10.148989,11.029346 11.542621,9.6660288 L 9.6096427,6.3451474 L 9.6096427,6.3451474 z M 9.4518481,7.3023419 L 10.753651,9.5683567 C 9.5064152,10.943182 8.7146167,12.734426 8.6431532,14.705955 C 8.564562,13.272327 7.893887,11.983747 6.8876914,11.07252 C 7.4643172,9.6374996 8.3472827,8.3521709 9.4518481,7.3023419 L 9.4518481,7.3023419 z M 8.6431532,15.291994 C 8.714448,17.2634 9.504479,19.055625 10.753651,20.429594 L 9.4518481,22.69561 C 8.3479376,21.646314 7.4636776,20.360782 6.8876914,18.925432 C 7.8946373,18.014158 8.5643588,16.725808 8.6431532,15.291994 L 8.6431532,15.291994 z"
637- id="path2272"
638- style="opacity:0.6;fill:url(#radialGradient3585);fill-opacity:1;stroke:none;display:inline" />
639- <path
640- d="M 2.8607994,12.909163 C 1.8084893,13.026728 0.99565385,13.921727 0.99565385,14.998936 C 0.99565385,16.155761 1.9376595,17.088708 3.1057166,17.088708 C 4.2737748,17.088708 5.2157799,16.155761 5.2157804,14.998936 C 5.2157799,13.842109 4.2737736,12.909163 3.1057166,12.909163 C 3.0283049,12.909163 2.9661345,12.906895 2.9361587,12.909163 C 2.9106396,12.911074 2.8860542,12.906357 2.8607994,12.909163 L 2.8607994,12.909163 z M 2.9173187,13.506241 C 2.9412781,13.503315 2.9683917,13.508091 2.992678,13.506241 C 3.0115696,13.505934 3.0519963,13.506241 3.1057172,13.506241 C 3.9475841,13.506241 4.6129051,14.165164 4.6129051,14.998936 C 4.6129051,15.832706 3.9475841,16.491631 3.1057172,16.491631 C 2.2638502,16.491631 1.5985293,15.832706 1.5985293,14.998936 C 1.5985293,14.227739 2.174568,13.597715 2.9173187,13.506241 L 2.9173187,13.506241 z"
641- id="path2284"
642- style="opacity:0.6;fill:url(#radialGradient3582);fill-opacity:1;stroke:none;display:inline" />
643- <path
644- d="M 23.629853,1.157445 C 22.662678,1.2654977 21.915604,2.0880894 21.915604,3.0781479 C 21.915604,4.1413821 22.781398,4.9988505 23.854955,4.9988505 C 24.928514,4.9988505 25.794308,4.1413821 25.794308,3.0781479 C 25.794308,2.0149127 24.928513,1.157445 23.854955,1.157445 C 23.783806,1.157445 23.726666,1.1553598 23.699116,1.157445 C 23.675661,1.1592008 23.653064,1.154866 23.629853,1.157445 L 23.629853,1.157445 z M 23.6818,1.7062167 C 23.703821,1.7035281 23.728741,1.7079177 23.751062,1.7062167 C 23.768425,1.7059352 23.805581,1.7062167 23.854956,1.7062167 C 24.628713,1.7062167 25.240208,2.3118302 25.240208,3.0781479 C 25.240208,3.844464 24.628713,4.4500787 23.854956,4.4500787 C 23.081199,4.4500787 22.469704,3.844464 22.469704,3.0781479 C 22.469704,2.3693436 22.999139,1.7902907 23.6818,1.7062167 L 23.6818,1.7062167 z"
645- id="path4951"
646- style="opacity:0.6;fill:url(#radialGradient3579);fill-opacity:1;stroke:none;display:inline" />
647- <path
648- d="M 13.307558,4.2483278 C 15.176164,3.5776749 17.217719,3.408216 19.204739,3.7928418 C 19.37037,5.1609877 20.134671,6.4431845 21.417689,7.1932309 C 22.700703,7.9432771 24.199864,7.9842911 25.48382,7.4635687 C 26.787982,9.0025823 27.630995,10.8585 27.947733,12.806918 L 24.182817,12.779196 C 23.721395,10.94125 22.560261,9.2804307 20.793457,8.2475645 C 19.026543,7.2146331 17.003117,7.0151206 15.160768,7.5049418 L 13.307558,4.2483278 L 13.307558,4.2483278 z M 14.195259,4.589866 L 15.468293,6.7976849 C 17.247982,6.4358269 19.1547,6.6602717 20.857713,7.5755007 C 19.683901,6.8009354 18.925565,5.6035803 18.652339,4.3125942 C 17.153347,4.0845854 15.62949,4.1864572 14.195259,4.589866 L 14.195259,4.589866 z M 21.35343,7.865296 C 22.985745,8.8996969 24.111081,10.44579 24.655579,12.168537 L 27.216091,12.201794 C 26.874396,10.760923 26.224256,9.3866853 25.294948,8.1958376 C 24.02619,8.5862287 22.605227,8.508503 21.35343,7.865296 L 21.35343,7.865296 z"
649- id="path4955"
650- style="opacity:0.6;fill:url(#radialGradient3576);fill-opacity:1;stroke:none;display:inline" />
651- <path
652- d="M 41.325491,18.48017 L 33.942773,26.998333 L 26.597058,18.48017 L 30.333911,18.48017 C 31.589774,15.1362 29.010939,13.007757 26.020881,13.007757 C 23.896126,13.007757 21.013356,14.168923 20.039574,17.056019 C 19.533095,18.557656 18.641004,17.89983 18.675478,16.594748 C 18.808916,11.558766 22.566356,7.5313496 28.175595,7.5313496 C 33.784835,7.5313496 37.951655,11.858292 37.636913,18.48017 L 41.325491,18.48017 z"
653- id="path4972"
654- style="fill:url(#linearGradient2759);fill-opacity:1;fill-rule:nonzero;stroke:#699536;stroke-width:0.99999958;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
655- <path
656- d="M 39.106682,19.470663 L 33.942773,25.397297 L 28.811178,19.470663 L 31.002811,19.470663 C 32.92471,15.217014 30.104674,12.129862 26.29659,12.068889 C 23.553914,11.855335 21.093847,13.851366 19.597282,15.658044 C 20.550996,11.380507 23.516616,8.5262665 28.207269,8.5174462 C 32.946284,8.5085353 37.600491,12.359332 36.552832,19.470663 L 39.106682,19.470663 z"
657- id="path4980"
658- style="opacity:0.35400002;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2756);stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
659-</svg>
660
661=== modified file 'debian/changelog'
662--- debian/changelog 2013-06-15 18:11:18 +0000
663+++ debian/changelog 2013-06-26 01:00:37 +0000
664@@ -1,3 +1,13 @@
665+usb-creator (0.2.49) UNRELEASED; urgency=low
666+
667+ * Don't override the usb-creator-gtk logo on Ubuntu;
668+ Humanity already includes the Ubuntu logo and the "upstream" logo is
669+ probably better for derivatives
670+ * Use python-distutils-extra in auto mode and reorganize a few things
671+ so that it works
672+
673+ -- Jeremy Bicha <jbicha@ubuntu.com> Sat, 15 Jun 2013 21:03:48 -0400
674+
675 usb-creator (0.2.48) saucy; urgency=low
676
677 * Depend on gir1.2-gudev-1.0 (LP: #1178057)
678
679=== modified file 'debian/usb-creator-common.install'
680--- debian/usb-creator-common.install 2013-01-24 17:00:31 +0000
681+++ debian/usb-creator-common.install 2013-06-26 01:00:37 +0000
682@@ -6,8 +6,8 @@
683 usr/lib/python*/*/usbcreator/*.py
684 usr/share/usb-creator/usb-creator-helper
685 usr/share/usb-creator/ubuntu-nexus7-USAGE-NOTICE-en.txt
686-usr/share/polkit-1/actions/*
687-usr/share/dbus-1/system-services/*
688-etc/dbus-1/system.d/*
689-usr/share/apport/package-hooks/source_usb-creator.py
690-usr/share/locale/*
691+etc/dbus-1
692+usr/share/apport
693+usr/share/dbus-1
694+usr/share/locale
695+usr/share/polkit-1
696
697=== removed directory 'gui'
698=== modified file 'po/POTFILES.in'
699--- po/POTFILES.in 2013-01-28 12:50:00 +0000
700+++ po/POTFILES.in 2013-06-26 01:00:37 +0000
701@@ -1,6 +1,6 @@
702 ./dbus/com.ubuntu.usbcreator.policy.in
703-./desktop/usb-creator-gtk.desktop.in
704-./desktop/usb-creator-kde.desktop.in
705+./data/usb-creator-gtk.desktop.in
706+./data/usb-creator-kde.desktop.in
707 ./usbcreator/frontends/base/__init__.py
708 ./usbcreator/frontends/base/frontend.py
709 ./usbcreator/frontends/__init__.py
710@@ -31,8 +31,8 @@
711 ./usbcreator/backends/windows/backend.py
712 ./usbcreator/backends/windows/__init__.py
713 ./usbcreator/misc.py
714-./gui/usbcreator-kde.ui
715-[type: gettext/glade]./gui/usbcreator-gtk.ui
716+./data/usbcreator-kde.ui
717+[type: gettext/glade]./data/usbcreator-gtk.ui
718 ./main.py
719 ./bin/usb-creator-gtk
720 ./bin/usb-creator-kde
721
722=== modified file 'setup.cfg'
723--- setup.cfg 2011-05-19 15:50:54 +0000
724+++ setup.cfg 2013-06-26 01:00:37 +0000
725@@ -3,5 +3,5 @@
726
727 [build_i18n]
728 domain = usbcreator
729-desktop_files = [('share/applications', ['desktop/usb-creator-gtk.desktop.in', 'desktop/usb-creator-kde.desktop.in'])]
730+desktop_files = [('share/applications', ['data/usb-creator-gtk.desktop.in', 'data/usb-creator-kde.desktop.in'])]
731 xml_files = [('share/polkit-1/actions', ['dbus/com.ubuntu.usbcreator.policy.in'])]
732
733=== modified file 'setup.py'
734--- setup.py 2013-01-24 17:00:31 +0000
735+++ setup.py 2013-06-26 01:00:37 +0000
736@@ -1,5 +1,6 @@
737 from distutils.core import setup
738 from DistUtilsExtra.command import *
739+from DistUtilsExtra.auto import *
740 import os
741
742 class usb_creator_build_i18n(build_i18n.build_i18n):
743@@ -23,20 +24,9 @@
744 'usbcreator.backends.fastboot',
745 'usbcreator.backends.udisks',
746 ],
747- scripts=['bin/usb-creator-gtk','bin/usb-creator-kde'],
748- data_files=[('share/usb-creator', ['gui/usbcreator-gtk.ui']),
749+ data_files=[
750+ ('share/kde4/apps/usb-creator-kde', ['data/usbcreator-kde.ui']),
751 ('share/usb-creator', ['bin/usb-creator-helper']),
752- ('share/usb-creator', ['gui/ubuntu-nexus7-USAGE-NOTICE-en.txt']),
753- ('share/icons/hicolor/scalable/apps', ['desktop/usb-creator-gtk.svg', 'desktop/usb-creator-kde.svg']),
754- ('share/kde4/apps/usb-creator-kde', ['gui/usbcreator-kde.ui']),
755- ('/etc/dbus-1/system.d', ['dbus/com.ubuntu.USBCreator.conf']),
756- ('share/dbus-1/system-services', ['dbus/com.ubuntu.USBCreator.service']),
757- ('share/apport/package-hooks', ['debian/source_usb-creator.py'])],
758- cmdclass = { "build" : build_extra.build_extra,
759- "build_i18n" : usb_creator_build_i18n,
760- "build_help" : build_help.build_help,
761- "build_icons" : build_icons.build_icons,
762- "clean": clean_i18n.clean_i18n,
763- }
764+ ('share/usb-creator', ['data/ubuntu-nexus7-USAGE-NOTICE-en.txt']),
765+ ],
766 )
767-
768
769=== modified file 'usbcreator/frontends/gtk/frontend.py'
770--- usbcreator/frontends/gtk/frontend.py 2013-01-28 12:44:46 +0000
771+++ usbcreator/frontends/gtk/frontend.py 2013-06-26 01:00:37 +0000
772@@ -29,8 +29,8 @@
773 from usbcreator import misc
774
775 if 'USBCREATOR_LOCAL' in os.environ:
776- ui_path = os.path.join(os.getcwd(), 'gui/usbcreator-gtk.ui')
777- eula_path = os.path.join(os.getcwd(), 'gui/ubuntu-nexus7-USAGE-NOTICE-en.txt')
778+ ui_path = os.path.join(os.getcwd(), 'data/usbcreator-gtk.ui')
779+ eula_path = os.path.join(os.getcwd(), 'data/ubuntu-nexus7-USAGE-NOTICE-en.txt')
780 else:
781 ui_path = '/usr/share/usb-creator/usbcreator-gtk.ui'
782 eula_path = '/usr/share/usb-creator/ubuntu-nexus7-USAGE-NOTICE-en.txt'
783
784=== modified file 'usbcreator/frontends/kde/frontend.py'
785--- usbcreator/frontends/kde/frontend.py 2013-01-25 13:36:09 +0000
786+++ usbcreator/frontends/kde/frontend.py 2013-06-26 01:00:37 +0000
787@@ -126,7 +126,7 @@
788
789 # Locate the ui for the main window and load it.
790 if 'USBCREATOR_LOCAL' in os.environ:
791- appdir = os.path.join(os.getcwd(), 'gui')
792+ appdir = os.path.join(os.getcwd(), 'data')
793 else:
794 file = KStandardDirs.locate("appdata", self.__mainWindow_ui)
795 appdir = file[:file.rfind("/")]

Subscribers

People subscribed via source and target branches