usb-creator

Merge lp:~usb-creator-hackers/usb-creator/debian into lp:usb-creator

  1. debian
  2. Merge into trunk
Proposed by Dimitri John Ledkov
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
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.

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 =)

To post a comment you must log in.
Revision history for this message
Evan (ev) wrote :

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 :).

review: Needs Fixing
Revision history for this message
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://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.

Merge errors (bzr is too smart, i needed the good old
"bang-it-together-until-it-sticks-merge" with loads of conflicts
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

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'debian/Debian/usb-creator-gtk-16x16.xpm'
--- debian/Debian/usb-creator-gtk-16x16.xpm 1970-01-01 00:00:00 +0000
+++ debian/Debian/usb-creator-gtk-16x16.xpm 2010-05-26 16:08:34 +0000
@@ -0,0 +1,115 @@
1/* XPM */
2static char * usb_creator_gtk_16x16_xpm[] = {
3"16 16 96 2",
4" c None",
5". c #D50650",
6"+ c #D60650",
7"@ c #D6064F",
8"# c #D50049",
9"$ c #D50550",
10"% c #F4C0D3",
11"& c #C2D766",
12"* c #BAD25E",
13"= c #D23269",
14"- c #A6C15E",
15"; c #BBD159",
16"> c #ADC754",
17", c #E6457E",
18"' c #A3BE49",
19") c #A5C048",
20"! c #D60750",
21"~ c #D9DDDD",
22"{ c #DEE2E1",
23"] c #DDE2E1",
24"^ c #DBDBDB",
25"/ c #DCDCDD",
26"( c #DCDBDF",
27"_ c #ABBF82",
28": c #A2B973",
29"< c #D4D1D7",
30"[ c #C2C2C2",
31"} c #C96D8D",
32"| c #EDF2F1",
33"1 c #EDEDEE",
34"2 c #EEEEEF",
35"3 c #BABABB",
36"4 c #BEBEBF",
37"5 c #EAE9ED",
38"6 c #EFEEF1",
39"7 c #E7E7E9",
40"8 c #D7D7D8",
41"9 c #D6A4B6",
42"0 c #E9CFD9",
43"a c #DFE0E0",
44"b c #D2D2D2",
45"c c #EDEDED",
46"d c #D8D8D9",
47"e c #A8A8A7",
48"f c #C4C4C5",
49"g c #E5E5E6",
50"h c #D6D6D7",
51"i c #EAEBEB",
52"j c #D4D4D5",
53"k c #A1A1A2",
54"l c #F0F0F1",
55"m c #C3C3C3",
56"n c #C6C6C7",
57"o c #C5C5C6",
58"p c #E1E1E2",
59"q c #C9C9CA",
60"r c #D6D6D6",
61"s c #E7E7E8",
62"t c #E8E8E9",
63"u c #E4E4E5",
64"v c #B9B9BA",
65"w c #B7B7B8",
66"x c #D8D8D8",
67"y c #E2E2E3",
68"z c #C9C9C9",
69"A c #E6E6E7",
70"B c #E3E3E4",
71"C c #E0E0E1",
72"D c #D6D6D8",
73"E c #B7B7B7",
74"F c #B6B6B7",
75"G c #DFDFE0",
76"H c #DEDEDF",
77"I c #DDDDDE",
78"J c #DBDBDC",
79"K c #DADADB",
80"L c #C6C6C6",
81"M c #B2B2B3",
82"N c #CECECF",
83"O c #D1D1D2",
84"P c #D9D9D9",
85"Q c #D3D3D4",
86"R c #CFCFCF",
87"S c #B1B1B2",
88"T c #757576",
89"U c #5E5E5D",
90"V c #5F5F5F",
91"W c #626262",
92"X c #646464",
93"Y c #666666",
94"Z c #676767",
95"` c #656564",
96" . c #636362",
97".. c #60605F",
98"+. c #606060",
99"@. c #777778",
100" . + ",
101" @ # ",
102" $ % & * ",
103" = - ; > ",
104" , ' ) ",
105" ! ~ { ] ^ / ( _ : < [ ",
106" } | 1 2 1 3 4 5 6 7 8 ",
107" 9 0 a b c d d 2 e f g ",
108" h i j k l h m n o g p q ",
109" r s t u v w x s u y p z ",
110" u g A A u [ f B B y C D ",
111" g B u g g E F B y p G p ",
112" z H H G G C G G H I / J K L ",
113" M N O j h x P P x r Q O R S ",
114" T U V W X Y Z Z Y ` ...+.@. ",
115" "};
0116
=== added file 'debian/Debian/usb-creator-gtk-32x32.xpm'
--- debian/Debian/usb-creator-gtk-32x32.xpm 1970-01-01 00:00:00 +0000
+++ debian/Debian/usb-creator-gtk-32x32.xpm 2010-05-26 16:08:34 +0000
@@ -0,0 +1,254 @@
1/* XPM */
2static char * usb_creator_gtk_xpm[] = {
3"32 32 219 2",
4" c None",
5". c #D60650",
6"+ c #D60750",
7"@ c #D60651",
8"# c #D70650",
9"$ c #D60751",
10"% c #D70750",
11"& c #D70751",
12"* c #D6044F",
13"= c #E03F78",
14"- c #9BBB56",
15"; c #AAC562",
16"> c #A2BF5A",
17", c #94B64F",
18"' c #FDF4F7",
19") c #F2B3CA",
20"! c #D70852",
21"~ c #CADD69",
22"{ c #DCEA71",
23"] c #DAE96B",
24"^ c #D5E664",
25"/ c #D1E467",
26"( c #B0CA61",
27"_ c #D70651",
28": c #D6044E",
29"< c #FEFEFE",
30"[ c #D9145A",
31"} c #A5C05F",
32"| c #BBD26C",
33"1 c #8AAC51",
34"2 c #92B354",
35"3 c #C3D866",
36"4 c #C9DC5A",
37"5 c #C2D75F",
38"6 c #D60551",
39"7 c #FFFFFF",
40"8 c #E44D83",
41"9 c #99B755",
42"0 c #BBD155",
43"a c #BED355",
44"b c #8BAD46",
45"c c #D50650",
46"d c #FFFEFF",
47"e c #DE3571",
48"f c #759E3A",
49"g c #8BAD49",
50"h c #B2C94D",
51"i c #B6CC4D",
52"j c #89AB45",
53"k c #7AA23C",
54"l c #D80046",
55"m c #DE1F63",
56"n c #DF2E6D",
57"o c #9FBB50",
58"p c #AAC342",
59"q c #A9C241",
60"r c #A7C24F",
61"s c #CDCECE",
62"t c #D2CCCE",
63"u c #D2C1C8",
64"v c #D0D6D4",
65"w c #D0D7D5",
66"x c #CFCFCF",
67"y c #CECECE",
68"z c #CCCCCC",
69"A c #CBCBCB",
70"B c #CACACB",
71"C c #C9C9C9",
72"D c #CBC9CE",
73"E c #A2B683",
74"F c #9DB943",
75"G c #9EB940",
76"H c #96AF6E",
77"I c #C5C2C9",
78"J c #BEBEBE",
79"K c #BCBCBD",
80"L c #B3B3B3",
81"M c #DFDFE0",
82"N c #ECEDEE",
83"O c #EDEEEF",
84"P c #EDEDEE",
85"Q c #ECECED",
86"R c #EBEBEC",
87"S c #EEEEEF",
88"T c #E8E8E9",
89"U c #E6E6E7",
90"V c #98B46C",
91"W c #8CAB5A",
92"X c #E2E2E2",
93"Y c #E3E3E4",
94"Z c #E2E2E3",
95"` c #B7B7B7",
96" . c #C6C9C8",
97".. c #E9E9EA",
98"+. c #E1E1E2",
99"@. c #C0C0C0",
100"#. c #C8C8C9",
101"$. c #E7E7E8",
102"%. c #E8E7EA",
103"&. c #E2E3E2",
104"*. c #E4E4E5",
105"=. c #C3C3C4",
106"-. c #D6024D",
107";. c #CAA2B0",
108">. c #EDF2F1",
109",. c #EFEFF0",
110"'. c #B6B6B7",
111"). c #AFAFAF",
112"!. c #B1B1B1",
113"~. c #B5B5B6",
114"{. c #E5E5E6",
115"]. c #EDEDED",
116"^. c #D7D7D8",
117"/. c #AAAAAA",
118"(. c #D75C87",
119"_. c #E6A9BE",
120":. c #EBE3E7",
121"<. c #EFEFEF",
122"[. c #F0F0F1",
123"}. c #BDBDBE",
124"|. c #C1C1C1",
125"1. c #A8A8A8",
126"2. c #A7A7A7",
127"3. c #9D9D9D",
128"4. c #D6D6D7",
129"5. c #A9A9A9",
130"6. c #DEE2E1",
131"7. c #E9D9DF",
132"8. c #EAE2E6",
133"9. c #BABABB",
134"0. c #B5B5B5",
135"a. c #B8B8B8",
136"b. c #EAEAEA",
137"c. c #D3D3D3",
138"d. c #9E9E9E",
139"e. c #CCCCCD",
140"f. c #E0E0E1",
141"g. c #EAEAEB",
142"h. c #989898",
143"i. c #A2A2A3",
144"j. c #EEEEF0",
145"k. c #BDBDBD",
146"l. c #BFBFBF",
147"m. c #E2E2E1",
148"n. c #D2D2D3",
149"o. c #A0A0A0",
150"p. c #CFCFD0",
151"q. c #C5C5C5",
152"r. c #BBBBBB",
153"s. c #D9D9D9",
154"t. c #BCBCBC",
155"u. c #B4B4B4",
156"v. c #C1C1C2",
157"w. c #D1D1D2",
158"x. c #DDDDDE",
159"y. c #C4C4C4",
160"z. c #8D8D8D",
161"A. c #A4A4A4",
162"B. c #DCDCDD",
163"C. c #B8B8B9",
164"D. c #DADADB",
165"E. c #C4C4C5",
166"F. c #AFAFAE",
167"G. c #B6B6B6",
168"H. c #AEAEAE",
169"I. c #D9D9DA",
170"J. c #929292",
171"K. c #919191",
172"L. c #8F8F8F",
173"M. c #D8D8D9",
174"N. c #DEDEDF",
175"O. c #ABABAB",
176"P. c #CDCDCE",
177"Q. c #D3D3D4",
178"R. c #DBDBDC",
179"S. c #CBCBCC",
180"T. c #B2B2B2",
181"U. c #E0E0E0",
182"V. c #D4D4D4",
183"W. c #B4B4B5",
184"X. c #878789",
185"Y. c #ACACAC",
186"Z. c #ADADAD",
187"`. c #B9B9B9",
188" + c #BABABA",
189".+ c #B7B7B8",
190"++ c #B1B1B0",
191"@+ c #888889",
192"#+ c #5E5E60",
193"$+ c #7F7F7F",
194"%+ c #3B3B3B",
195"&+ c #353535",
196"*+ c #363636",
197"=+ c #373737",
198"-+ c #383838",
199";+ c #343434",
200">+ c #414141",
201",+ c #808080",
202"'+ c #5E5E5F",
203")+ c #8C8C8C",
204"!+ c #919190",
205"~+ c #939393",
206"{+ c #969696",
207"]+ c #9A9A9A",
208"^+ c #9B9B9B",
209"/+ c #9C9C9C",
210"(+ c #9F9F9E",
211"_+ c #9F9F9F",
212":+ c #9B9B9A",
213"<+ c #999998",
214"[+ c #979797",
215"}+ c #949494",
216"|+ c #8E8E8E",
217"1+ c #545456",
218"2+ c #505053",
219"3+ c #4F4F52",
220"4+ c #4E4E52",
221"5+ c #4E4E51",
222"6+ c #4F4F53",
223" ",
224" . + @ # $ # ",
225" . % % & ",
226" & * & ",
227" . = * - ; > , ",
228" @ ' ) ! ~ { ] ^ / ( ",
229" _ : < [ } | 1 2 3 4 5 ",
230" 6 7 8 9 0 a b ",
231" c d e f g h i j k ",
232" # l m n o p q r ",
233" $ s t u v w x y z A B C D E F G H I J K L ",
234" & M N O P P P Q R R S Q T U V W X Y Z X ` ",
235" + ...Q P S S P Q Q +.@.#.Z $.%.&.*.Y Z +.=. ",
236" -.;.>.Q P S ,.S P ..'.).!.~.T {.].Q Q Y Z ^./. ",
237" (._.:.P ,.<.[.P P [.}.|.P $.R 1.2.3.4.+.*.5. ",
238" 6.7.8.Y 9.0.a.b.Q P J @...$.R c.d.e.f.+.Z @. ",
239" Z g.g.+.h.2.i.j.Q Q k.l.m.n.'.o.K U Y +.+.p. ",
240" q.{.....g.,.r.1.s.b.g.t.u.v.w.p.x.U Y Y +.+.^. ",
241" y.T T T ....Q |.z.o.A.5.|.R $.U {.*.Y Y +.+.B.u. ",
242" A $.$.T T ....g.R ....C.@.T U U *.*.Y Z +.+.f.` ",
243" u.D.{.U U $.$.$.$.T ....a.l.T U {.*.Y Z Z +.f.f.E. ",
244" F.U *.{.{.U U $.$.$.4.G.H.).` I.{.Y Y Z Z f.f.M 4.1. ",
245" k.{.Y *.*.{.{.{.{.U I.z.J.K.L.M.*.Y Z +.+.f.M N.+.O. ",
246" P.Y Z Y Y *.*.{.{.{.{.$.$.U U *.Y Z Z +.+.M M N.M l. ",
247" 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. ",
248" T.^.N.M M U.f.f.f.+.+.+.+.+.f.f.f.M M M N.x.x.B.B.R.V. ",
249" ` M +.Z Z Y Z Y Y Y Y Y Y Y Y Y Z Z Z +.+.+.f.f.M M B.W. ",
250" X.5.Y.Z.).L G.` `. +t.k.J l.l.J J t.r.`..+0.u.T.++).O.@+ ",
251" #+$+%+&+*+&+*+*+*+*+=+=+-+=+=+=+=+=+*+*+*+*+&+&+;+>+,+'+ ",
252" )+!+L.!+~+{+h.]+^+/+(+_+o.o._+d.3./+:+<+[+}+J.!+~+|+ ",
253" 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+ ",
254" "};
0255
=== added file 'debian/Debian/usb-creator-kde-16x16.xpm'
--- debian/Debian/usb-creator-kde-16x16.xpm 1970-01-01 00:00:00 +0000
+++ debian/Debian/usb-creator-kde-16x16.xpm 2010-05-26 16:08:34 +0000
@@ -0,0 +1,155 @@
1/* XPM */
2static char * usb_creator_kde_16x16_xpm[] = {
3"16 16 136 2",
4" c None",
5". c #0D9C0D",
6"+ c #2AAA2A",
7"@ c #008C00",
8"# c #D7D7DA",
9"$ c #C3C6CC",
10"% c #008B00",
11"& c #5BC95B",
12"* c #B0E8B0",
13"= c #B9EAB9",
14"- c #9BE59B",
15"; c #1BA81B",
16"> c #E6E6E6",
17", c #EFEFF1",
18"' c #8E8A80",
19") c #CBCED4",
20"! c #25BF25",
21"~ c #63DA63",
22"{ c #81CF81",
23"] c #E8F7E8",
24"^ c #5BD75B",
25"/ c #5FD95F",
26"( c #009700",
27"_ c #CFD1D2",
28": c #989488",
29"< c #EBEBED",
30"[ c #DADBDF",
31"} c #D8D9DC",
32"| c #E0DEE6",
33"1 c #40A942",
34"2 c #149F14",
35"3 c #49AB49",
36"4 c #6EB26E",
37"5 c #E1EFE1",
38"6 c #43A743",
39"7 c #3CA83C",
40"8 c #00B300",
41"9 c #DBDCDE",
42"0 c #EBECEC",
43"a c #DFE0E0",
44"b c #E2E2E8",
45"c c #EEE9F3",
46"d c #2FB030",
47"e c #329F32",
48"f c #EAF7EA",
49"g c #E8F3E8",
50"h c #FAFCFA",
51"i c #E2F2E2",
52"j c #BBE2BB",
53"k c #00BA00",
54"l c #E4E4E9",
55"m c #BEBEC2",
56"n c #B1AFB4",
57"o c #60C762",
58"p c #00B700",
59"q c #00B400",
60"r c #2BA42B",
61"s c #D4EED4",
62"t c #00B100",
63"u c #DEE0E0",
64"v c #DDDEE3",
65"w c #E5E5EA",
66"x c #E2E2E6",
67"y c #AFAFB2",
68"z c #D0E2D3",
69"A c #00B200",
70"B c #00A600",
71"C c #2DAA2D",
72"D c #BBE4BB",
73"E c #00A300",
74"F c #00A800",
75"G c #D6DAE3",
76"H c #EAE9EC",
77"I c #E3E3E7",
78"J c #CCCCCF",
79"K c #A7A7AA",
80"L c #AAD7AD",
81"M c #06BD06",
82"N c #00A100",
83"O c #00B600",
84"P c #00C600",
85"Q c #506F9A",
86"R c #B1C7EB",
87"S c #DCE0EA",
88"T c #EDEDF1",
89"U c #D6D6D9",
90"V c #F3EDF8",
91"W c #ABDFAD",
92"X c #388772",
93"Y c #2C508F",
94"Z c #57759B",
95"` c #A2BEED",
96" . c #BFCBE2",
97".. c #EDECEF",
98"+. c #ECECF0",
99"@. c #EBEBEF",
100"#. c #E8C9D8",
101"$. c #DB9DB5",
102"%. c #9FAAC5",
103"&. c #707CA1",
104"*. c #59779C",
105"=. c #A7C3F0",
106"-. c #B0C1E0",
107";. c #EBEAEC",
108">. c #EAE1E8",
109",. c #E08EAD",
110"'. c #E2D7E0",
111"). c #D9B1C3",
112"!. c #CDCED4",
113"~. c #A7A9AE",
114"{. c #5B799D",
115"]. c #ABC8F3",
116"^. c #B1C1DB",
117"/. c #E4B5C8",
118"(. c #E1B9CB",
119"_. c #DBB9CA",
120":. c #D2B4C4",
121"<. c #C2C4CA",
122"[. c #A9AAB1",
123"}. c #5C7B9D",
124"|. c #AECBF6",
125"1. c #D0D8DC",
126"2. c #D98BAA",
127"3. c #D4B9C8",
128"4. c #CAA5B8",
129"5. c #B6A2B1",
130"6. c #A1A3A9",
131"7. c #486789",
132"8. c #B1BAC7",
133"9. c #CED4D8",
134"0. c #C5B5C1",
135"a. c #B5ADB8",
136"b. c #A4A8AF",
137"c. c #B2B4B9",
138"d. c #B3B4BD",
139"e. c #A2A4AB",
140" . + @ ",
141" # $ % & * = - ; ",
142" > , ' ) ! ~ { ] ^ / ( ",
143" _ : < [ } | 1 2 3 4 5 6 7 8 ",
144" 9 0 a b c d e f g h i j k ",
145" a l m n o p q r s t q t ",
146" u v w x y z A B C D E F k ",
147" G H I J K L M B N O P ",
148" Q R S T U x V W X Y ",
149" Z ` ...+.@.#.$.%.&. ",
150" *.=.-.;.>.,.'.).!.~. ",
151" {.].^./.(._.:.<.[. ",
152" }.|.1.2.3.4.5.6. ",
153" 7.8.9.0.a.b. ",
154" c.d.e. ",
155" "};
0156
=== added file 'debian/Debian/usb-creator-kde-32x32.xpm'
--- debian/Debian/usb-creator-kde-32x32.xpm 1970-01-01 00:00:00 +0000
+++ debian/Debian/usb-creator-kde-32x32.xpm 2010-05-26 16:08:34 +0000
@@ -0,0 +1,466 @@
1/* XPM */
2static char * usb_creator_kde_32x32_xpm[] = {
3"32 32 431 2",
4" c None",
5". c #B5B7BA",
6"+ c #CFD1D3",
7"@ c #008C00",
8"# c #019701",
9"$ c #38B238",
10"% c #4DBC4D",
11"& c #3BB33B",
12"* c #059905",
13"= c #C3C4C5",
14"- c #D3D5DA",
15"; c #C7C9D0",
16"> c #008600",
17", c #009800",
18"' c #62CC62",
19") c #B7ECB7",
20"! c #B4EAB4",
21"~ c #B2E9B2",
22"{ c #B4EBB4",
23"] c #B9EDB9",
24"^ c #6BD06B",
25"/ c #009B00",
26"( c #008700",
27"_ c #CCCCCC",
28": c #E3E4E6",
29"< c #DBDCE0",
30"[ c #D7D8DD",
31"} c #92979E",
32"| c #D3D4D6",
33"1 c #008200",
34"2 c #00A000",
35"3 c #77DA77",
36"4 c #91E391",
37"5 c #90DE90",
38"6 c #A7DEA7",
39"7 c #C2E9C2",
40"8 c #ABE3AB",
41"9 c #90E390",
42"0 c #80DD80",
43"a c #00A500",
44"b c #008300",
45"c c #CFCFCE",
46"d c #ECECED",
47"e c #E7E8E9",
48"f c #E4E5E7",
49"g c #6E7579",
50"h c #685022",
51"i c #B9BCC2",
52"j c #CFD0D3",
53"k c #009900",
54"l c #41CD41",
55"m c #71DB71",
56"n c #70DB70",
57"o c #70D170",
58"p c #B3DEB3",
59"q c #FFFFFF",
60"r c #BFE9BF",
61"s c #70DA70",
62"t c #71DA71",
63"u c #4BD14B",
64"v c #009C00",
65"w c #007E00",
66"x c #C9C9C9",
67"y c #EAEAEA",
68"z c #ECECEC",
69"A c #EDEDEE",
70"B c #E7E7E9",
71"C c #DADCDE",
72"D c #B4B5B9",
73"E c #D3D4D9",
74"F c #CFD0D2",
75"G c #DEE0E0",
76"H c #E1E2E3",
77"I c #008100",
78"J c #00BA00",
79"K c #55D555",
80"L c #52D452",
81"M c #52C452",
82"N c #A2D0A2",
83"O c #B0E3B0",
84"P c #51D451",
85"Q c #56D556",
86"R c #05BD05",
87"S c #008400",
88"T c #BEBEBE",
89"U c #E4E4E4",
90"V c #EEEEED",
91"W c #808587",
92"X c #E6E5E6",
93"Y c #E2E3E5",
94"Z c #D2D4D9",
95"` c #C6C8CF",
96" . c #E0E2E1",
97".. c #D9D9DE",
98"+. c #D9DADF",
99"@. c #A2C5A8",
100"#. c #009200",
101"$. c #04BC04",
102"%. c #2EB62E",
103"&. c #32B832",
104"*. c #32A732",
105"=. c #92C192",
106"-. c #A2D5A2",
107";. c #31B831",
108">. c #2FC12F",
109",. c #07C107",
110"'. c #009A00",
111"). c #BBBBBB",
112"!. c #999EA2",
113"~. c #624A1E",
114"{. c #C7C8C8",
115"]. c #EBEBEB",
116"^. c #E1E2E4",
117"/. c #DADBDE",
118"(. c #DBDDDC",
119"_. c #DCDCE1",
120":. c #DCDEE3",
121"<. c #DEDFE4",
122"[. c #75B079",
123"}. c #00A700",
124"|. c #2F782F",
125"1. c #6BA66B",
126"2. c #70A870",
127"3. c #71A871",
128"4. c #B3D5B3",
129"5. c #BED8BE",
130"6. c #6CA46C",
131"7. c #389838",
132"8. c #00C000",
133"9. c #00AD00",
134"0. c #007600",
135"a. c #C0C0C0",
136"b. c #CDCFD0",
137"c. c #E9E9E9",
138"d. c #EBEAEB",
139"e. c #E6E6E7",
140"f. c #DCDDDC",
141"g. c #DEDEE4",
142"h. c #E0E0E5",
143"i. c #E2E2E7",
144"j. c #E5E4EA",
145"k. c #69AC6B",
146"l. c #00B100",
147"m. c #009500",
148"n. c #81AA81",
149"o. c #FEFEFE",
150"p. c #96CF96",
151"q. c #00BF00",
152"r. c #00B600",
153"s. c #007F00",
154"t. c #BABABA",
155"u. c #DDDFDD",
156"v. c #DFE0E5",
157"w. c #E4E4E9",
158"x. c #E5E5EA",
159"y. c #E6E6EB",
160"z. c #75BA77",
161"A. c #00A900",
162"B. c #52A652",
163"C. c #A5D8A5",
164"D. c #A5D3A5",
165"E. c #CFE3CF",
166"F. c #D6EAD6",
167"G. c #A5D7A5",
168"H. c #60C560",
169"I. c #E2E2E1",
170"J. c #DDDEDD",
171"K. c #DFDFE5",
172"L. c #CDCDD1",
173"M. c #DEDEE2",
174"N. c #D6D6DA",
175"O. c #A1D2A4",
176"P. c #00AA00",
177"Q. c #00B900",
178"R. c #00B800",
179"S. c #009F00",
180"T. c #74B474",
181"U. c #8AD18A",
182"V. c #00AE00",
183"W. c #DADBDA",
184"X. c #E1E1E6",
185"Y. c #E5E5E9",
186"Z. c #CBCBCF",
187"`. c #909093",
188" + c #99999C",
189".+ c #858587",
190"++ c #F0EFF4",
191"@+ c #00AC00",
192"#+ c #00B200",
193"$+ c #00A100",
194"%+ c #77BC77",
195"&+ c #8CD28C",
196"*+ c #DEE0DE",
197"=+ c #DBDCE1",
198"-+ c #DFDFE4",
199";+ c #E9E9ED",
200">+ c #EAEAEE",
201",+ c #9B9B9E",
202"'+ c #CFCFD2",
203")+ c #DEDCE1",
204"!+ c #66CE68",
205"~+ c #00B300",
206"{+ c #77C077",
207"]+ c #D4D7D0",
208"^+ c #E7E7EC",
209"/+ c #BEBEC1",
210"(+ c #CDCDD0",
211"_+ c #818182",
212":+ c #DDDDE0",
213"<+ c #EEECF2",
214"[+ c #12C612",
215"}+ c #00B000",
216"|+ c #00A400",
217"1+ c #00A300",
218"2+ c #51B751",
219"3+ c #AFDFAF",
220"4+ c #60C260",
221"5+ c #00A200",
222"6+ c #00C200",
223"7+ c #C5C6C2",
224"8+ c #E2E2E6",
225"9+ c #E6E6EA",
226"0+ c #E8E8EC",
227"a+ c #EBEBEF",
228"b+ c #C6C6C9",
229"c+ c #9D9DA0",
230"d+ c #B4B4B8",
231"e+ c #7D7D7F",
232"f+ c #F7F8FC",
233"g+ c #DDEBE1",
234"h+ c #0ECC0E",
235"i+ c #009E00",
236"j+ c #00B400",
237"k+ c #00C900",
238"l+ c #A6B6CC",
239"m+ c #DEE2E8",
240"n+ c #E9E8EA",
241"o+ c #F0F0F4",
242"p+ c #F2F2F6",
243"q+ c #F3F3F7",
244"r+ c #4B4B4C",
245"s+ c #A8A9AB",
246"t+ c #ECECF0",
247"u+ c #55DA56",
248"v+ c #00C600",
249"w+ c #00B700",
250"x+ c #00CF00",
251"y+ c #476790",
252"z+ c #90ACDB",
253"A+ c #B0C6EA",
254"B+ c #D7DEEA",
255"C+ c #EBEAEC",
256"D+ c #EDEDF1",
257"E+ c #F1F1F5",
258"F+ c #878789",
259"G+ c #BDBDC0",
260"H+ c #F0EDF4",
261"I+ c #DEE9E2",
262"J+ c #85DE87",
263"K+ c #3AC23E",
264"L+ c #0FA92D",
265"M+ c #14A336",
266"N+ c #1F8659",
267"O+ c #1C3E81",
268"P+ c #4D6C95",
269"Q+ c #95B0DC",
270"R+ c #9FBBEB",
271"S+ c #B0C3E6",
272"T+ c #DEE0E5",
273"U+ c #EBEAEF",
274"V+ c #EFEFF3",
275"W+ c #E6E3EA",
276"X+ c #9093B8",
277"Y+ c #4553AF",
278"Z+ c #4051A8",
279"`+ c #3545A2",
280" @ c #19317E",
281".@ c #4E6D95",
282"+@ c #97B2DD",
283"@@ c #A4BFED",
284"#@ c #9CB7E7",
285"$@ c #C7D0DE",
286"%@ c #E8E8EB",
287"&@ c #EAEDF0",
288"*@ c #E5EBEE",
289"=@ c #B5B8C1",
290"-@ c #707AA9",
291";@ c #5361A2",
292">@ c #34429E",
293",@ c #042860",
294"'@ c #4E6E96",
295")@ c #98B4DE",
296"!@ c #A6C1EE",
297"~@ c #9CB8E9",
298"{@ c #B3C2DD",
299"]@ c #E2E2E4",
300"^@ c #EBE8ED",
301"/@ c #DD5789",
302"(@ c #DA316E",
303"_@ c #E19BB7",
304":@ c #DEE4E8",
305"<@ c #D5D6D9",
306"[@ c #C9C9CA",
307"}@ c #999FA4",
308"|@ c #506F96",
309"1@ c #99B6DF",
310"2@ c #A8C3EF",
311"3@ c #A0BBEA",
312"4@ c #A8BBDE",
313"5@ c #DDDDDF",
314"6@ c #EBEBF0",
315"7@ c #ECF4F5",
316"8@ c #DC437A",
317"9@ c #E3B1C6",
318"0@ c #E6F0F1",
319"a@ c #DFB0C5",
320"b@ c #DA80A3",
321"c@ c #D8DBDF",
322"d@ c #D0D1D7",
323"e@ c #C9CAD1",
324"f@ c #A3A6A8",
325"g@ c #517096",
326"h@ c #9BB7E0",
327"i@ c #AAC6F0",
328"j@ c #A2BDEB",
329"k@ c #A5BADE",
330"l@ c #D9D9DC",
331"m@ c #E4A8C0",
332"n@ c #DF81A5",
333"o@ c #E5E0E7",
334"p@ c #E2CCD8",
335"q@ c #DFDAE1",
336"r@ c #D99AB4",
337"s@ c #D5DBDE",
338"t@ c #CCCDD3",
339"u@ c #C4C5CC",
340"v@ c #BCBDC6",
341"w@ c #939594",
342"x@ c #517196",
343"y@ c #9DB9E1",
344"z@ c #ABC7F2",
345"A@ c #A4BFEC",
346"B@ c #A6BADC",
347"C@ c #DADADD",
348"D@ c #DE719A",
349"E@ c #E2ADC3",
350"F@ c #E2C6D4",
351"G@ c #DFD3DD",
352"H@ c #D796B1",
353"I@ c #D1D6DA",
354"J@ c #C9CAD0",
355"K@ c #BFC0C8",
356"L@ c #B2B3BB",
357"M@ c #A3A5A8",
358"N@ c #527297",
359"O@ c #9FBBE2",
360"P@ c #ADC9F3",
361"Q@ c #A6C2EE",
362"R@ c #ABBAD1",
363"S@ c #E09CB7",
364"T@ c #DD81A5",
365"U@ c #E0E3E7",
366"V@ c #DAAABF",
367"W@ c #D795B0",
368"X@ c #D3A1B7",
369"Y@ c #CBCED3",
370"Z@ c #C3C4CB",
371"`@ c #B9BBC2",
372" # c #ACADB6",
373".# c #A1A3A8",
374"+# c #537397",
375"@# c #A0BDE3",
376"## c #AFCCF4",
377"$# c #A7C3F1",
378"%# c #C6C7CB",
379"&# c #E2E9EC",
380"*# c #D9437A",
381"=# c #DBE1E4",
382"-# c #D8D9DE",
383";# c #D3D7DC",
384"># c #CDCED4",
385",# c #C5C7CE",
386"'# c #BFB3BF",
387")# c #B3AAB5",
388"!# c #A5A6AF",
389"~# c #9FA2A5",
390"{# c #527295",
391"]# c #9DBADF",
392"^# c #B3D0F8",
393"/# c #B6C0CD",
394"(# c #DDDEE3",
395"_# c #D9D1D9",
396":# c #D65B89",
397"<# c #D583A3",
398"[# c #CF9EB5",
399"}# c #CC8EA8",
400"|# c #CA6D92",
401"1# c #BD87A0",
402"2# c #A9ADB5",
403"3# c #A9ABB4",
404"4# c #416284",
405"5# c #8BA8CD",
406"6# c #ADBCCE",
407"7# c #D8D8DE",
408"8# c #D0D5D9",
409"9# c #CBC4CD",
410"0# c #C992AB",
411"a# c #C297AD",
412"b# c #B4BCC2",
413"c# c #ABACB5",
414"d# c #A8AAB4",
415"e# c #1E3D5B",
416"f# c #697F96",
417"g# c #C8C9CF",
418"h# c #C3C4CA",
419"i# c #BCBDC4",
420"j# c #B4B5BD",
421"k# c #ABACB4",
422"l# c #A8ABB4",
423"m# c #949697",
424"n# c #C5C6CD",
425"o# c #BDBEC5",
426"p# c #B8B9C0",
427"q# c #B1B2BA",
428"r# c #A8A9B2",
429"s# c #868886",
430"t# c #AFB0B5",
431"u# c #B4B6BE",
432"v# c #AFB0B9",
433"w# c #A4A6AC",
434"x# c #8C8F8D",
435" ",
436" . + @ # $ % & * @ ",
437" = - ; + > , ' ) ! ~ { ] ^ / ( ",
438" _ : < [ } | 1 2 3 4 5 6 7 8 9 9 0 a b ",
439" c d e f g h i j k l m n o p q r n s t u v w ",
440" 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 ",
441" T U V W X e Y < Z ` ...+.@.#.$.%.&.&.*.=.q -.;.&.&.>.,.'. ",
442" ).!.~.{.].e ^./.(._.:.<.[.}.k |.1.2.3.4.q 5.2.2.6.7.8.9.0. ",
443" 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. ",
444" 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.@ ",
445" 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. ",
446" W.g.X.Y.Z.`. +.+++@+#+#+#+#+$+%+q &+#+#+#+#+#+V. ",
447" *+=+-+w.y.;+>+,+'+)+!+~+P.P.P.S.{+q &+P.P.P.P.#+R. ",
448" ]+<.=+i.Y.^+>+/+(+_+:+<+[+}+|+1+S.2+3+4+5+5+|+V.6+ ",
449" 7+8+i.9+0+a+b+c+d+e+f+g+h+r.|+i+/ './ i+1+j+k+ ",
450" l+m+n+;+a+a+o+p+q+r+s+t+u+v+R.9.P.@+w+x+x+ ",
451" y+z+A+B+C+t+a+D+E+F+G+D+H+I+J+K+L+M+N+O+ ",
452" P+Q+R+S+T+U+t+t+V+D+t+t+t+t+W+X+Y+Z+`+ @ ",
453" .@+@@@#@$@%@D+t+D+t+a+t+t+&@*@=@-@;@>@,@ ",
454" '@)@!@~@{@]@D+t+a+t+a+^@/@(@_@:@<@[@}@ ",
455" |@1@2@3@4@5@t+6@t+7@8@9@0@a@b@c@d@e@f@ ",
456" g@h@i@j@k@l@t+a+m@n@o@p@q@r@s@t@u@v@w@ ",
457" x@y@z@A@B@C@;+D@E@F@G@_.H@I@J@K@L@M@ ",
458" N@O@P@Q@R@i.S@T@U@V@W@X@Y@Z@`@ #.# ",
459" +#@###$#%#&#*#=#-#;#>#,#'#)#!#~# ",
460" {#]#^#/#(#_#:#<#[#}#|#1#2#3# ",
461" 4#5#6#7#E 8#9#0#a#b#c#d#w@ ",
462" e#f#d@t@g#h#i#j#k#l#w@ ",
463" m#n#o#p#q#r#3#w@ ",
464" s#t#u#v#w#x# ",
465" ",
466" "};
0467
=== modified file 'debian/changelog'
--- debian/changelog 2010-05-26 10:08:29 +0000
+++ debian/changelog 2010-05-26 16:08:34 +0000
@@ -1,4 +1,4 @@
1usb-creator (0.2.23ubuntu1) UNRELEASED; urgency=low1usb-creator (0.2.23) unstable; urgency=low
22
3 [ Evan Dandrea ]3 [ Evan Dandrea ]
4 * Continue evaluting whether or not a partition can be used even if4 * Continue evaluting whether or not a partition can be used even if
@@ -30,9 +30,11 @@
30 * debian/control:30 * debian/control:
31 + removed transitional package (LTS is released)31 + removed transitional package (LTS is released)
32 + improved extended description32 + improved extended description
33 + added forgotten python-support dependency
33 * debian/rules:34 * debian/rules:
34 + using dh tiny rules35 + using dh tiny rules
35 + using python-support36 + using python-support
37 + debian-menu installed if there are branded xpm's
36 * .bzr-builddeb:38 * .bzr-builddeb:
37 + defaults to native39 + defaults to native
3840
@@ -40,8 +42,24 @@
40 * Use XDG IconTheme spec for window icons (LP: #535061)42 * Use XDG IconTheme spec for window icons (LP: #535061)
41 * Install branded / debranded icons based on dpkg-vendor43 * Install branded / debranded icons based on dpkg-vendor
42 * Add Debian branded icons & updated debian/copyright44 * Add Debian branded icons & updated debian/copyright
4345 * Debranded package description
44 -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Mon, 03 May 2010 04:22:28 +000046
47 [ Ignace Mouzannar ]
48 * Initial Debian release (Closes: #582884, #576359)
49 * debian/control:
50 + Added Build dependency on kdesdk-scripts (Debian specific)
51 * debian/rules:
52 + Added xpm files installation
53 * debian/usb-creator-gtk.menu and debian/usb-creator-kde.menu:
54 + Added these files as per the Debian Menu Policy
55 * debian/Debian/*.xpm:
56 + Added the xpm icons needed by the menu files
57 * debian/copyright:
58 + Added myself in the debian/* copyright
59 * desktop:
60 + Removed "HardwareSettings" from the Categories of the GTK desktop file
61
62 -- Ignace Mouzannar <mouzannar@gmail.com> Wed, 26 May 2010 00:59:11 +0200
4563
46usb-creator (0.2.22) lucid; urgency=low64usb-creator (0.2.22) lucid; urgency=low
4765
4866
=== modified file 'debian/control'
--- debian/control 2010-05-26 10:08:29 +0000
+++ debian/control 2010-05-26 16:08:34 +0000
@@ -1,12 +1,19 @@
1Source: usb-creator1Source: usb-creator
2Section: admin2Section: admin
3Priority: optional3Priority: optional
4<<<<<<< TREE
4Maintainer: usb-creator Hackers Team <usb-creator-hackers@lists.launchpad.net>5Maintainer: usb-creator Hackers Team <usb-creator-hackers@lists.launchpad.net>
5Uploaders: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>6Uploaders: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
7=======
8Maintainer: Ubuntu Installer Team <ubuntu-installer@lists.ubuntu.com>
9Uploaders: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>, Ignace Mouzannar <mouzannar@gmail.com>
10>>>>>>> MERGE-SOURCE
6Build-Depends: debhelper (>= 7.0.50~),11Build-Depends: debhelper (>= 7.0.50~),
7 python,12 python,
13 python-support,
8 python-distutils-extra,14 python-distutils-extra,
9 pkg-kde-tools15 pkg-kde-tools,
16 kdesdk-scripts
10Standards-Version: 3.8.417Standards-Version: 3.8.4
11Vcs-Bzr: http://bazaar.launchpad.net/~usb-creator-hackers/usb-creator/trunk18Vcs-Bzr: http://bazaar.launchpad.net/~usb-creator-hackers/usb-creator/trunk
1219
@@ -16,7 +23,7 @@
16 udisks (>= 1.0~), udisks (<< 1.1), genisoimage, mtools, parted23 udisks (>= 1.0~), udisks (<< 1.1), genisoimage, mtools, parted
17Description: Live USB creator (common files)24Description: Live USB creator (common files)
18 Utility for converting Live Linux CDs into bootable USB sticks for example25 Utility for converting Live Linux CDs into bootable USB sticks for example
19 Ubuntu and Kubuntu. This utility can partition USB stick to allow26 Ubuntu and Debian Live. This utility can partition USB stick to allow
20 storing user files in persistence mode.27 storing user files in persistence mode.
21 .28 .
22 This package contains backend engine and common data files used29 This package contains backend engine and common data files used
@@ -29,7 +36,7 @@
29 python-dbus, python-gnome236 python-dbus, python-gnome2
30Description: Live USB creator for GNOME37Description: Live USB creator for GNOME
31 Utility for converting Live Linux CDs into bootable USB sticks for example38 Utility for converting Live Linux CDs into bootable USB sticks for example
32 Ubuntu and Ubuntu Netbook Remix. This utility can partition USB stick to allow39 Ubuntu and Debian Live. This utility can partition USB stick to allow
33 storing user files in persistence mode.40 storing user files in persistence mode.
34 .41 .
35 This package contains the GTK+ client frontend.42 This package contains the GTK+ client frontend.
@@ -40,7 +47,7 @@
40 usb-creator-common (= ${source:Version}), python-kde4, python-qt4-dbus47 usb-creator-common (= ${source:Version}), python-kde4, python-qt4-dbus
41Description: Live USB creator for KDE48Description: Live USB creator for KDE
42 Utility for converting Live Linux CDs into bootable USB sticks for example49 Utility for converting Live Linux CDs into bootable USB sticks for example
43 Kubuntu and Kubuntu Netbook Remix. This utility can partition USB stick to50 Kubuntu and Debian Live. This utility can partition USB stick to allow
44 allow storing user files in persistence mode.51 storing user files in persistence mode.
45 .52 .
46 This package contains the KDE client frontend.53 This package contains the KDE client frontend.
4754
=== modified file 'debian/copyright'
--- debian/copyright 2010-05-24 07:16:26 +0000
+++ debian/copyright 2010-05-26 16:08:34 +0000
@@ -10,6 +10,7 @@
10Files: debian/*10Files: debian/*
11Copyright: 2008, Evan Dandrea <evand@ubuntu.com>11Copyright: 2008, Evan Dandrea <evand@ubuntu.com>
12 2010, Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>12 2010, Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
13 2010, Ignace Mouzannar <mouzannar@gmail.com>
13License: GPL-314License: GPL-3
1415
15Files: debian/Ubuntu/*16Files: debian/Ubuntu/*
1617
=== modified file 'debian/rules'
--- debian/rules 2010-05-24 07:00:59 +0000
+++ debian/rules 2010-05-26 16:08:34 +0000
@@ -1,9 +1,20 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
2vendor := $(shell dpkg-vendor --query Vendor)2vendor := ./debian/$(shell dpkg-vendor --query Vendor)
3dest := debian/tmp/usr/share/icons/hicolor/scalable/apps3dest := $(CURDIR)/debian/tmp/usr/share/icons/hicolor/scalable/apps
4xpm_gtk := $(CURDIR)/debian/usb-creator-gtk/usr/share/pixmaps/
5xpm_kde := $(CURDIR)/debian/usb-creator-kde/usr/share/pixmaps/
46
5%:7%:
6 dh -Spython_distutils $@8 dh -Spython_distutils $@
9
7override_dh_install:10override_dh_install:
8 find . -path "./debian/$(vendor)/*.svg" -exec cp {} $(dest) \;11 find . -path "$(vendor)/*.svg" -exec cp {} $(dest) \;
9 dh_install12 dh_install
13
14override_dh_installmenu:
15ifneq (,$(wildcard $(vendor)/*.xpm))
16 mkdir -p $(xpm_gtk) $(xpm_kde)
17 find . -path "$(vendor)/*-gtk*.xpm" -exec cp {} $(xpm_gtk) \;
18 find . -path "$(vendor)/*-kde*.xpm" -exec cp {} $(xpm_kde) \;
19 dh_installmenu
20endif
1021
=== added file 'debian/usb-creator-gtk.menu'
--- debian/usb-creator-gtk.menu 1970-01-01 00:00:00 +0000
+++ debian/usb-creator-gtk.menu 2010-05-26 16:08:34 +0000
@@ -0,0 +1,6 @@
1?package(usb-creator-gtk):needs="X11" section="Applications/File Management"\
2 title="usb-creator-gtk" command="/usr/bin/usb-creator-gtk" \
3 longtitle="Startup disk creator" \
4 icon16x16="/usr/share/pixmaps/usb-creator-gtk-16x16.xpm" \
5 icon32x32="/usr/share/pixmaps/usb-creator-gtk-32x32.xpm" \
6 icon="/usr/share/pixmaps/usb-creator-gtk-32x32.xpm"
07
=== added file 'debian/usb-creator-kde.menu'
--- debian/usb-creator-kde.menu 1970-01-01 00:00:00 +0000
+++ debian/usb-creator-kde.menu 2010-05-26 16:08:34 +0000
@@ -0,0 +1,6 @@
1?package(usb-creator-kde):needs="X11" section="Applications/File Management"\
2 title="usb-creator-kde" command="/usr/bin/usb-creator-kde" \
3 longtitle="Startup disk creator" \
4 icon16x16="/usr/share/pixmaps/usb-creator-kde-16x16.xpm" \
5 icon32x32="/usr/share/pixmaps/usb-creator-kde-32x32.xpm" \
6 icon="/usr/share/pixmaps/usb-creator-kde-32x32.xpm"

Subscribers

People subscribed via source and target branches