Merge lp:~usb-creator-hackers/usb-creator/debian into lp:usb-creator
- debian
- Merge into trunk
Status: | Rejected |
---|---|
Rejected by: | Dimitri John Ledkov |
Proposed branch: | lp:~usb-creator-hackers/usb-creator/debian |
Merge into: | lp:usb-creator |
Diff against target: |
1173 lines (+1050/-11) (has conflicts) 10 files modified
debian/Debian/usb-creator-gtk-16x16.xpm (+115/-0) debian/Debian/usb-creator-gtk-32x32.xpm (+254/-0) debian/Debian/usb-creator-kde-16x16.xpm (+155/-0) debian/Debian/usb-creator-kde-32x32.xpm (+466/-0) debian/changelog (+21/-3) debian/control (+12/-5) debian/copyright (+1/-0) debian/rules (+14/-3) debian/usb-creator-gtk.menu (+6/-0) debian/usb-creator-kde.menu (+6/-0) Text conflict in debian/control |
To merge this branch: | bzr merge lp:~usb-creator-hackers/usb-creator/debian |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Evan (community) | Needs Fixing | ||
usb-creator hackers | Pending | ||
Review via email: mp+26070@code.launchpad.net |
This proposal has been superseded by a proposal from 2010-05-27.
Commit message
Description of the change
All quirks for Debian are sorted out now.
Probably ready for upload to Debian, cause debian/changlog is way to long now =)
Dimitri John Ledkov (xnox) wrote : | # |
On 27 May 2010 11:07, Evan Dandrea <email address hidden> wrote:
> Review: Needs Fixing
> With respect to the top of changelog, the approach we've always taken is to keep the pocket as UNRELEASED until we're ready to upload. We then run dch -r but do not commit the change and upload. Once the upload is accepted by the archive, we run debcommit -r. This commits the aforementioned change and creates a tag.
>
> I think the new description is inaccurate. usb-creator can write debian-installer images (including the Ubuntu alternate and server CDs) to USB disks as well. What do you think of changing it to,
> "Startup Disk Creator converts a USB key or SD card into a volume from which you
> can start up and run Ubuntu. You can also store files and settings in any space left over.
>
> The program also works for Debian, or any other Debian-based OS for which you have a CD or .iso image."
> Credit to Matthew Paul Thomas for coming up with that this morning :).
>
=) sounds like proper English =) i like it.
> "Startup disk creator" should probably be capitalized to match the .desktop files, unless convention forbids it. The Debian policy doesn't specify a behavior: http://
>
> Also, unless I'm misreading the discussion we had in merge 25344 (https:/
Merge errors (bzr is too smart, i needed the good old
"bang-it-
instead of "intelegently" merging in both changelog entries) =) Will
hunt it down.
> Perhaps I'm just not following the process you have in mind though. Why not just upload to Debian from trunk? Apologies if I'm forgetting comments I've made to the contrary. My brain isn't fully operational yet this morning :).
yes, still hopefully releasing from trunk to Debian.
/me sends Starbucks coffee.
Unmerged revisions
- 313. By Dimitri John Ledkov
-
+ debian-menu installed if there are branded xpm's
+ Added Build dependency on kdesdk-scripts (Debian specific) - 312. By Dimitri John Ledkov
-
+ added forgotten python-support dependency
* Debranded package description
* Initial Debian release (Closes: #582884, #576359)
* debian/control:
+ Added Build dependency on kdesdk-scripts
* debian/rules:
+ Added xpm files installation
+ Changed the find command to use absolute path
+ Now overrides dh_auto_install instead of dh_install
* debian/usb-creator- gtk.menu and debian/ usb-creator- kde.menu:
+ Added these files as per the Debian Menu Policy
* debian/Debian/ *.xpm:
+ Added the xpm icons needed by the menu files
* debian/usb-creator- (gtk|kde) .install:
+ Added xpm files installation
* debian/copyright:
+ Added myself in the debian/* copyright
* desktop:
+ Removed "HardwareSettings" from the Categories of the GTK desktop file - 311. By Dimitri John Ledkov
-
+ debranded package description
+ forgot python-support dependency
Preview Diff
1 | === added file 'debian/Debian/usb-creator-gtk-16x16.xpm' |
2 | --- debian/Debian/usb-creator-gtk-16x16.xpm 1970-01-01 00:00:00 +0000 |
3 | +++ debian/Debian/usb-creator-gtk-16x16.xpm 2010-05-26 16:08:34 +0000 |
4 | @@ -0,0 +1,115 @@ |
5 | +/* XPM */ |
6 | +static char * usb_creator_gtk_16x16_xpm[] = { |
7 | +"16 16 96 2", |
8 | +" c None", |
9 | +". c #D50650", |
10 | +"+ c #D60650", |
11 | +"@ c #D6064F", |
12 | +"# c #D50049", |
13 | +"$ c #D50550", |
14 | +"% c #F4C0D3", |
15 | +"& c #C2D766", |
16 | +"* c #BAD25E", |
17 | +"= c #D23269", |
18 | +"- c #A6C15E", |
19 | +"; c #BBD159", |
20 | +"> c #ADC754", |
21 | +", c #E6457E", |
22 | +"' c #A3BE49", |
23 | +") c #A5C048", |
24 | +"! c #D60750", |
25 | +"~ c #D9DDDD", |
26 | +"{ c #DEE2E1", |
27 | +"] c #DDE2E1", |
28 | +"^ c #DBDBDB", |
29 | +"/ c #DCDCDD", |
30 | +"( c #DCDBDF", |
31 | +"_ c #ABBF82", |
32 | +": c #A2B973", |
33 | +"< c #D4D1D7", |
34 | +"[ c #C2C2C2", |
35 | +"} c #C96D8D", |
36 | +"| c #EDF2F1", |
37 | +"1 c #EDEDEE", |
38 | +"2 c #EEEEEF", |
39 | +"3 c #BABABB", |
40 | +"4 c #BEBEBF", |
41 | +"5 c #EAE9ED", |
42 | +"6 c #EFEEF1", |
43 | +"7 c #E7E7E9", |
44 | +"8 c #D7D7D8", |
45 | +"9 c #D6A4B6", |
46 | +"0 c #E9CFD9", |
47 | +"a c #DFE0E0", |
48 | +"b c #D2D2D2", |
49 | +"c c #EDEDED", |
50 | +"d c #D8D8D9", |
51 | +"e c #A8A8A7", |
52 | +"f c #C4C4C5", |
53 | +"g c #E5E5E6", |
54 | +"h c #D6D6D7", |
55 | +"i c #EAEBEB", |
56 | +"j c #D4D4D5", |
57 | +"k c #A1A1A2", |
58 | +"l c #F0F0F1", |
59 | +"m c #C3C3C3", |
60 | +"n c #C6C6C7", |
61 | +"o c #C5C5C6", |
62 | +"p c #E1E1E2", |
63 | +"q c #C9C9CA", |
64 | +"r c #D6D6D6", |
65 | +"s c #E7E7E8", |
66 | +"t c #E8E8E9", |
67 | +"u c #E4E4E5", |
68 | +"v c #B9B9BA", |
69 | +"w c #B7B7B8", |
70 | +"x c #D8D8D8", |
71 | +"y c #E2E2E3", |
72 | +"z c #C9C9C9", |
73 | +"A c #E6E6E7", |
74 | +"B c #E3E3E4", |
75 | +"C c #E0E0E1", |
76 | +"D c #D6D6D8", |
77 | +"E c #B7B7B7", |
78 | +"F c #B6B6B7", |
79 | +"G c #DFDFE0", |
80 | +"H c #DEDEDF", |
81 | +"I c #DDDDDE", |
82 | +"J c #DBDBDC", |
83 | +"K c #DADADB", |
84 | +"L c #C6C6C6", |
85 | +"M c #B2B2B3", |
86 | +"N c #CECECF", |
87 | +"O c #D1D1D2", |
88 | +"P c #D9D9D9", |
89 | +"Q c #D3D3D4", |
90 | +"R c #CFCFCF", |
91 | +"S c #B1B1B2", |
92 | +"T c #757576", |
93 | +"U c #5E5E5D", |
94 | +"V c #5F5F5F", |
95 | +"W c #626262", |
96 | +"X c #646464", |
97 | +"Y c #666666", |
98 | +"Z c #676767", |
99 | +"` c #656564", |
100 | +" . c #636362", |
101 | +".. c #60605F", |
102 | +"+. c #606060", |
103 | +"@. c #777778", |
104 | +" . + ", |
105 | +" @ # ", |
106 | +" $ % & * ", |
107 | +" = - ; > ", |
108 | +" , ' ) ", |
109 | +" ! ~ { ] ^ / ( _ : < [ ", |
110 | +" } | 1 2 1 3 4 5 6 7 8 ", |
111 | +" 9 0 a b c d d 2 e f g ", |
112 | +" h i j k l h m n o g p q ", |
113 | +" r s t u v w x s u y p z ", |
114 | +" u g A A u [ f B B y C D ", |
115 | +" g B u g g E F B y p G p ", |
116 | +" z H H G G C G G H I / J K L ", |
117 | +" M N O j h x P P x r Q O R S ", |
118 | +" T U V W X Y Z Z Y ` ...+.@. ", |
119 | +" "}; |
120 | |
121 | === added file 'debian/Debian/usb-creator-gtk-32x32.xpm' |
122 | --- debian/Debian/usb-creator-gtk-32x32.xpm 1970-01-01 00:00:00 +0000 |
123 | +++ debian/Debian/usb-creator-gtk-32x32.xpm 2010-05-26 16:08:34 +0000 |
124 | @@ -0,0 +1,254 @@ |
125 | +/* XPM */ |
126 | +static char * usb_creator_gtk_xpm[] = { |
127 | +"32 32 219 2", |
128 | +" c None", |
129 | +". c #D60650", |
130 | +"+ c #D60750", |
131 | +"@ c #D60651", |
132 | +"# c #D70650", |
133 | +"$ c #D60751", |
134 | +"% c #D70750", |
135 | +"& c #D70751", |
136 | +"* c #D6044F", |
137 | +"= c #E03F78", |
138 | +"- c #9BBB56", |
139 | +"; c #AAC562", |
140 | +"> c #A2BF5A", |
141 | +", c #94B64F", |
142 | +"' c #FDF4F7", |
143 | +") c #F2B3CA", |
144 | +"! c #D70852", |
145 | +"~ c #CADD69", |
146 | +"{ c #DCEA71", |
147 | +"] c #DAE96B", |
148 | +"^ c #D5E664", |
149 | +"/ c #D1E467", |
150 | +"( c #B0CA61", |
151 | +"_ c #D70651", |
152 | +": c #D6044E", |
153 | +"< c #FEFEFE", |
154 | +"[ c #D9145A", |
155 | +"} c #A5C05F", |
156 | +"| c #BBD26C", |
157 | +"1 c #8AAC51", |
158 | +"2 c #92B354", |
159 | +"3 c #C3D866", |
160 | +"4 c #C9DC5A", |
161 | +"5 c #C2D75F", |
162 | +"6 c #D60551", |
163 | +"7 c #FFFFFF", |
164 | +"8 c #E44D83", |
165 | +"9 c #99B755", |
166 | +"0 c #BBD155", |
167 | +"a c #BED355", |
168 | +"b c #8BAD46", |
169 | +"c c #D50650", |
170 | +"d c #FFFEFF", |
171 | +"e c #DE3571", |
172 | +"f c #759E3A", |
173 | +"g c #8BAD49", |
174 | +"h c #B2C94D", |
175 | +"i c #B6CC4D", |
176 | +"j c #89AB45", |
177 | +"k c #7AA23C", |
178 | +"l c #D80046", |
179 | +"m c #DE1F63", |
180 | +"n c #DF2E6D", |
181 | +"o c #9FBB50", |
182 | +"p c #AAC342", |
183 | +"q c #A9C241", |
184 | +"r c #A7C24F", |
185 | +"s c #CDCECE", |
186 | +"t c #D2CCCE", |
187 | +"u c #D2C1C8", |
188 | +"v c #D0D6D4", |
189 | +"w c #D0D7D5", |
190 | +"x c #CFCFCF", |
191 | +"y c #CECECE", |
192 | +"z c #CCCCCC", |
193 | +"A c #CBCBCB", |
194 | +"B c #CACACB", |
195 | +"C c #C9C9C9", |
196 | +"D c #CBC9CE", |
197 | +"E c #A2B683", |
198 | +"F c #9DB943", |
199 | +"G c #9EB940", |
200 | +"H c #96AF6E", |
201 | +"I c #C5C2C9", |
202 | +"J c #BEBEBE", |
203 | +"K c #BCBCBD", |
204 | +"L c #B3B3B3", |
205 | +"M c #DFDFE0", |
206 | +"N c #ECEDEE", |
207 | +"O c #EDEEEF", |
208 | +"P c #EDEDEE", |
209 | +"Q c #ECECED", |
210 | +"R c #EBEBEC", |
211 | +"S c #EEEEEF", |
212 | +"T c #E8E8E9", |
213 | +"U c #E6E6E7", |
214 | +"V c #98B46C", |
215 | +"W c #8CAB5A", |
216 | +"X c #E2E2E2", |
217 | +"Y c #E3E3E4", |
218 | +"Z c #E2E2E3", |
219 | +"` c #B7B7B7", |
220 | +" . c #C6C9C8", |
221 | +".. c #E9E9EA", |
222 | +"+. c #E1E1E2", |
223 | +"@. c #C0C0C0", |
224 | +"#. c #C8C8C9", |
225 | +"$. c #E7E7E8", |
226 | +"%. c #E8E7EA", |
227 | +"&. c #E2E3E2", |
228 | +"*. c #E4E4E5", |
229 | +"=. c #C3C3C4", |
230 | +"-. c #D6024D", |
231 | +";. c #CAA2B0", |
232 | +">. c #EDF2F1", |
233 | +",. c #EFEFF0", |
234 | +"'. c #B6B6B7", |
235 | +"). c #AFAFAF", |
236 | +"!. c #B1B1B1", |
237 | +"~. c #B5B5B6", |
238 | +"{. c #E5E5E6", |
239 | +"]. c #EDEDED", |
240 | +"^. c #D7D7D8", |
241 | +"/. c #AAAAAA", |
242 | +"(. c #D75C87", |
243 | +"_. c #E6A9BE", |
244 | +":. c #EBE3E7", |
245 | +"<. c #EFEFEF", |
246 | +"[. c #F0F0F1", |
247 | +"}. c #BDBDBE", |
248 | +"|. c #C1C1C1", |
249 | +"1. c #A8A8A8", |
250 | +"2. c #A7A7A7", |
251 | +"3. c #9D9D9D", |
252 | +"4. c #D6D6D7", |
253 | +"5. c #A9A9A9", |
254 | +"6. c #DEE2E1", |
255 | +"7. c #E9D9DF", |
256 | +"8. c #EAE2E6", |
257 | +"9. c #BABABB", |
258 | +"0. c #B5B5B5", |
259 | +"a. c #B8B8B8", |
260 | +"b. c #EAEAEA", |
261 | +"c. c #D3D3D3", |
262 | +"d. c #9E9E9E", |
263 | +"e. c #CCCCCD", |
264 | +"f. c #E0E0E1", |
265 | +"g. c #EAEAEB", |
266 | +"h. c #989898", |
267 | +"i. c #A2A2A3", |
268 | +"j. c #EEEEF0", |
269 | +"k. c #BDBDBD", |
270 | +"l. c #BFBFBF", |
271 | +"m. c #E2E2E1", |
272 | +"n. c #D2D2D3", |
273 | +"o. c #A0A0A0", |
274 | +"p. c #CFCFD0", |
275 | +"q. c #C5C5C5", |
276 | +"r. c #BBBBBB", |
277 | +"s. c #D9D9D9", |
278 | +"t. c #BCBCBC", |
279 | +"u. c #B4B4B4", |
280 | +"v. c #C1C1C2", |
281 | +"w. c #D1D1D2", |
282 | +"x. c #DDDDDE", |
283 | +"y. c #C4C4C4", |
284 | +"z. c #8D8D8D", |
285 | +"A. c #A4A4A4", |
286 | +"B. c #DCDCDD", |
287 | +"C. c #B8B8B9", |
288 | +"D. c #DADADB", |
289 | +"E. c #C4C4C5", |
290 | +"F. c #AFAFAE", |
291 | +"G. c #B6B6B6", |
292 | +"H. c #AEAEAE", |
293 | +"I. c #D9D9DA", |
294 | +"J. c #929292", |
295 | +"K. c #919191", |
296 | +"L. c #8F8F8F", |
297 | +"M. c #D8D8D9", |
298 | +"N. c #DEDEDF", |
299 | +"O. c #ABABAB", |
300 | +"P. c #CDCDCE", |
301 | +"Q. c #D3D3D4", |
302 | +"R. c #DBDBDC", |
303 | +"S. c #CBCBCC", |
304 | +"T. c #B2B2B2", |
305 | +"U. c #E0E0E0", |
306 | +"V. c #D4D4D4", |
307 | +"W. c #B4B4B5", |
308 | +"X. c #878789", |
309 | +"Y. c #ACACAC", |
310 | +"Z. c #ADADAD", |
311 | +"`. c #B9B9B9", |
312 | +" + c #BABABA", |
313 | +".+ c #B7B7B8", |
314 | +"++ c #B1B1B0", |
315 | +"@+ c #888889", |
316 | +"#+ c #5E5E60", |
317 | +"$+ c #7F7F7F", |
318 | +"%+ c #3B3B3B", |
319 | +"&+ c #353535", |
320 | +"*+ c #363636", |
321 | +"=+ c #373737", |
322 | +"-+ c #383838", |
323 | +";+ c #343434", |
324 | +">+ c #414141", |
325 | +",+ c #808080", |
326 | +"'+ c #5E5E5F", |
327 | +")+ c #8C8C8C", |
328 | +"!+ c #919190", |
329 | +"~+ c #939393", |
330 | +"{+ c #969696", |
331 | +"]+ c #9A9A9A", |
332 | +"^+ c #9B9B9B", |
333 | +"/+ c #9C9C9C", |
334 | +"(+ c #9F9F9E", |
335 | +"_+ c #9F9F9F", |
336 | +":+ c #9B9B9A", |
337 | +"<+ c #999998", |
338 | +"[+ c #979797", |
339 | +"}+ c #949494", |
340 | +"|+ c #8E8E8E", |
341 | +"1+ c #545456", |
342 | +"2+ c #505053", |
343 | +"3+ c #4F4F52", |
344 | +"4+ c #4E4E52", |
345 | +"5+ c #4E4E51", |
346 | +"6+ c #4F4F53", |
347 | +" ", |
348 | +" . + @ # $ # ", |
349 | +" . % % & ", |
350 | +" & * & ", |
351 | +" . = * - ; > , ", |
352 | +" @ ' ) ! ~ { ] ^ / ( ", |
353 | +" _ : < [ } | 1 2 3 4 5 ", |
354 | +" 6 7 8 9 0 a b ", |
355 | +" c d e f g h i j k ", |
356 | +" # l m n o p q r ", |
357 | +" $ s t u v w x y z A B C D E F G H I J K L ", |
358 | +" & M N O P P P Q R R S Q T U V W X Y Z X ` ", |
359 | +" + ...Q P S S P Q Q +.@.#.Z $.%.&.*.Y Z +.=. ", |
360 | +" -.;.>.Q P S ,.S P ..'.).!.~.T {.].Q Q Y Z ^./. ", |
361 | +" (._.:.P ,.<.[.P P [.}.|.P $.R 1.2.3.4.+.*.5. ", |
362 | +" 6.7.8.Y 9.0.a.b.Q P J @...$.R c.d.e.f.+.Z @. ", |
363 | +" Z g.g.+.h.2.i.j.Q Q k.l.m.n.'.o.K U Y +.+.p. ", |
364 | +" q.{.....g.,.r.1.s.b.g.t.u.v.w.p.x.U Y Y +.+.^. ", |
365 | +" y.T T T ....Q |.z.o.A.5.|.R $.U {.*.Y Y +.+.B.u. ", |
366 | +" A $.$.T T ....g.R ....C.@.T U U *.*.Y Z +.+.f.` ", |
367 | +" u.D.{.U U $.$.$.$.T ....a.l.T U {.*.Y Z Z +.f.f.E. ", |
368 | +" F.U *.{.{.U U $.$.$.4.G.H.).` I.{.Y Y Z Z f.f.M 4.1. ", |
369 | +" k.{.Y *.*.{.{.{.{.U I.z.J.K.L.M.*.Y Z +.+.f.M N.+.O. ", |
370 | +" P.Y Z Y Y *.*.{.{.{.{.$.$.U U *.Y Z Z +.+.M M N.M l. ", |
371 | +" Q.x.N.N.M M M f.f.f.f.f.f.f.M M M N.x.x.B.B.R.D.D.S. ", |
372 | +" T.^.N.M M U.f.f.f.+.+.+.+.+.f.f.f.M M M N.x.x.B.B.R.V. ", |
373 | +" ` M +.Z Z Y Z Y Y Y Y Y Y Y Y Y Z Z Z +.+.+.f.f.M M B.W. ", |
374 | +" X.5.Y.Z.).L G.` `. +t.k.J l.l.J J t.r.`..+0.u.T.++).O.@+ ", |
375 | +" #+$+%+&+*+&+*+*+*+*+=+=+-+=+=+=+=+=+*+*+*+*+&+&+;+>+,+'+ ", |
376 | +" )+!+L.!+~+{+h.]+^+/+(+_+o.o._+d.3./+:+<+[+}+J.!+~+|+ ", |
377 | +" 1+2+2+2+3+3+3+3+3+4+5+5+5+5+5+5+5+4+3+3+3+3+6+2+2+1+ ", |
378 | +" "}; |
379 | |
380 | === added file 'debian/Debian/usb-creator-kde-16x16.xpm' |
381 | --- debian/Debian/usb-creator-kde-16x16.xpm 1970-01-01 00:00:00 +0000 |
382 | +++ debian/Debian/usb-creator-kde-16x16.xpm 2010-05-26 16:08:34 +0000 |
383 | @@ -0,0 +1,155 @@ |
384 | +/* XPM */ |
385 | +static char * usb_creator_kde_16x16_xpm[] = { |
386 | +"16 16 136 2", |
387 | +" c None", |
388 | +". c #0D9C0D", |
389 | +"+ c #2AAA2A", |
390 | +"@ c #008C00", |
391 | +"# c #D7D7DA", |
392 | +"$ c #C3C6CC", |
393 | +"% c #008B00", |
394 | +"& c #5BC95B", |
395 | +"* c #B0E8B0", |
396 | +"= c #B9EAB9", |
397 | +"- c #9BE59B", |
398 | +"; c #1BA81B", |
399 | +"> c #E6E6E6", |
400 | +", c #EFEFF1", |
401 | +"' c #8E8A80", |
402 | +") c #CBCED4", |
403 | +"! c #25BF25", |
404 | +"~ c #63DA63", |
405 | +"{ c #81CF81", |
406 | +"] c #E8F7E8", |
407 | +"^ c #5BD75B", |
408 | +"/ c #5FD95F", |
409 | +"( c #009700", |
410 | +"_ c #CFD1D2", |
411 | +": c #989488", |
412 | +"< c #EBEBED", |
413 | +"[ c #DADBDF", |
414 | +"} c #D8D9DC", |
415 | +"| c #E0DEE6", |
416 | +"1 c #40A942", |
417 | +"2 c #149F14", |
418 | +"3 c #49AB49", |
419 | +"4 c #6EB26E", |
420 | +"5 c #E1EFE1", |
421 | +"6 c #43A743", |
422 | +"7 c #3CA83C", |
423 | +"8 c #00B300", |
424 | +"9 c #DBDCDE", |
425 | +"0 c #EBECEC", |
426 | +"a c #DFE0E0", |
427 | +"b c #E2E2E8", |
428 | +"c c #EEE9F3", |
429 | +"d c #2FB030", |
430 | +"e c #329F32", |
431 | +"f c #EAF7EA", |
432 | +"g c #E8F3E8", |
433 | +"h c #FAFCFA", |
434 | +"i c #E2F2E2", |
435 | +"j c #BBE2BB", |
436 | +"k c #00BA00", |
437 | +"l c #E4E4E9", |
438 | +"m c #BEBEC2", |
439 | +"n c #B1AFB4", |
440 | +"o c #60C762", |
441 | +"p c #00B700", |
442 | +"q c #00B400", |
443 | +"r c #2BA42B", |
444 | +"s c #D4EED4", |
445 | +"t c #00B100", |
446 | +"u c #DEE0E0", |
447 | +"v c #DDDEE3", |
448 | +"w c #E5E5EA", |
449 | +"x c #E2E2E6", |
450 | +"y c #AFAFB2", |
451 | +"z c #D0E2D3", |
452 | +"A c #00B200", |
453 | +"B c #00A600", |
454 | +"C c #2DAA2D", |
455 | +"D c #BBE4BB", |
456 | +"E c #00A300", |
457 | +"F c #00A800", |
458 | +"G c #D6DAE3", |
459 | +"H c #EAE9EC", |
460 | +"I c #E3E3E7", |
461 | +"J c #CCCCCF", |
462 | +"K c #A7A7AA", |
463 | +"L c #AAD7AD", |
464 | +"M c #06BD06", |
465 | +"N c #00A100", |
466 | +"O c #00B600", |
467 | +"P c #00C600", |
468 | +"Q c #506F9A", |
469 | +"R c #B1C7EB", |
470 | +"S c #DCE0EA", |
471 | +"T c #EDEDF1", |
472 | +"U c #D6D6D9", |
473 | +"V c #F3EDF8", |
474 | +"W c #ABDFAD", |
475 | +"X c #388772", |
476 | +"Y c #2C508F", |
477 | +"Z c #57759B", |
478 | +"` c #A2BEED", |
479 | +" . c #BFCBE2", |
480 | +".. c #EDECEF", |
481 | +"+. c #ECECF0", |
482 | +"@. c #EBEBEF", |
483 | +"#. c #E8C9D8", |
484 | +"$. c #DB9DB5", |
485 | +"%. c #9FAAC5", |
486 | +"&. c #707CA1", |
487 | +"*. c #59779C", |
488 | +"=. c #A7C3F0", |
489 | +"-. c #B0C1E0", |
490 | +";. c #EBEAEC", |
491 | +">. c #EAE1E8", |
492 | +",. c #E08EAD", |
493 | +"'. c #E2D7E0", |
494 | +"). c #D9B1C3", |
495 | +"!. c #CDCED4", |
496 | +"~. c #A7A9AE", |
497 | +"{. c #5B799D", |
498 | +"]. c #ABC8F3", |
499 | +"^. c #B1C1DB", |
500 | +"/. c #E4B5C8", |
501 | +"(. c #E1B9CB", |
502 | +"_. c #DBB9CA", |
503 | +":. c #D2B4C4", |
504 | +"<. c #C2C4CA", |
505 | +"[. c #A9AAB1", |
506 | +"}. c #5C7B9D", |
507 | +"|. c #AECBF6", |
508 | +"1. c #D0D8DC", |
509 | +"2. c #D98BAA", |
510 | +"3. c #D4B9C8", |
511 | +"4. c #CAA5B8", |
512 | +"5. c #B6A2B1", |
513 | +"6. c #A1A3A9", |
514 | +"7. c #486789", |
515 | +"8. c #B1BAC7", |
516 | +"9. c #CED4D8", |
517 | +"0. c #C5B5C1", |
518 | +"a. c #B5ADB8", |
519 | +"b. c #A4A8AF", |
520 | +"c. c #B2B4B9", |
521 | +"d. c #B3B4BD", |
522 | +"e. c #A2A4AB", |
523 | +" . + @ ", |
524 | +" # $ % & * = - ; ", |
525 | +" > , ' ) ! ~ { ] ^ / ( ", |
526 | +" _ : < [ } | 1 2 3 4 5 6 7 8 ", |
527 | +" 9 0 a b c d e f g h i j k ", |
528 | +" a l m n o p q r s t q t ", |
529 | +" u v w x y z A B C D E F k ", |
530 | +" G H I J K L M B N O P ", |
531 | +" Q R S T U x V W X Y ", |
532 | +" Z ` ...+.@.#.$.%.&. ", |
533 | +" *.=.-.;.>.,.'.).!.~. ", |
534 | +" {.].^./.(._.:.<.[. ", |
535 | +" }.|.1.2.3.4.5.6. ", |
536 | +" 7.8.9.0.a.b. ", |
537 | +" c.d.e. ", |
538 | +" "}; |
539 | |
540 | === added file 'debian/Debian/usb-creator-kde-32x32.xpm' |
541 | --- debian/Debian/usb-creator-kde-32x32.xpm 1970-01-01 00:00:00 +0000 |
542 | +++ debian/Debian/usb-creator-kde-32x32.xpm 2010-05-26 16:08:34 +0000 |
543 | @@ -0,0 +1,466 @@ |
544 | +/* XPM */ |
545 | +static char * usb_creator_kde_32x32_xpm[] = { |
546 | +"32 32 431 2", |
547 | +" c None", |
548 | +". c #B5B7BA", |
549 | +"+ c #CFD1D3", |
550 | +"@ c #008C00", |
551 | +"# c #019701", |
552 | +"$ c #38B238", |
553 | +"% c #4DBC4D", |
554 | +"& c #3BB33B", |
555 | +"* c #059905", |
556 | +"= c #C3C4C5", |
557 | +"- c #D3D5DA", |
558 | +"; c #C7C9D0", |
559 | +"> c #008600", |
560 | +", c #009800", |
561 | +"' c #62CC62", |
562 | +") c #B7ECB7", |
563 | +"! c #B4EAB4", |
564 | +"~ c #B2E9B2", |
565 | +"{ c #B4EBB4", |
566 | +"] c #B9EDB9", |
567 | +"^ c #6BD06B", |
568 | +"/ c #009B00", |
569 | +"( c #008700", |
570 | +"_ c #CCCCCC", |
571 | +": c #E3E4E6", |
572 | +"< c #DBDCE0", |
573 | +"[ c #D7D8DD", |
574 | +"} c #92979E", |
575 | +"| c #D3D4D6", |
576 | +"1 c #008200", |
577 | +"2 c #00A000", |
578 | +"3 c #77DA77", |
579 | +"4 c #91E391", |
580 | +"5 c #90DE90", |
581 | +"6 c #A7DEA7", |
582 | +"7 c #C2E9C2", |
583 | +"8 c #ABE3AB", |
584 | +"9 c #90E390", |
585 | +"0 c #80DD80", |
586 | +"a c #00A500", |
587 | +"b c #008300", |
588 | +"c c #CFCFCE", |
589 | +"d c #ECECED", |
590 | +"e c #E7E8E9", |
591 | +"f c #E4E5E7", |
592 | +"g c #6E7579", |
593 | +"h c #685022", |
594 | +"i c #B9BCC2", |
595 | +"j c #CFD0D3", |
596 | +"k c #009900", |
597 | +"l c #41CD41", |
598 | +"m c #71DB71", |
599 | +"n c #70DB70", |
600 | +"o c #70D170", |
601 | +"p c #B3DEB3", |
602 | +"q c #FFFFFF", |
603 | +"r c #BFE9BF", |
604 | +"s c #70DA70", |
605 | +"t c #71DA71", |
606 | +"u c #4BD14B", |
607 | +"v c #009C00", |
608 | +"w c #007E00", |
609 | +"x c #C9C9C9", |
610 | +"y c #EAEAEA", |
611 | +"z c #ECECEC", |
612 | +"A c #EDEDEE", |
613 | +"B c #E7E7E9", |
614 | +"C c #DADCDE", |
615 | +"D c #B4B5B9", |
616 | +"E c #D3D4D9", |
617 | +"F c #CFD0D2", |
618 | +"G c #DEE0E0", |
619 | +"H c #E1E2E3", |
620 | +"I c #008100", |
621 | +"J c #00BA00", |
622 | +"K c #55D555", |
623 | +"L c #52D452", |
624 | +"M c #52C452", |
625 | +"N c #A2D0A2", |
626 | +"O c #B0E3B0", |
627 | +"P c #51D451", |
628 | +"Q c #56D556", |
629 | +"R c #05BD05", |
630 | +"S c #008400", |
631 | +"T c #BEBEBE", |
632 | +"U c #E4E4E4", |
633 | +"V c #EEEEED", |
634 | +"W c #808587", |
635 | +"X c #E6E5E6", |
636 | +"Y c #E2E3E5", |
637 | +"Z c #D2D4D9", |
638 | +"` c #C6C8CF", |
639 | +" . c #E0E2E1", |
640 | +".. c #D9D9DE", |
641 | +"+. c #D9DADF", |
642 | +"@. c #A2C5A8", |
643 | +"#. c #009200", |
644 | +"$. c #04BC04", |
645 | +"%. c #2EB62E", |
646 | +"&. c #32B832", |
647 | +"*. c #32A732", |
648 | +"=. c #92C192", |
649 | +"-. c #A2D5A2", |
650 | +";. c #31B831", |
651 | +">. c #2FC12F", |
652 | +",. c #07C107", |
653 | +"'. c #009A00", |
654 | +"). c #BBBBBB", |
655 | +"!. c #999EA2", |
656 | +"~. c #624A1E", |
657 | +"{. c #C7C8C8", |
658 | +"]. c #EBEBEB", |
659 | +"^. c #E1E2E4", |
660 | +"/. c #DADBDE", |
661 | +"(. c #DBDDDC", |
662 | +"_. c #DCDCE1", |
663 | +":. c #DCDEE3", |
664 | +"<. c #DEDFE4", |
665 | +"[. c #75B079", |
666 | +"}. c #00A700", |
667 | +"|. c #2F782F", |
668 | +"1. c #6BA66B", |
669 | +"2. c #70A870", |
670 | +"3. c #71A871", |
671 | +"4. c #B3D5B3", |
672 | +"5. c #BED8BE", |
673 | +"6. c #6CA46C", |
674 | +"7. c #389838", |
675 | +"8. c #00C000", |
676 | +"9. c #00AD00", |
677 | +"0. c #007600", |
678 | +"a. c #C0C0C0", |
679 | +"b. c #CDCFD0", |
680 | +"c. c #E9E9E9", |
681 | +"d. c #EBEAEB", |
682 | +"e. c #E6E6E7", |
683 | +"f. c #DCDDDC", |
684 | +"g. c #DEDEE4", |
685 | +"h. c #E0E0E5", |
686 | +"i. c #E2E2E7", |
687 | +"j. c #E5E4EA", |
688 | +"k. c #69AC6B", |
689 | +"l. c #00B100", |
690 | +"m. c #009500", |
691 | +"n. c #81AA81", |
692 | +"o. c #FEFEFE", |
693 | +"p. c #96CF96", |
694 | +"q. c #00BF00", |
695 | +"r. c #00B600", |
696 | +"s. c #007F00", |
697 | +"t. c #BABABA", |
698 | +"u. c #DDDFDD", |
699 | +"v. c #DFE0E5", |
700 | +"w. c #E4E4E9", |
701 | +"x. c #E5E5EA", |
702 | +"y. c #E6E6EB", |
703 | +"z. c #75BA77", |
704 | +"A. c #00A900", |
705 | +"B. c #52A652", |
706 | +"C. c #A5D8A5", |
707 | +"D. c #A5D3A5", |
708 | +"E. c #CFE3CF", |
709 | +"F. c #D6EAD6", |
710 | +"G. c #A5D7A5", |
711 | +"H. c #60C560", |
712 | +"I. c #E2E2E1", |
713 | +"J. c #DDDEDD", |
714 | +"K. c #DFDFE5", |
715 | +"L. c #CDCDD1", |
716 | +"M. c #DEDEE2", |
717 | +"N. c #D6D6DA", |
718 | +"O. c #A1D2A4", |
719 | +"P. c #00AA00", |
720 | +"Q. c #00B900", |
721 | +"R. c #00B800", |
722 | +"S. c #009F00", |
723 | +"T. c #74B474", |
724 | +"U. c #8AD18A", |
725 | +"V. c #00AE00", |
726 | +"W. c #DADBDA", |
727 | +"X. c #E1E1E6", |
728 | +"Y. c #E5E5E9", |
729 | +"Z. c #CBCBCF", |
730 | +"`. c #909093", |
731 | +" + c #99999C", |
732 | +".+ c #858587", |
733 | +"++ c #F0EFF4", |
734 | +"@+ c #00AC00", |
735 | +"#+ c #00B200", |
736 | +"$+ c #00A100", |
737 | +"%+ c #77BC77", |
738 | +"&+ c #8CD28C", |
739 | +"*+ c #DEE0DE", |
740 | +"=+ c #DBDCE1", |
741 | +"-+ c #DFDFE4", |
742 | +";+ c #E9E9ED", |
743 | +">+ c #EAEAEE", |
744 | +",+ c #9B9B9E", |
745 | +"'+ c #CFCFD2", |
746 | +")+ c #DEDCE1", |
747 | +"!+ c #66CE68", |
748 | +"~+ c #00B300", |
749 | +"{+ c #77C077", |
750 | +"]+ c #D4D7D0", |
751 | +"^+ c #E7E7EC", |
752 | +"/+ c #BEBEC1", |
753 | +"(+ c #CDCDD0", |
754 | +"_+ c #818182", |
755 | +":+ c #DDDDE0", |
756 | +"<+ c #EEECF2", |
757 | +"[+ c #12C612", |
758 | +"}+ c #00B000", |
759 | +"|+ c #00A400", |
760 | +"1+ c #00A300", |
761 | +"2+ c #51B751", |
762 | +"3+ c #AFDFAF", |
763 | +"4+ c #60C260", |
764 | +"5+ c #00A200", |
765 | +"6+ c #00C200", |
766 | +"7+ c #C5C6C2", |
767 | +"8+ c #E2E2E6", |
768 | +"9+ c #E6E6EA", |
769 | +"0+ c #E8E8EC", |
770 | +"a+ c #EBEBEF", |
771 | +"b+ c #C6C6C9", |
772 | +"c+ c #9D9DA0", |
773 | +"d+ c #B4B4B8", |
774 | +"e+ c #7D7D7F", |
775 | +"f+ c #F7F8FC", |
776 | +"g+ c #DDEBE1", |
777 | +"h+ c #0ECC0E", |
778 | +"i+ c #009E00", |
779 | +"j+ c #00B400", |
780 | +"k+ c #00C900", |
781 | +"l+ c #A6B6CC", |
782 | +"m+ c #DEE2E8", |
783 | +"n+ c #E9E8EA", |
784 | +"o+ c #F0F0F4", |
785 | +"p+ c #F2F2F6", |
786 | +"q+ c #F3F3F7", |
787 | +"r+ c #4B4B4C", |
788 | +"s+ c #A8A9AB", |
789 | +"t+ c #ECECF0", |
790 | +"u+ c #55DA56", |
791 | +"v+ c #00C600", |
792 | +"w+ c #00B700", |
793 | +"x+ c #00CF00", |
794 | +"y+ c #476790", |
795 | +"z+ c #90ACDB", |
796 | +"A+ c #B0C6EA", |
797 | +"B+ c #D7DEEA", |
798 | +"C+ c #EBEAEC", |
799 | +"D+ c #EDEDF1", |
800 | +"E+ c #F1F1F5", |
801 | +"F+ c #878789", |
802 | +"G+ c #BDBDC0", |
803 | +"H+ c #F0EDF4", |
804 | +"I+ c #DEE9E2", |
805 | +"J+ c #85DE87", |
806 | +"K+ c #3AC23E", |
807 | +"L+ c #0FA92D", |
808 | +"M+ c #14A336", |
809 | +"N+ c #1F8659", |
810 | +"O+ c #1C3E81", |
811 | +"P+ c #4D6C95", |
812 | +"Q+ c #95B0DC", |
813 | +"R+ c #9FBBEB", |
814 | +"S+ c #B0C3E6", |
815 | +"T+ c #DEE0E5", |
816 | +"U+ c #EBEAEF", |
817 | +"V+ c #EFEFF3", |
818 | +"W+ c #E6E3EA", |
819 | +"X+ c #9093B8", |
820 | +"Y+ c #4553AF", |
821 | +"Z+ c #4051A8", |
822 | +"`+ c #3545A2", |
823 | +" @ c #19317E", |
824 | +".@ c #4E6D95", |
825 | +"+@ c #97B2DD", |
826 | +"@@ c #A4BFED", |
827 | +"#@ c #9CB7E7", |
828 | +"$@ c #C7D0DE", |
829 | +"%@ c #E8E8EB", |
830 | +"&@ c #EAEDF0", |
831 | +"*@ c #E5EBEE", |
832 | +"=@ c #B5B8C1", |
833 | +"-@ c #707AA9", |
834 | +";@ c #5361A2", |
835 | +">@ c #34429E", |
836 | +",@ c #042860", |
837 | +"'@ c #4E6E96", |
838 | +")@ c #98B4DE", |
839 | +"!@ c #A6C1EE", |
840 | +"~@ c #9CB8E9", |
841 | +"{@ c #B3C2DD", |
842 | +"]@ c #E2E2E4", |
843 | +"^@ c #EBE8ED", |
844 | +"/@ c #DD5789", |
845 | +"(@ c #DA316E", |
846 | +"_@ c #E19BB7", |
847 | +":@ c #DEE4E8", |
848 | +"<@ c #D5D6D9", |
849 | +"[@ c #C9C9CA", |
850 | +"}@ c #999FA4", |
851 | +"|@ c #506F96", |
852 | +"1@ c #99B6DF", |
853 | +"2@ c #A8C3EF", |
854 | +"3@ c #A0BBEA", |
855 | +"4@ c #A8BBDE", |
856 | +"5@ c #DDDDDF", |
857 | +"6@ c #EBEBF0", |
858 | +"7@ c #ECF4F5", |
859 | +"8@ c #DC437A", |
860 | +"9@ c #E3B1C6", |
861 | +"0@ c #E6F0F1", |
862 | +"a@ c #DFB0C5", |
863 | +"b@ c #DA80A3", |
864 | +"c@ c #D8DBDF", |
865 | +"d@ c #D0D1D7", |
866 | +"e@ c #C9CAD1", |
867 | +"f@ c #A3A6A8", |
868 | +"g@ c #517096", |
869 | +"h@ c #9BB7E0", |
870 | +"i@ c #AAC6F0", |
871 | +"j@ c #A2BDEB", |
872 | +"k@ c #A5BADE", |
873 | +"l@ c #D9D9DC", |
874 | +"m@ c #E4A8C0", |
875 | +"n@ c #DF81A5", |
876 | +"o@ c #E5E0E7", |
877 | +"p@ c #E2CCD8", |
878 | +"q@ c #DFDAE1", |
879 | +"r@ c #D99AB4", |
880 | +"s@ c #D5DBDE", |
881 | +"t@ c #CCCDD3", |
882 | +"u@ c #C4C5CC", |
883 | +"v@ c #BCBDC6", |
884 | +"w@ c #939594", |
885 | +"x@ c #517196", |
886 | +"y@ c #9DB9E1", |
887 | +"z@ c #ABC7F2", |
888 | +"A@ c #A4BFEC", |
889 | +"B@ c #A6BADC", |
890 | +"C@ c #DADADD", |
891 | +"D@ c #DE719A", |
892 | +"E@ c #E2ADC3", |
893 | +"F@ c #E2C6D4", |
894 | +"G@ c #DFD3DD", |
895 | +"H@ c #D796B1", |
896 | +"I@ c #D1D6DA", |
897 | +"J@ c #C9CAD0", |
898 | +"K@ c #BFC0C8", |
899 | +"L@ c #B2B3BB", |
900 | +"M@ c #A3A5A8", |
901 | +"N@ c #527297", |
902 | +"O@ c #9FBBE2", |
903 | +"P@ c #ADC9F3", |
904 | +"Q@ c #A6C2EE", |
905 | +"R@ c #ABBAD1", |
906 | +"S@ c #E09CB7", |
907 | +"T@ c #DD81A5", |
908 | +"U@ c #E0E3E7", |
909 | +"V@ c #DAAABF", |
910 | +"W@ c #D795B0", |
911 | +"X@ c #D3A1B7", |
912 | +"Y@ c #CBCED3", |
913 | +"Z@ c #C3C4CB", |
914 | +"`@ c #B9BBC2", |
915 | +" # c #ACADB6", |
916 | +".# c #A1A3A8", |
917 | +"+# c #537397", |
918 | +"@# c #A0BDE3", |
919 | +"## c #AFCCF4", |
920 | +"$# c #A7C3F1", |
921 | +"%# c #C6C7CB", |
922 | +"&# c #E2E9EC", |
923 | +"*# c #D9437A", |
924 | +"=# c #DBE1E4", |
925 | +"-# c #D8D9DE", |
926 | +";# c #D3D7DC", |
927 | +"># c #CDCED4", |
928 | +",# c #C5C7CE", |
929 | +"'# c #BFB3BF", |
930 | +")# c #B3AAB5", |
931 | +"!# c #A5A6AF", |
932 | +"~# c #9FA2A5", |
933 | +"{# c #527295", |
934 | +"]# c #9DBADF", |
935 | +"^# c #B3D0F8", |
936 | +"/# c #B6C0CD", |
937 | +"(# c #DDDEE3", |
938 | +"_# c #D9D1D9", |
939 | +":# c #D65B89", |
940 | +"<# c #D583A3", |
941 | +"[# c #CF9EB5", |
942 | +"}# c #CC8EA8", |
943 | +"|# c #CA6D92", |
944 | +"1# c #BD87A0", |
945 | +"2# c #A9ADB5", |
946 | +"3# c #A9ABB4", |
947 | +"4# c #416284", |
948 | +"5# c #8BA8CD", |
949 | +"6# c #ADBCCE", |
950 | +"7# c #D8D8DE", |
951 | +"8# c #D0D5D9", |
952 | +"9# c #CBC4CD", |
953 | +"0# c #C992AB", |
954 | +"a# c #C297AD", |
955 | +"b# c #B4BCC2", |
956 | +"c# c #ABACB5", |
957 | +"d# c #A8AAB4", |
958 | +"e# c #1E3D5B", |
959 | +"f# c #697F96", |
960 | +"g# c #C8C9CF", |
961 | +"h# c #C3C4CA", |
962 | +"i# c #BCBDC4", |
963 | +"j# c #B4B5BD", |
964 | +"k# c #ABACB4", |
965 | +"l# c #A8ABB4", |
966 | +"m# c #949697", |
967 | +"n# c #C5C6CD", |
968 | +"o# c #BDBEC5", |
969 | +"p# c #B8B9C0", |
970 | +"q# c #B1B2BA", |
971 | +"r# c #A8A9B2", |
972 | +"s# c #868886", |
973 | +"t# c #AFB0B5", |
974 | +"u# c #B4B6BE", |
975 | +"v# c #AFB0B9", |
976 | +"w# c #A4A6AC", |
977 | +"x# c #8C8F8D", |
978 | +" ", |
979 | +" . + @ # $ % & * @ ", |
980 | +" = - ; + > , ' ) ! ~ { ] ^ / ( ", |
981 | +" _ : < [ } | 1 2 3 4 5 6 7 8 9 9 0 a b ", |
982 | +" c d e f g h i j k l m n o p q r n s t u v w ", |
983 | +" x y z A B C D E ; F G H I J K L L M N q O P L L Q R S ", |
984 | +" T U V W X e Y < Z ` ...+.@.#.$.%.&.&.*.=.q -.;.&.&.>.,.'. ", |
985 | +" ).!.~.{.].e ^./.(._.:.<.[.}.k |.1.2.3.4.q 5.2.2.6.7.8.9.0. ", |
986 | +" a.b.c.z d.e.f.g.h.i.j.k.l.m.n.q q q q o.q q q q p.q.r.s. ", |
987 | +" t.U c.y u.v.i.w.x.y.z.l.A.B.C.C.D.E.q F.G.C.G.H.q.r.@ ", |
988 | +" t.I.J.K.i.L.M.N.M.O.P.Q.Q.R.R.S.T.q U.R.R.R.R.Q.V. ", |
989 | +" W.g.X.Y.Z.`. +.+++@+#+#+#+#+$+%+q &+#+#+#+#+#+V. ", |
990 | +" *+=+-+w.y.;+>+,+'+)+!+~+P.P.P.S.{+q &+P.P.P.P.#+R. ", |
991 | +" ]+<.=+i.Y.^+>+/+(+_+:+<+[+}+|+1+S.2+3+4+5+5+|+V.6+ ", |
992 | +" 7+8+i.9+0+a+b+c+d+e+f+g+h+r.|+i+/ './ i+1+j+k+ ", |
993 | +" l+m+n+;+a+a+o+p+q+r+s+t+u+v+R.9.P.@+w+x+x+ ", |
994 | +" y+z+A+B+C+t+a+D+E+F+G+D+H+I+J+K+L+M+N+O+ ", |
995 | +" P+Q+R+S+T+U+t+t+V+D+t+t+t+t+W+X+Y+Z+`+ @ ", |
996 | +" .@+@@@#@$@%@D+t+D+t+a+t+t+&@*@=@-@;@>@,@ ", |
997 | +" '@)@!@~@{@]@D+t+a+t+a+^@/@(@_@:@<@[@}@ ", |
998 | +" |@1@2@3@4@5@t+6@t+7@8@9@0@a@b@c@d@e@f@ ", |
999 | +" g@h@i@j@k@l@t+a+m@n@o@p@q@r@s@t@u@v@w@ ", |
1000 | +" x@y@z@A@B@C@;+D@E@F@G@_.H@I@J@K@L@M@ ", |
1001 | +" N@O@P@Q@R@i.S@T@U@V@W@X@Y@Z@`@ #.# ", |
1002 | +" +#@###$#%#&#*#=#-#;#>#,#'#)#!#~# ", |
1003 | +" {#]#^#/#(#_#:#<#[#}#|#1#2#3# ", |
1004 | +" 4#5#6#7#E 8#9#0#a#b#c#d#w@ ", |
1005 | +" e#f#d@t@g#h#i#j#k#l#w@ ", |
1006 | +" m#n#o#p#q#r#3#w@ ", |
1007 | +" s#t#u#v#w#x# ", |
1008 | +" ", |
1009 | +" "}; |
1010 | |
1011 | === modified file 'debian/changelog' |
1012 | --- debian/changelog 2010-05-26 10:08:29 +0000 |
1013 | +++ debian/changelog 2010-05-26 16:08:34 +0000 |
1014 | @@ -1,4 +1,4 @@ |
1015 | -usb-creator (0.2.23ubuntu1) UNRELEASED; urgency=low |
1016 | +usb-creator (0.2.23) unstable; urgency=low |
1017 | |
1018 | [ Evan Dandrea ] |
1019 | * Continue evaluting whether or not a partition can be used even if |
1020 | @@ -30,9 +30,11 @@ |
1021 | * debian/control: |
1022 | + removed transitional package (LTS is released) |
1023 | + improved extended description |
1024 | + + added forgotten python-support dependency |
1025 | * debian/rules: |
1026 | + using dh tiny rules |
1027 | + using python-support |
1028 | + + debian-menu installed if there are branded xpm's |
1029 | * .bzr-builddeb: |
1030 | + defaults to native |
1031 | |
1032 | @@ -40,8 +42,24 @@ |
1033 | * Use XDG IconTheme spec for window icons (LP: #535061) |
1034 | * Install branded / debranded icons based on dpkg-vendor |
1035 | * Add Debian branded icons & updated debian/copyright |
1036 | - |
1037 | - -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Mon, 03 May 2010 04:22:28 +0000 |
1038 | + * Debranded package description |
1039 | + |
1040 | + [ Ignace Mouzannar ] |
1041 | + * Initial Debian release (Closes: #582884, #576359) |
1042 | + * debian/control: |
1043 | + + Added Build dependency on kdesdk-scripts (Debian specific) |
1044 | + * debian/rules: |
1045 | + + Added xpm files installation |
1046 | + * debian/usb-creator-gtk.menu and debian/usb-creator-kde.menu: |
1047 | + + Added these files as per the Debian Menu Policy |
1048 | + * debian/Debian/*.xpm: |
1049 | + + Added the xpm icons needed by the menu files |
1050 | + * debian/copyright: |
1051 | + + Added myself in the debian/* copyright |
1052 | + * desktop: |
1053 | + + Removed "HardwareSettings" from the Categories of the GTK desktop file |
1054 | + |
1055 | + -- Ignace Mouzannar <mouzannar@gmail.com> Wed, 26 May 2010 00:59:11 +0200 |
1056 | |
1057 | usb-creator (0.2.22) lucid; urgency=low |
1058 | |
1059 | |
1060 | === modified file 'debian/control' |
1061 | --- debian/control 2010-05-26 10:08:29 +0000 |
1062 | +++ debian/control 2010-05-26 16:08:34 +0000 |
1063 | @@ -1,12 +1,19 @@ |
1064 | Source: usb-creator |
1065 | Section: admin |
1066 | Priority: optional |
1067 | +<<<<<<< TREE |
1068 | Maintainer: usb-creator Hackers Team <usb-creator-hackers@lists.launchpad.net> |
1069 | Uploaders: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> |
1070 | +======= |
1071 | +Maintainer: Ubuntu Installer Team <ubuntu-installer@lists.ubuntu.com> |
1072 | +Uploaders: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>, Ignace Mouzannar <mouzannar@gmail.com> |
1073 | +>>>>>>> MERGE-SOURCE |
1074 | Build-Depends: debhelper (>= 7.0.50~), |
1075 | python, |
1076 | + python-support, |
1077 | python-distutils-extra, |
1078 | - pkg-kde-tools |
1079 | + pkg-kde-tools, |
1080 | + kdesdk-scripts |
1081 | Standards-Version: 3.8.4 |
1082 | Vcs-Bzr: http://bazaar.launchpad.net/~usb-creator-hackers/usb-creator/trunk |
1083 | |
1084 | @@ -16,7 +23,7 @@ |
1085 | udisks (>= 1.0~), udisks (<< 1.1), genisoimage, mtools, parted |
1086 | Description: Live USB creator (common files) |
1087 | Utility for converting Live Linux CDs into bootable USB sticks for example |
1088 | - Ubuntu and Kubuntu. This utility can partition USB stick to allow |
1089 | + Ubuntu and Debian Live. This utility can partition USB stick to allow |
1090 | storing user files in persistence mode. |
1091 | . |
1092 | This package contains backend engine and common data files used |
1093 | @@ -29,7 +36,7 @@ |
1094 | python-dbus, python-gnome2 |
1095 | Description: Live USB creator for GNOME |
1096 | Utility for converting Live Linux CDs into bootable USB sticks for example |
1097 | - Ubuntu and Ubuntu Netbook Remix. This utility can partition USB stick to allow |
1098 | + Ubuntu and Debian Live. This utility can partition USB stick to allow |
1099 | storing user files in persistence mode. |
1100 | . |
1101 | This package contains the GTK+ client frontend. |
1102 | @@ -40,7 +47,7 @@ |
1103 | usb-creator-common (= ${source:Version}), python-kde4, python-qt4-dbus |
1104 | Description: Live USB creator for KDE |
1105 | Utility for converting Live Linux CDs into bootable USB sticks for example |
1106 | - Kubuntu and Kubuntu Netbook Remix. This utility can partition USB stick to |
1107 | - allow storing user files in persistence mode. |
1108 | + Kubuntu and Debian Live. This utility can partition USB stick to allow |
1109 | + storing user files in persistence mode. |
1110 | . |
1111 | This package contains the KDE client frontend. |
1112 | |
1113 | === modified file 'debian/copyright' |
1114 | --- debian/copyright 2010-05-24 07:16:26 +0000 |
1115 | +++ debian/copyright 2010-05-26 16:08:34 +0000 |
1116 | @@ -10,6 +10,7 @@ |
1117 | Files: debian/* |
1118 | Copyright: 2008, Evan Dandrea <evand@ubuntu.com> |
1119 | 2010, Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> |
1120 | + 2010, Ignace Mouzannar <mouzannar@gmail.com> |
1121 | License: GPL-3 |
1122 | |
1123 | Files: debian/Ubuntu/* |
1124 | |
1125 | === modified file 'debian/rules' |
1126 | --- debian/rules 2010-05-24 07:00:59 +0000 |
1127 | +++ debian/rules 2010-05-26 16:08:34 +0000 |
1128 | @@ -1,9 +1,20 @@ |
1129 | #!/usr/bin/make -f |
1130 | -vendor := $(shell dpkg-vendor --query Vendor) |
1131 | -dest := debian/tmp/usr/share/icons/hicolor/scalable/apps |
1132 | +vendor := ./debian/$(shell dpkg-vendor --query Vendor) |
1133 | +dest := $(CURDIR)/debian/tmp/usr/share/icons/hicolor/scalable/apps |
1134 | +xpm_gtk := $(CURDIR)/debian/usb-creator-gtk/usr/share/pixmaps/ |
1135 | +xpm_kde := $(CURDIR)/debian/usb-creator-kde/usr/share/pixmaps/ |
1136 | |
1137 | %: |
1138 | dh -Spython_distutils $@ |
1139 | + |
1140 | override_dh_install: |
1141 | - find . -path "./debian/$(vendor)/*.svg" -exec cp {} $(dest) \; |
1142 | + find . -path "$(vendor)/*.svg" -exec cp {} $(dest) \; |
1143 | dh_install |
1144 | + |
1145 | +override_dh_installmenu: |
1146 | +ifneq (,$(wildcard $(vendor)/*.xpm)) |
1147 | + mkdir -p $(xpm_gtk) $(xpm_kde) |
1148 | + find . -path "$(vendor)/*-gtk*.xpm" -exec cp {} $(xpm_gtk) \; |
1149 | + find . -path "$(vendor)/*-kde*.xpm" -exec cp {} $(xpm_kde) \; |
1150 | + dh_installmenu |
1151 | +endif |
1152 | |
1153 | === added file 'debian/usb-creator-gtk.menu' |
1154 | --- debian/usb-creator-gtk.menu 1970-01-01 00:00:00 +0000 |
1155 | +++ debian/usb-creator-gtk.menu 2010-05-26 16:08:34 +0000 |
1156 | @@ -0,0 +1,6 @@ |
1157 | +?package(usb-creator-gtk):needs="X11" section="Applications/File Management"\ |
1158 | + title="usb-creator-gtk" command="/usr/bin/usb-creator-gtk" \ |
1159 | + longtitle="Startup disk creator" \ |
1160 | + icon16x16="/usr/share/pixmaps/usb-creator-gtk-16x16.xpm" \ |
1161 | + icon32x32="/usr/share/pixmaps/usb-creator-gtk-32x32.xpm" \ |
1162 | + icon="/usr/share/pixmaps/usb-creator-gtk-32x32.xpm" |
1163 | |
1164 | === added file 'debian/usb-creator-kde.menu' |
1165 | --- debian/usb-creator-kde.menu 1970-01-01 00:00:00 +0000 |
1166 | +++ debian/usb-creator-kde.menu 2010-05-26 16:08:34 +0000 |
1167 | @@ -0,0 +1,6 @@ |
1168 | +?package(usb-creator-kde):needs="X11" section="Applications/File Management"\ |
1169 | + title="usb-creator-kde" command="/usr/bin/usb-creator-kde" \ |
1170 | + longtitle="Startup disk creator" \ |
1171 | + icon16x16="/usr/share/pixmaps/usb-creator-kde-16x16.xpm" \ |
1172 | + icon32x32="/usr/share/pixmaps/usb-creator-kde-32x32.xpm" \ |
1173 | + icon="/usr/share/pixmaps/usb-creator-kde-32x32.xpm" |
With respect to the top of changelog, the approach we've always taken is to keep the pocket as UNRELEASED until we're ready to upload. We then run dch -r but do not commit the change and upload. Once the upload is accepted by the archive, we run debcommit -r. This commits the aforementioned change and creates a tag.
I think the new description is inaccurate. usb-creator can write debian-installer images (including the Ubuntu alternate and server CDs) to USB disks as well. What do you think of changing it to,
"Startup Disk Creator converts a USB key or SD card into a volume from which you
can start up and run Ubuntu. You can also store files and settings in any space left over.
The program also works for Debian, or any other Debian-based OS for which you have a CD or .iso image."
Credit to Matthew Paul Thomas for coming up with that this morning :).
"Startup disk creator" should probably be capitalized to match the .desktop files, unless convention forbids it. The Debian policy doesn't specify a behavior: http:// www.debian. org/doc/ packaging- manuals/ menu.html/ ch3.html# s3.3
Also, unless I'm misreading the discussion we had in merge 25344 (https:/ /code.edge. launchpad. net/~dmitrij. ledkov/ usb- creator/ packaging/ +merge/ 25344), I thought we were going to upload to Debian, sync to Ubuntu, and upload ubuntu1 if we're past the Debian Import Freeze? If this is the case, I'm confused by the presence of both 0.2.23 and 0.2.23ubuntu1 sections in the changelog. Perhaps I'm just not following the process you have in mind though. Why not just upload to Debian from trunk? Apologies if I'm forgetting comments I've made to the contrary. My brain isn't fully operational yet this morning :).