← Back to team overview

usb-creator-hackers team mailing list archive

[Merge] lp:~usb-creator-hackers/usb-creator/debian-take2 into lp:usb-creator

 

Dmitrijs Ledkovs has proposed merging lp:~usb-creator-hackers/usb-creator/debian-take2 into lp:usb-creator.

Requested reviews:
  usb-creator hackers (usb-creator-hackers)


I wasn't sure how to resubmit a merge proposal using a new branch (it's a rebase and i wasn't comfortable rewriting a published branch)

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

Fixed. Top of changelog is UNRELEASED.


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


New description takes this & the general name from desktop files:

Description: create a startup disk using a CD or disc image
 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.


One concern is that short description should not repeat package name as per debian policy. This might be violated if we rename package to something out of this set (create, startup, disk). Personally, I have no more opinions about naming the bikeshed.

> "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
> 

This is about debian-menu, right? I have no clue, on my lucid I've enabled Debian menu and i don't seem to have any entries in it =/

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


Your brain is fine ;-) the branch was a mess.

This branch has clean history with new/additional references to 0.2.23ubuntu1 and structured slightly easier for review (vs previous work in progress like commits)

-- 
https://code.launchpad.net/~usb-creator-hackers/usb-creator/debian-take2/+merge/26200
Your team usb-creator hackers is requested to review the proposed merge of lp:~usb-creator-hackers/usb-creator/debian-take2 into lp:usb-creator.
=== 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-27 16:13:27 +0000
@@ -0,0 +1,115 @@
+/* XPM */
+static char * usb_creator_gtk_16x16_xpm[] = {
+"16 16 96 2",
+"  	c None",
+". 	c #D50650",
+"+ 	c #D60650",
+"@ 	c #D6064F",
+"# 	c #D50049",
+"$ 	c #D50550",
+"% 	c #F4C0D3",
+"& 	c #C2D766",
+"* 	c #BAD25E",
+"= 	c #D23269",
+"- 	c #A6C15E",
+"; 	c #BBD159",
+"> 	c #ADC754",
+", 	c #E6457E",
+"' 	c #A3BE49",
+") 	c #A5C048",
+"! 	c #D60750",
+"~ 	c #D9DDDD",
+"{ 	c #DEE2E1",
+"] 	c #DDE2E1",
+"^ 	c #DBDBDB",
+"/ 	c #DCDCDD",
+"( 	c #DCDBDF",
+"_ 	c #ABBF82",
+": 	c #A2B973",
+"< 	c #D4D1D7",
+"[ 	c #C2C2C2",
+"} 	c #C96D8D",
+"| 	c #EDF2F1",
+"1 	c #EDEDEE",
+"2 	c #EEEEEF",
+"3 	c #BABABB",
+"4 	c #BEBEBF",
+"5 	c #EAE9ED",
+"6 	c #EFEEF1",
+"7 	c #E7E7E9",
+"8 	c #D7D7D8",
+"9 	c #D6A4B6",
+"0 	c #E9CFD9",
+"a 	c #DFE0E0",
+"b 	c #D2D2D2",
+"c 	c #EDEDED",
+"d 	c #D8D8D9",
+"e 	c #A8A8A7",
+"f 	c #C4C4C5",
+"g 	c #E5E5E6",
+"h 	c #D6D6D7",
+"i 	c #EAEBEB",
+"j 	c #D4D4D5",
+"k 	c #A1A1A2",
+"l 	c #F0F0F1",
+"m 	c #C3C3C3",
+"n 	c #C6C6C7",
+"o 	c #C5C5C6",
+"p 	c #E1E1E2",
+"q 	c #C9C9CA",
+"r 	c #D6D6D6",
+"s 	c #E7E7E8",
+"t 	c #E8E8E9",
+"u 	c #E4E4E5",
+"v 	c #B9B9BA",
+"w 	c #B7B7B8",
+"x 	c #D8D8D8",
+"y 	c #E2E2E3",
+"z 	c #C9C9C9",
+"A 	c #E6E6E7",
+"B 	c #E3E3E4",
+"C 	c #E0E0E1",
+"D 	c #D6D6D8",
+"E 	c #B7B7B7",
+"F 	c #B6B6B7",
+"G 	c #DFDFE0",
+"H 	c #DEDEDF",
+"I 	c #DDDDDE",
+"J 	c #DBDBDC",
+"K 	c #DADADB",
+"L 	c #C6C6C6",
+"M 	c #B2B2B3",
+"N 	c #CECECF",
+"O 	c #D1D1D2",
+"P 	c #D9D9D9",
+"Q 	c #D3D3D4",
+"R 	c #CFCFCF",
+"S 	c #B1B1B2",
+"T 	c #757576",
+"U 	c #5E5E5D",
+"V 	c #5F5F5F",
+"W 	c #626262",
+"X 	c #646464",
+"Y 	c #666666",
+"Z 	c #676767",
+"` 	c #656564",
+" .	c #636362",
+"..	c #60605F",
+"+.	c #606060",
+"@.	c #777778",
+"      . +                       ",
+"    @     #                     ",
+"  $       %     & *             ",
+"            = -   ; >           ",
+"          ,       ' )           ",
+"  !   ~ { ] ^ / ( _ : < [       ",
+"    } | 1 2 1 3 4 5 6 7 8       ",
+"    9 0 a b c d d 2 e f g       ",
+"    h i j k l h m n o g p q     ",
+"    r s t u v w x s u y p z     ",
+"    u g A A u [ f B B y C D     ",
+"    g B u g g E F B y p G p     ",
+"  z H H G G C G G H I / J K L   ",
+"  M N O j h x P P x r Q O R S   ",
+"  T U V W X Y Z Z Y `  ...+.@.  ",
+"                                "};

=== 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-27 16:13:27 +0000
@@ -0,0 +1,254 @@
+/* XPM */
+static char * usb_creator_gtk_xpm[] = {
+"32 32 219 2",
+"  	c None",
+". 	c #D60650",
+"+ 	c #D60750",
+"@ 	c #D60651",
+"# 	c #D70650",
+"$ 	c #D60751",
+"% 	c #D70750",
+"& 	c #D70751",
+"* 	c #D6044F",
+"= 	c #E03F78",
+"- 	c #9BBB56",
+"; 	c #AAC562",
+"> 	c #A2BF5A",
+", 	c #94B64F",
+"' 	c #FDF4F7",
+") 	c #F2B3CA",
+"! 	c #D70852",
+"~ 	c #CADD69",
+"{ 	c #DCEA71",
+"] 	c #DAE96B",
+"^ 	c #D5E664",
+"/ 	c #D1E467",
+"( 	c #B0CA61",
+"_ 	c #D70651",
+": 	c #D6044E",
+"< 	c #FEFEFE",
+"[ 	c #D9145A",
+"} 	c #A5C05F",
+"| 	c #BBD26C",
+"1 	c #8AAC51",
+"2 	c #92B354",
+"3 	c #C3D866",
+"4 	c #C9DC5A",
+"5 	c #C2D75F",
+"6 	c #D60551",
+"7 	c #FFFFFF",
+"8 	c #E44D83",
+"9 	c #99B755",
+"0 	c #BBD155",
+"a 	c #BED355",
+"b 	c #8BAD46",
+"c 	c #D50650",
+"d 	c #FFFEFF",
+"e 	c #DE3571",
+"f 	c #759E3A",
+"g 	c #8BAD49",
+"h 	c #B2C94D",
+"i 	c #B6CC4D",
+"j 	c #89AB45",
+"k 	c #7AA23C",
+"l 	c #D80046",
+"m 	c #DE1F63",
+"n 	c #DF2E6D",
+"o 	c #9FBB50",
+"p 	c #AAC342",
+"q 	c #A9C241",
+"r 	c #A7C24F",
+"s 	c #CDCECE",
+"t 	c #D2CCCE",
+"u 	c #D2C1C8",
+"v 	c #D0D6D4",
+"w 	c #D0D7D5",
+"x 	c #CFCFCF",
+"y 	c #CECECE",
+"z 	c #CCCCCC",
+"A 	c #CBCBCB",
+"B 	c #CACACB",
+"C 	c #C9C9C9",
+"D 	c #CBC9CE",
+"E 	c #A2B683",
+"F 	c #9DB943",
+"G 	c #9EB940",
+"H 	c #96AF6E",
+"I 	c #C5C2C9",
+"J 	c #BEBEBE",
+"K 	c #BCBCBD",
+"L 	c #B3B3B3",
+"M 	c #DFDFE0",
+"N 	c #ECEDEE",
+"O 	c #EDEEEF",
+"P 	c #EDEDEE",
+"Q 	c #ECECED",
+"R 	c #EBEBEC",
+"S 	c #EEEEEF",
+"T 	c #E8E8E9",
+"U 	c #E6E6E7",
+"V 	c #98B46C",
+"W 	c #8CAB5A",
+"X 	c #E2E2E2",
+"Y 	c #E3E3E4",
+"Z 	c #E2E2E3",
+"` 	c #B7B7B7",
+" .	c #C6C9C8",
+"..	c #E9E9EA",
+"+.	c #E1E1E2",
+"@.	c #C0C0C0",
+"#.	c #C8C8C9",
+"$.	c #E7E7E8",
+"%.	c #E8E7EA",
+"&.	c #E2E3E2",
+"*.	c #E4E4E5",
+"=.	c #C3C3C4",
+"-.	c #D6024D",
+";.	c #CAA2B0",
+">.	c #EDF2F1",
+",.	c #EFEFF0",
+"'.	c #B6B6B7",
+").	c #AFAFAF",
+"!.	c #B1B1B1",
+"~.	c #B5B5B6",
+"{.	c #E5E5E6",
+"].	c #EDEDED",
+"^.	c #D7D7D8",
+"/.	c #AAAAAA",
+"(.	c #D75C87",
+"_.	c #E6A9BE",
+":.	c #EBE3E7",
+"<.	c #EFEFEF",
+"[.	c #F0F0F1",
+"}.	c #BDBDBE",
+"|.	c #C1C1C1",
+"1.	c #A8A8A8",
+"2.	c #A7A7A7",
+"3.	c #9D9D9D",
+"4.	c #D6D6D7",
+"5.	c #A9A9A9",
+"6.	c #DEE2E1",
+"7.	c #E9D9DF",
+"8.	c #EAE2E6",
+"9.	c #BABABB",
+"0.	c #B5B5B5",
+"a.	c #B8B8B8",
+"b.	c #EAEAEA",
+"c.	c #D3D3D3",
+"d.	c #9E9E9E",
+"e.	c #CCCCCD",
+"f.	c #E0E0E1",
+"g.	c #EAEAEB",
+"h.	c #989898",
+"i.	c #A2A2A3",
+"j.	c #EEEEF0",
+"k.	c #BDBDBD",
+"l.	c #BFBFBF",
+"m.	c #E2E2E1",
+"n.	c #D2D2D3",
+"o.	c #A0A0A0",
+"p.	c #CFCFD0",
+"q.	c #C5C5C5",
+"r.	c #BBBBBB",
+"s.	c #D9D9D9",
+"t.	c #BCBCBC",
+"u.	c #B4B4B4",
+"v.	c #C1C1C2",
+"w.	c #D1D1D2",
+"x.	c #DDDDDE",
+"y.	c #C4C4C4",
+"z.	c #8D8D8D",
+"A.	c #A4A4A4",
+"B.	c #DCDCDD",
+"C.	c #B8B8B9",
+"D.	c #DADADB",
+"E.	c #C4C4C5",
+"F.	c #AFAFAE",
+"G.	c #B6B6B6",
+"H.	c #AEAEAE",
+"I.	c #D9D9DA",
+"J.	c #929292",
+"K.	c #919191",
+"L.	c #8F8F8F",
+"M.	c #D8D8D9",
+"N.	c #DEDEDF",
+"O.	c #ABABAB",
+"P.	c #CDCDCE",
+"Q.	c #D3D3D4",
+"R.	c #DBDBDC",
+"S.	c #CBCBCC",
+"T.	c #B2B2B2",
+"U.	c #E0E0E0",
+"V.	c #D4D4D4",
+"W.	c #B4B4B5",
+"X.	c #878789",
+"Y.	c #ACACAC",
+"Z.	c #ADADAD",
+"`.	c #B9B9B9",
+" +	c #BABABA",
+".+	c #B7B7B8",
+"++	c #B1B1B0",
+"@+	c #888889",
+"#+	c #5E5E60",
+"$+	c #7F7F7F",
+"%+	c #3B3B3B",
+"&+	c #353535",
+"*+	c #363636",
+"=+	c #373737",
+"-+	c #383838",
+";+	c #343434",
+">+	c #414141",
+",+	c #808080",
+"'+	c #5E5E5F",
+")+	c #8C8C8C",
+"!+	c #919190",
+"~+	c #939393",
+"{+	c #969696",
+"]+	c #9A9A9A",
+"^+	c #9B9B9B",
+"/+	c #9C9C9C",
+"(+	c #9F9F9E",
+"_+	c #9F9F9F",
+":+	c #9B9B9A",
+"<+	c #999998",
+"[+	c #979797",
+"}+	c #949494",
+"|+	c #8E8E8E",
+"1+	c #545456",
+"2+	c #505053",
+"3+	c #4F4F52",
+"4+	c #4E4E52",
+"5+	c #4E4E51",
+"6+	c #4F4F53",
+"                                                                ",
+"          . + @ # $ #                                           ",
+"        . %         % &                                         ",
+"      &               * &                                       ",
+"    .                 = *       - ; > ,                         ",
+"    @             '   ) !     ~ { ] ^ / (                       ",
+"    _       :   <       [   } | 1 2 3 4 5                       ",
+"            6   7       8   9         0 a b                     ",
+"            c     d   e           f g h i j k                   ",
+"    #         l   m n               o p q r                     ",
+"    $       s t u v w x y z A B C D E F G H I J K L             ",
+"      &     M N O P P P Q R R S Q T U V W X Y Z X `             ",
+"      +    ...Q P S S P Q Q +.@.#.Z $.%.&.*.Y Z +.=.            ",
+"        -.;.>.Q P S ,.S P ..'.).!.~.T {.].Q Q Y Z ^./.          ",
+"          (._.:.P ,.<.[.P P [.}.|.P $.R 1.2.3.4.+.*.5.          ",
+"          6.7.8.Y 9.0.a.b.Q P J @...$.R c.d.e.f.+.Z @.          ",
+"          Z g.g.+.h.2.i.j.Q Q k.l.m.n.'.o.K U Y +.+.p.          ",
+"        q.{.....g.,.r.1.s.b.g.t.u.v.w.p.x.U Y Y +.+.^.          ",
+"        y.T T T ....Q |.z.o.A.5.|.R $.U {.*.Y Y +.+.B.u.        ",
+"        A $.$.T T ....g.R ....C.@.T U U *.*.Y Z +.+.f.`         ",
+"      u.D.{.U U $.$.$.$.T ....a.l.T U {.*.Y Z Z +.f.f.E.        ",
+"      F.U *.{.{.U U $.$.$.4.G.H.).` I.{.Y Y Z Z f.f.M 4.1.      ",
+"      k.{.Y *.*.{.{.{.{.U I.z.J.K.L.M.*.Y Z +.+.f.M N.+.O.      ",
+"      P.Y Z Y Y *.*.{.{.{.{.$.$.U U *.Y Z Z +.+.M M N.M l.      ",
+"      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.      ",
+"    T.^.N.M M U.f.f.f.+.+.+.+.+.f.f.f.M M M N.x.x.B.B.R.V.      ",
+"    ` M +.Z Z Y Z Y Y Y Y Y Y Y Y Y Z Z Z +.+.+.f.f.M M B.W.    ",
+"    X.5.Y.Z.).L G.` `. +t.k.J l.l.J J t.r.`..+0.u.T.++).O.@+    ",
+"    #+$+%+&+*+&+*+*+*+*+=+=+-+=+=+=+=+=+*+*+*+*+&+&+;+>+,+'+    ",
+"      )+!+L.!+~+{+h.]+^+/+(+_+o.o._+d.3./+:+<+[+}+J.!+~+|+      ",
+"      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+      ",
+"                                                                "};

=== 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-27 16:13:27 +0000
@@ -0,0 +1,155 @@
+/* XPM */
+static char * usb_creator_kde_16x16_xpm[] = {
+"16 16 136 2",
+"  	c None",
+". 	c #0D9C0D",
+"+ 	c #2AAA2A",
+"@ 	c #008C00",
+"# 	c #D7D7DA",
+"$ 	c #C3C6CC",
+"% 	c #008B00",
+"& 	c #5BC95B",
+"* 	c #B0E8B0",
+"= 	c #B9EAB9",
+"- 	c #9BE59B",
+"; 	c #1BA81B",
+"> 	c #E6E6E6",
+", 	c #EFEFF1",
+"' 	c #8E8A80",
+") 	c #CBCED4",
+"! 	c #25BF25",
+"~ 	c #63DA63",
+"{ 	c #81CF81",
+"] 	c #E8F7E8",
+"^ 	c #5BD75B",
+"/ 	c #5FD95F",
+"( 	c #009700",
+"_ 	c #CFD1D2",
+": 	c #989488",
+"< 	c #EBEBED",
+"[ 	c #DADBDF",
+"} 	c #D8D9DC",
+"| 	c #E0DEE6",
+"1 	c #40A942",
+"2 	c #149F14",
+"3 	c #49AB49",
+"4 	c #6EB26E",
+"5 	c #E1EFE1",
+"6 	c #43A743",
+"7 	c #3CA83C",
+"8 	c #00B300",
+"9 	c #DBDCDE",
+"0 	c #EBECEC",
+"a 	c #DFE0E0",
+"b 	c #E2E2E8",
+"c 	c #EEE9F3",
+"d 	c #2FB030",
+"e 	c #329F32",
+"f 	c #EAF7EA",
+"g 	c #E8F3E8",
+"h 	c #FAFCFA",
+"i 	c #E2F2E2",
+"j 	c #BBE2BB",
+"k 	c #00BA00",
+"l 	c #E4E4E9",
+"m 	c #BEBEC2",
+"n 	c #B1AFB4",
+"o 	c #60C762",
+"p 	c #00B700",
+"q 	c #00B400",
+"r 	c #2BA42B",
+"s 	c #D4EED4",
+"t 	c #00B100",
+"u 	c #DEE0E0",
+"v 	c #DDDEE3",
+"w 	c #E5E5EA",
+"x 	c #E2E2E6",
+"y 	c #AFAFB2",
+"z 	c #D0E2D3",
+"A 	c #00B200",
+"B 	c #00A600",
+"C 	c #2DAA2D",
+"D 	c #BBE4BB",
+"E 	c #00A300",
+"F 	c #00A800",
+"G 	c #D6DAE3",
+"H 	c #EAE9EC",
+"I 	c #E3E3E7",
+"J 	c #CCCCCF",
+"K 	c #A7A7AA",
+"L 	c #AAD7AD",
+"M 	c #06BD06",
+"N 	c #00A100",
+"O 	c #00B600",
+"P 	c #00C600",
+"Q 	c #506F9A",
+"R 	c #B1C7EB",
+"S 	c #DCE0EA",
+"T 	c #EDEDF1",
+"U 	c #D6D6D9",
+"V 	c #F3EDF8",
+"W 	c #ABDFAD",
+"X 	c #388772",
+"Y 	c #2C508F",
+"Z 	c #57759B",
+"` 	c #A2BEED",
+" .	c #BFCBE2",
+"..	c #EDECEF",
+"+.	c #ECECF0",
+"@.	c #EBEBEF",
+"#.	c #E8C9D8",
+"$.	c #DB9DB5",
+"%.	c #9FAAC5",
+"&.	c #707CA1",
+"*.	c #59779C",
+"=.	c #A7C3F0",
+"-.	c #B0C1E0",
+";.	c #EBEAEC",
+">.	c #EAE1E8",
+",.	c #E08EAD",
+"'.	c #E2D7E0",
+").	c #D9B1C3",
+"!.	c #CDCED4",
+"~.	c #A7A9AE",
+"{.	c #5B799D",
+"].	c #ABC8F3",
+"^.	c #B1C1DB",
+"/.	c #E4B5C8",
+"(.	c #E1B9CB",
+"_.	c #DBB9CA",
+":.	c #D2B4C4",
+"<.	c #C2C4CA",
+"[.	c #A9AAB1",
+"}.	c #5C7B9D",
+"|.	c #AECBF6",
+"1.	c #D0D8DC",
+"2.	c #D98BAA",
+"3.	c #D4B9C8",
+"4.	c #CAA5B8",
+"5.	c #B6A2B1",
+"6.	c #A1A3A9",
+"7.	c #486789",
+"8.	c #B1BAC7",
+"9.	c #CED4D8",
+"0.	c #C5B5C1",
+"a.	c #B5ADB8",
+"b.	c #A4A8AF",
+"c.	c #B2B4B9",
+"d.	c #B3B4BD",
+"e.	c #A2A4AB",
+"                    . + @       ",
+"    # $         % & * = - ;     ",
+"  > , ' )       ! ~ { ] ^ / (   ",
+"  _ : < [ } | 1 2 3 4 5 6 7 8   ",
+"    9 0 a b c d e f g h i j k   ",
+"      a l m n o p q r s t q t   ",
+"    u v w x y z A B C D E F k   ",
+"      G H I J K L M B N O P     ",
+"      Q R S T U x V W X Y       ",
+"        Z `  ...+.@.#.$.%.&.    ",
+"          *.=.-.;.>.,.'.).!.~.  ",
+"            {.].^./.(._.:.<.[.  ",
+"              }.|.1.2.3.4.5.6.  ",
+"                7.8.9.0.a.b.    ",
+"                    c.d.e.      ",
+"                                "};

=== 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-27 16:13:27 +0000
@@ -0,0 +1,466 @@
+/* XPM */
+static char * usb_creator_kde_32x32_xpm[] = {
+"32 32 431 2",
+"  	c None",
+". 	c #B5B7BA",
+"+ 	c #CFD1D3",
+"@ 	c #008C00",
+"# 	c #019701",
+"$ 	c #38B238",
+"% 	c #4DBC4D",
+"& 	c #3BB33B",
+"* 	c #059905",
+"= 	c #C3C4C5",
+"- 	c #D3D5DA",
+"; 	c #C7C9D0",
+"> 	c #008600",
+", 	c #009800",
+"' 	c #62CC62",
+") 	c #B7ECB7",
+"! 	c #B4EAB4",
+"~ 	c #B2E9B2",
+"{ 	c #B4EBB4",
+"] 	c #B9EDB9",
+"^ 	c #6BD06B",
+"/ 	c #009B00",
+"( 	c #008700",
+"_ 	c #CCCCCC",
+": 	c #E3E4E6",
+"< 	c #DBDCE0",
+"[ 	c #D7D8DD",
+"} 	c #92979E",
+"| 	c #D3D4D6",
+"1 	c #008200",
+"2 	c #00A000",
+"3 	c #77DA77",
+"4 	c #91E391",
+"5 	c #90DE90",
+"6 	c #A7DEA7",
+"7 	c #C2E9C2",
+"8 	c #ABE3AB",
+"9 	c #90E390",
+"0 	c #80DD80",
+"a 	c #00A500",
+"b 	c #008300",
+"c 	c #CFCFCE",
+"d 	c #ECECED",
+"e 	c #E7E8E9",
+"f 	c #E4E5E7",
+"g 	c #6E7579",
+"h 	c #685022",
+"i 	c #B9BCC2",
+"j 	c #CFD0D3",
+"k 	c #009900",
+"l 	c #41CD41",
+"m 	c #71DB71",
+"n 	c #70DB70",
+"o 	c #70D170",
+"p 	c #B3DEB3",
+"q 	c #FFFFFF",
+"r 	c #BFE9BF",
+"s 	c #70DA70",
+"t 	c #71DA71",
+"u 	c #4BD14B",
+"v 	c #009C00",
+"w 	c #007E00",
+"x 	c #C9C9C9",
+"y 	c #EAEAEA",
+"z 	c #ECECEC",
+"A 	c #EDEDEE",
+"B 	c #E7E7E9",
+"C 	c #DADCDE",
+"D 	c #B4B5B9",
+"E 	c #D3D4D9",
+"F 	c #CFD0D2",
+"G 	c #DEE0E0",
+"H 	c #E1E2E3",
+"I 	c #008100",
+"J 	c #00BA00",
+"K 	c #55D555",
+"L 	c #52D452",
+"M 	c #52C452",
+"N 	c #A2D0A2",
+"O 	c #B0E3B0",
+"P 	c #51D451",
+"Q 	c #56D556",
+"R 	c #05BD05",
+"S 	c #008400",
+"T 	c #BEBEBE",
+"U 	c #E4E4E4",
+"V 	c #EEEEED",
+"W 	c #808587",
+"X 	c #E6E5E6",
+"Y 	c #E2E3E5",
+"Z 	c #D2D4D9",
+"` 	c #C6C8CF",
+" .	c #E0E2E1",
+"..	c #D9D9DE",
+"+.	c #D9DADF",
+"@.	c #A2C5A8",
+"#.	c #009200",
+"$.	c #04BC04",
+"%.	c #2EB62E",
+"&.	c #32B832",
+"*.	c #32A732",
+"=.	c #92C192",
+"-.	c #A2D5A2",
+";.	c #31B831",
+">.	c #2FC12F",
+",.	c #07C107",
+"'.	c #009A00",
+").	c #BBBBBB",
+"!.	c #999EA2",
+"~.	c #624A1E",
+"{.	c #C7C8C8",
+"].	c #EBEBEB",
+"^.	c #E1E2E4",
+"/.	c #DADBDE",
+"(.	c #DBDDDC",
+"_.	c #DCDCE1",
+":.	c #DCDEE3",
+"<.	c #DEDFE4",
+"[.	c #75B079",
+"}.	c #00A700",
+"|.	c #2F782F",
+"1.	c #6BA66B",
+"2.	c #70A870",
+"3.	c #71A871",
+"4.	c #B3D5B3",
+"5.	c #BED8BE",
+"6.	c #6CA46C",
+"7.	c #389838",
+"8.	c #00C000",
+"9.	c #00AD00",
+"0.	c #007600",
+"a.	c #C0C0C0",
+"b.	c #CDCFD0",
+"c.	c #E9E9E9",
+"d.	c #EBEAEB",
+"e.	c #E6E6E7",
+"f.	c #DCDDDC",
+"g.	c #DEDEE4",
+"h.	c #E0E0E5",
+"i.	c #E2E2E7",
+"j.	c #E5E4EA",
+"k.	c #69AC6B",
+"l.	c #00B100",
+"m.	c #009500",
+"n.	c #81AA81",
+"o.	c #FEFEFE",
+"p.	c #96CF96",
+"q.	c #00BF00",
+"r.	c #00B600",
+"s.	c #007F00",
+"t.	c #BABABA",
+"u.	c #DDDFDD",
+"v.	c #DFE0E5",
+"w.	c #E4E4E9",
+"x.	c #E5E5EA",
+"y.	c #E6E6EB",
+"z.	c #75BA77",
+"A.	c #00A900",
+"B.	c #52A652",
+"C.	c #A5D8A5",
+"D.	c #A5D3A5",
+"E.	c #CFE3CF",
+"F.	c #D6EAD6",
+"G.	c #A5D7A5",
+"H.	c #60C560",
+"I.	c #E2E2E1",
+"J.	c #DDDEDD",
+"K.	c #DFDFE5",
+"L.	c #CDCDD1",
+"M.	c #DEDEE2",
+"N.	c #D6D6DA",
+"O.	c #A1D2A4",
+"P.	c #00AA00",
+"Q.	c #00B900",
+"R.	c #00B800",
+"S.	c #009F00",
+"T.	c #74B474",
+"U.	c #8AD18A",
+"V.	c #00AE00",
+"W.	c #DADBDA",
+"X.	c #E1E1E6",
+"Y.	c #E5E5E9",
+"Z.	c #CBCBCF",
+"`.	c #909093",
+" +	c #99999C",
+".+	c #858587",
+"++	c #F0EFF4",
+"@+	c #00AC00",
+"#+	c #00B200",
+"$+	c #00A100",
+"%+	c #77BC77",
+"&+	c #8CD28C",
+"*+	c #DEE0DE",
+"=+	c #DBDCE1",
+"-+	c #DFDFE4",
+";+	c #E9E9ED",
+">+	c #EAEAEE",
+",+	c #9B9B9E",
+"'+	c #CFCFD2",
+")+	c #DEDCE1",
+"!+	c #66CE68",
+"~+	c #00B300",
+"{+	c #77C077",
+"]+	c #D4D7D0",
+"^+	c #E7E7EC",
+"/+	c #BEBEC1",
+"(+	c #CDCDD0",
+"_+	c #818182",
+":+	c #DDDDE0",
+"<+	c #EEECF2",
+"[+	c #12C612",
+"}+	c #00B000",
+"|+	c #00A400",
+"1+	c #00A300",
+"2+	c #51B751",
+"3+	c #AFDFAF",
+"4+	c #60C260",
+"5+	c #00A200",
+"6+	c #00C200",
+"7+	c #C5C6C2",
+"8+	c #E2E2E6",
+"9+	c #E6E6EA",
+"0+	c #E8E8EC",
+"a+	c #EBEBEF",
+"b+	c #C6C6C9",
+"c+	c #9D9DA0",
+"d+	c #B4B4B8",
+"e+	c #7D7D7F",
+"f+	c #F7F8FC",
+"g+	c #DDEBE1",
+"h+	c #0ECC0E",
+"i+	c #009E00",
+"j+	c #00B400",
+"k+	c #00C900",
+"l+	c #A6B6CC",
+"m+	c #DEE2E8",
+"n+	c #E9E8EA",
+"o+	c #F0F0F4",
+"p+	c #F2F2F6",
+"q+	c #F3F3F7",
+"r+	c #4B4B4C",
+"s+	c #A8A9AB",
+"t+	c #ECECF0",
+"u+	c #55DA56",
+"v+	c #00C600",
+"w+	c #00B700",
+"x+	c #00CF00",
+"y+	c #476790",
+"z+	c #90ACDB",
+"A+	c #B0C6EA",
+"B+	c #D7DEEA",
+"C+	c #EBEAEC",
+"D+	c #EDEDF1",
+"E+	c #F1F1F5",
+"F+	c #878789",
+"G+	c #BDBDC0",
+"H+	c #F0EDF4",
+"I+	c #DEE9E2",
+"J+	c #85DE87",
+"K+	c #3AC23E",
+"L+	c #0FA92D",
+"M+	c #14A336",
+"N+	c #1F8659",
+"O+	c #1C3E81",
+"P+	c #4D6C95",
+"Q+	c #95B0DC",
+"R+	c #9FBBEB",
+"S+	c #B0C3E6",
+"T+	c #DEE0E5",
+"U+	c #EBEAEF",
+"V+	c #EFEFF3",
+"W+	c #E6E3EA",
+"X+	c #9093B8",
+"Y+	c #4553AF",
+"Z+	c #4051A8",
+"`+	c #3545A2",
+" @	c #19317E",
+".@	c #4E6D95",
+"+@	c #97B2DD",
+"@@	c #A4BFED",
+"#@	c #9CB7E7",
+"$@	c #C7D0DE",
+"%@	c #E8E8EB",
+"&@	c #EAEDF0",
+"*@	c #E5EBEE",
+"=@	c #B5B8C1",
+"-@	c #707AA9",
+";@	c #5361A2",
+">@	c #34429E",
+",@	c #042860",
+"'@	c #4E6E96",
+")@	c #98B4DE",
+"!@	c #A6C1EE",
+"~@	c #9CB8E9",
+"{@	c #B3C2DD",
+"]@	c #E2E2E4",
+"^@	c #EBE8ED",
+"/@	c #DD5789",
+"(@	c #DA316E",
+"_@	c #E19BB7",
+":@	c #DEE4E8",
+"<@	c #D5D6D9",
+"[@	c #C9C9CA",
+"}@	c #999FA4",
+"|@	c #506F96",
+"1@	c #99B6DF",
+"2@	c #A8C3EF",
+"3@	c #A0BBEA",
+"4@	c #A8BBDE",
+"5@	c #DDDDDF",
+"6@	c #EBEBF0",
+"7@	c #ECF4F5",
+"8@	c #DC437A",
+"9@	c #E3B1C6",
+"0@	c #E6F0F1",
+"a@	c #DFB0C5",
+"b@	c #DA80A3",
+"c@	c #D8DBDF",
+"d@	c #D0D1D7",
+"e@	c #C9CAD1",
+"f@	c #A3A6A8",
+"g@	c #517096",
+"h@	c #9BB7E0",
+"i@	c #AAC6F0",
+"j@	c #A2BDEB",
+"k@	c #A5BADE",
+"l@	c #D9D9DC",
+"m@	c #E4A8C0",
+"n@	c #DF81A5",
+"o@	c #E5E0E7",
+"p@	c #E2CCD8",
+"q@	c #DFDAE1",
+"r@	c #D99AB4",
+"s@	c #D5DBDE",
+"t@	c #CCCDD3",
+"u@	c #C4C5CC",
+"v@	c #BCBDC6",
+"w@	c #939594",
+"x@	c #517196",
+"y@	c #9DB9E1",
+"z@	c #ABC7F2",
+"A@	c #A4BFEC",
+"B@	c #A6BADC",
+"C@	c #DADADD",
+"D@	c #DE719A",
+"E@	c #E2ADC3",
+"F@	c #E2C6D4",
+"G@	c #DFD3DD",
+"H@	c #D796B1",
+"I@	c #D1D6DA",
+"J@	c #C9CAD0",
+"K@	c #BFC0C8",
+"L@	c #B2B3BB",
+"M@	c #A3A5A8",
+"N@	c #527297",
+"O@	c #9FBBE2",
+"P@	c #ADC9F3",
+"Q@	c #A6C2EE",
+"R@	c #ABBAD1",
+"S@	c #E09CB7",
+"T@	c #DD81A5",
+"U@	c #E0E3E7",
+"V@	c #DAAABF",
+"W@	c #D795B0",
+"X@	c #D3A1B7",
+"Y@	c #CBCED3",
+"Z@	c #C3C4CB",
+"`@	c #B9BBC2",
+" #	c #ACADB6",
+".#	c #A1A3A8",
+"+#	c #537397",
+"@#	c #A0BDE3",
+"##	c #AFCCF4",
+"$#	c #A7C3F1",
+"%#	c #C6C7CB",
+"&#	c #E2E9EC",
+"*#	c #D9437A",
+"=#	c #DBE1E4",
+"-#	c #D8D9DE",
+";#	c #D3D7DC",
+">#	c #CDCED4",
+",#	c #C5C7CE",
+"'#	c #BFB3BF",
+")#	c #B3AAB5",
+"!#	c #A5A6AF",
+"~#	c #9FA2A5",
+"{#	c #527295",
+"]#	c #9DBADF",
+"^#	c #B3D0F8",
+"/#	c #B6C0CD",
+"(#	c #DDDEE3",
+"_#	c #D9D1D9",
+":#	c #D65B89",
+"<#	c #D583A3",
+"[#	c #CF9EB5",
+"}#	c #CC8EA8",
+"|#	c #CA6D92",
+"1#	c #BD87A0",
+"2#	c #A9ADB5",
+"3#	c #A9ABB4",
+"4#	c #416284",
+"5#	c #8BA8CD",
+"6#	c #ADBCCE",
+"7#	c #D8D8DE",
+"8#	c #D0D5D9",
+"9#	c #CBC4CD",
+"0#	c #C992AB",
+"a#	c #C297AD",
+"b#	c #B4BCC2",
+"c#	c #ABACB5",
+"d#	c #A8AAB4",
+"e#	c #1E3D5B",
+"f#	c #697F96",
+"g#	c #C8C9CF",
+"h#	c #C3C4CA",
+"i#	c #BCBDC4",
+"j#	c #B4B5BD",
+"k#	c #ABACB4",
+"l#	c #A8ABB4",
+"m#	c #949697",
+"n#	c #C5C6CD",
+"o#	c #BDBEC5",
+"p#	c #B8B9C0",
+"q#	c #B1B2BA",
+"r#	c #A8A9B2",
+"s#	c #868886",
+"t#	c #AFB0B5",
+"u#	c #B4B6BE",
+"v#	c #AFB0B9",
+"w#	c #A4A6AC",
+"x#	c #8C8F8D",
+"                                                                ",
+"          . +                         @ # $ % & * @             ",
+"        = - ; +                   > , ' ) ! ~ { ] ^ / (         ",
+"      _ : < [ } |               1 2 3 4 5 6 7 8 9 9 0 a b       ",
+"    c d e f g h i j             k l m n o p q r n s t u v w     ",
+"  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     ",
+"  T U V W X e Y < Z `  ...+.@.#.$.%.&.&.*.=.q -.;.&.&.>.,.'.    ",
+"    ).!.~.{.].e ^./.(._.:.<.[.}.k |.1.2.3.4.q 5.2.2.6.7.8.9.0.  ",
+"      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.  ",
+"        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.@   ",
+"          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.    ",
+"            W.g.X.Y.Z.`. +.+++@+#+#+#+#+$+%+q &+#+#+#+#+#+V.    ",
+"          *+=+-+w.y.;+>+,+'+)+!+~+P.P.P.S.{+q &+P.P.P.P.#+R.    ",
+"        ]+<.=+i.Y.^+>+/+(+_+:+<+[+}+|+1+S.2+3+4+5+5+|+V.6+      ",
+"          7+8+i.9+0+a+b+c+d+e+f+g+h+r.|+i+/ './ i+1+j+k+        ",
+"            l+m+n+;+a+a+o+p+q+r+s+t+u+v+R.9.P.@+w+x+x+          ",
+"            y+z+A+B+C+t+a+D+E+F+G+D+H+I+J+K+L+M+N+O+            ",
+"              P+Q+R+S+T+U+t+t+V+D+t+t+t+t+W+X+Y+Z+`+ @          ",
+"                .@+@@@#@$@%@D+t+D+t+a+t+t+&@*@=@-@;@>@,@        ",
+"                  '@)@!@~@{@]@D+t+a+t+a+^@/@(@_@:@<@[@}@        ",
+"                    |@1@2@3@4@5@t+6@t+7@8@9@0@a@b@c@d@e@f@      ",
+"                      g@h@i@j@k@l@t+a+m@n@o@p@q@r@s@t@u@v@w@    ",
+"                        x@y@z@A@B@C@;+D@E@F@G@_.H@I@J@K@L@M@    ",
+"                          N@O@P@Q@R@i.S@T@U@V@W@X@Y@Z@`@ #.#    ",
+"                            +#@###$#%#&#*#=#-#;#>#,#'#)#!#~#    ",
+"                              {#]#^#/#(#_#:#<#[#}#|#1#2#3#      ",
+"                                4#5#6#7#E 8#9#0#a#b#c#d#w@      ",
+"                                  e#f#d@t@g#h#i#j#k#l#w@        ",
+"                                      m#n#o#p#q#r#3#w@          ",
+"                                        s#t#u#v#w#x#            ",
+"                                                                ",
+"                                                                "};

=== modified file 'debian/changelog'
--- debian/changelog	2010-05-26 10:08:29 +0000
+++ debian/changelog	2010-05-27 16:13:27 +0000
@@ -1,4 +1,4 @@
-usb-creator (0.2.23ubuntu1) UNRELEASED; urgency=low
+usb-creator (0.2.23) UNRELEASED; urgency=low
 
   [ Evan Dandrea ]
   * Continue evaluting whether or not a partition can be used even if
@@ -30,18 +30,31 @@
   * debian/control:
     + removed transitional package (LTS is released)
     + improved extended description
+    + added forgotten python-support dependency
+    + updated descriptions (thanks Matthew Paul Thomas)
   * debian/rules:
     + using dh tiny rules
     + using python-support
+    + vendor branded icons installed if available
+    + debian-menu installed if there are branded xpm's
   * .bzr-builddeb:
     + defaults to native
 
   * Use XDG_CACHE_DIR for usb-creator.log
   * Use XDG IconTheme spec for window icons (LP: #535061)
-  * Install branded / debranded icons based on dpkg-vendor
-  * Add Debian branded icons & updated debian/copyright
-
- -- Dmitrijs Ledkovs <dmitrij.ledkov@xxxxxxxxxx>  Mon, 03 May 2010 04:22:28 +0000
+
+  [ Ignace Mouzannar ]
+  * Initial Debian release (Closes: #582884, #576359)
+  * debian/control:
+    + Added Build dependency on kdesdk-scripts (Debian specific)
+  * 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/copyright:
+    + Added myself in the debian/* copyright
+
+ -- Ignace Mouzannar <mouzannar@xxxxxxxxx>  Wed, 26 May 2010 00:59:11 +0200
 
 usb-creator (0.2.22) lucid; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2010-05-26 10:08:29 +0000
+++ debian/control	2010-05-27 16:13:27 +0000
@@ -2,11 +2,13 @@
 Section: admin
 Priority: optional
 Maintainer: usb-creator Hackers Team <usb-creator-hackers@xxxxxxxxxxxxxxxxxxx>
-Uploaders: Dmitrijs Ledkovs <dmitrij.ledkov@xxxxxxxxxx>
+Uploaders: Dmitrijs Ledkovs <dmitrij.ledkov@xxxxxxxxxx>, Ignace Mouzannar <mouzannar@xxxxxxxxx>
 Build-Depends: debhelper (>= 7.0.50~),
                python,
+               python-support,
                python-distutils-extra,
-               pkg-kde-tools
+               pkg-kde-tools,
+               kdesdk-scripts
 Standards-Version: 3.8.4
 Vcs-Bzr: http://bazaar.launchpad.net/~usb-creator-hackers/usb-creator/trunk
 
@@ -14,23 +16,28 @@
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, python-dbus, syslinux,
  udisks (>= 1.0~), udisks (<< 1.1), genisoimage, mtools, parted
-Description: Live USB creator (common files)
- Utility for converting Live Linux CDs into bootable USB sticks for example
- Ubuntu and Kubuntu. This utility can partition USB stick to allow
- storing user files in persistence mode.
- .
- This package contains backend engine and common data files used
- by frontends.
+Description: create a startup disk using a CD or disc image (common files)
+ 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.
+ .
+ This package contains backend engine and common data files used by frontends.
 
 Package: usb-creator-gtk
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends},
  usb-creator-common (= ${source:Version}), python-gtk2 (>= 2.12),
  python-dbus, python-gnome2
-Description: Live USB creator for GNOME
- Utility for converting Live Linux CDs into bootable USB sticks for example
- Ubuntu and Ubuntu Netbook Remix. This utility can partition USB stick to allow
- storing user files in persistence mode.
+Description: create a startup disk using a CD or disc image (for GNOME)
+ 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.
  .
  This package contains the GTK+ client frontend.
 
@@ -38,9 +45,12 @@
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends},
  usb-creator-common (= ${source:Version}), python-kde4, python-qt4-dbus
-Description: Live USB creator for KDE
- Utility for converting Live Linux CDs into bootable USB sticks for example
- Kubuntu and Kubuntu Netbook Remix. This utility can partition USB stick to
- allow storing user files in persistence mode.
+Description: create a startup disk using a CD or disc image (for KDE)
+ 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.
  .
  This package contains the KDE client frontend.

=== modified file 'debian/copyright'
--- debian/copyright	2010-05-24 07:16:26 +0000
+++ debian/copyright	2010-05-27 16:13:27 +0000
@@ -9,7 +9,8 @@
 
 Files: debian/*
 Copyright: 2008, Evan Dandrea <evand@xxxxxxxxxx>
-	   2010, Dmitrijs Ledkovs <dmitrij.ledkov@xxxxxxxxxx>
+           2010, Dmitrijs Ledkovs <dmitrij.ledkov@xxxxxxxxxx>
+           2010, Ignace Mouzannar <mouzannar@xxxxxxxxx>
 License: GPL-3
 
 Files: debian/Ubuntu/*

=== modified file 'debian/rules'
--- debian/rules	2010-05-24 07:00:59 +0000
+++ debian/rules	2010-05-27 16:13:27 +0000
@@ -1,9 +1,20 @@
 #!/usr/bin/make -f
-vendor := $(shell dpkg-vendor --query Vendor)
-dest   := debian/tmp/usr/share/icons/hicolor/scalable/apps
+vendor  := ./debian/$(shell dpkg-vendor --query Vendor)
+dest    := $(CURDIR)/debian/tmp/usr/share/icons/hicolor/scalable/apps
+xpm_gtk := $(CURDIR)/debian/usb-creator-gtk/usr/share/pixmaps/
+xpm_kde := $(CURDIR)/debian/usb-creator-kde/usr/share/pixmaps/
 
 %:
 	dh -Spython_distutils $@
+
 override_dh_install:
-	find . -path "./debian/$(vendor)/*.svg" -exec cp {} $(dest) \;
+	find . -path "$(vendor)/*.svg" -exec cp {} $(dest) \;
 	dh_install
+
+override_dh_installmenu:
+ifneq (,$(wildcard $(vendor)/*.xpm))
+	mkdir -p $(xpm_gtk) $(xpm_kde)
+	find . -path "$(vendor)/*-gtk*.xpm" -exec cp {} $(xpm_gtk) \;
+	find . -path "$(vendor)/*-kde*.xpm" -exec cp {} $(xpm_kde) \;
+	dh_installmenu
+endif

=== 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-27 16:13:27 +0000
@@ -0,0 +1,6 @@
+?package(usb-creator-gtk):needs="X11" section="Applications/File Management"\
+  title="usb-creator-gtk" command="/usr/bin/usb-creator-gtk" \
+  longtitle="Startup disk creator" \
+  icon16x16="/usr/share/pixmaps/usb-creator-gtk-16x16.xpm" \
+  icon32x32="/usr/share/pixmaps/usb-creator-gtk-32x32.xpm" \
+  icon="/usr/share/pixmaps/usb-creator-gtk-32x32.xpm"

=== 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-27 16:13:27 +0000
@@ -0,0 +1,6 @@
+?package(usb-creator-kde):needs="X11" section="Applications/File Management"\
+  title="usb-creator-kde" command="/usr/bin/usb-creator-kde" \
+  longtitle="Startup disk creator" \
+  icon16x16="/usr/share/pixmaps/usb-creator-kde-16x16.xpm" \
+  icon32x32="/usr/share/pixmaps/usb-creator-kde-32x32.xpm" \
+  icon="/usr/share/pixmaps/usb-creator-kde-32x32.xpm"


Follow ups