diff -u gconf-editor-2.24.1/debian/control gconf-editor-2.24.1/debian/control
--- gconf-editor-2.24.1/debian/control
+++ gconf-editor-2.24.1/debian/control
@@ -17,7 +17,8 @@
                gnome-doc-utils,
                pkg-config,
                intltool (>= 0.35.0),
-               liblaunchpad-integration-dev (>= 0.1.17)
+               liblaunchpad-integration-dev (>= 0.1.17),
+	       sharutils
 Standards-Version: 3.8.0
 
 Package: gconf-editor
diff -u gconf-editor-2.24.1/debian/rules gconf-editor-2.24.1/debian/rules
--- gconf-editor-2.24.1/debian/rules
+++ gconf-editor-2.24.1/debian/rules
@@ -16,0 +17,18 @@
+	
+build:
+	uudecode debian/hicolor_status_16x16_type-boolean.png.uuencode
+	mv -f debian/hicolor_status_16x16_type-boolean.png data/icons/hicolor_status_16x16_type-boolean.png
+	uudecode debian/hicolor_status_16x16_type-float.png.uuencode
+	mv -f debian/hicolor_status_16x16_type-float.png data/icons/hicolor_status_16x16_type-float.png
+	uudecode debian/hicolor_status_16x16_type-integer.png.uuencode
+	mv -f debian/hicolor_status_16x16_type-integer.png data/icons/hicolor_status_16x16_type-integer.png
+	uudecode debian/hicolor_status_16x16_type-list.png.uuencode
+	mv -f debian/hicolor_status_16x16_type-list.png data/icons/hicolor_status_16x16_type-list.png
+	uudecode debian/hicolor_status_16x16_type-pair.png.uuencode
+	mv -f debian/hicolor_status_16x16_type-pair.png data/icons/hicolor_status_16x16_type-pair.png
+	uudecode debian/hicolor_status_16x16_type-schema.png.uuencode
+	mv -f debian/hicolor_status_16x16_type-schema.png data/icons/hicolor_status_16x16_type-schema.png
+	uudecode debian/hicolor_status_16x16_type-string.png.uuencode
+	mv -f debian/hicolor_status_16x16_type-string.png data/icons/hicolor_status_16x16_type-string.png
+	uudecode debian/hicolor_status_16x16_type-undefined.png.uuencode
+	mv -f debian/hicolor_status_16x16_type-undefined.png data/icons/hicolor_status_16x16_type-undefined.png
diff -u gconf-editor-2.24.1/debian/changelog gconf-editor-2.24.1/debian/changelog
--- gconf-editor-2.24.1/debian/changelog
+++ gconf-editor-2.24.1/debian/changelog
@@ -1,3 +1,12 @@
+gconf-editor (2.24.1-2ubuntu3) jaunty; urgency=low
+
+  * In data/icons, using tango-style icons for 
+    key types (LP: #326258 )
+     - 'debian/*uuencode'
+     - 'debian/rules' 
+
+ -- Andrew Higginson <rugby471@gmail.com>  Fri, 06 Feb 2009 17:15:21 +0000
+
 gconf-editor (2.24.1-2ubuntu2) jaunty; urgency=low
 
   * debian/rules:
diff -u gconf-editor-2.24.1/debian/control.in gconf-editor-2.24.1/debian/control.in
--- gconf-editor-2.24.1/debian/control.in
+++ gconf-editor-2.24.1/debian/control.in
@@ -17,7 +17,8 @@
                gnome-doc-utils,
                pkg-config,
                intltool (>= 0.35.0),
-               liblaunchpad-integration-dev (>= 0.1.17)
+               liblaunchpad-integration-dev (>= 0.1.17),
+	       sharutils
 Standards-Version: 3.8.0
 
 Package: gconf-editor
only in patch2:
unchanged:
--- gconf-editor-2.24.1.orig/debian/hicolor_status_16x16_type-pair.png.uuencode
+++ gconf-editor-2.24.1/debian/hicolor_status_16x16_type-pair.png.uuencode
@@ -0,0 +1,16 @@
+begin 644 debian/hicolor_status_16x16_type-pair.png
+MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A`````7-21T(`KLX<
+MZ0```>1)1$%4.,MUDTUK$U$4AI]S[]"T0E"+IE%Q8=5U_0<%%VZ$@CO!A2O!
+MM104T;_@5D7QDY:65D3!K@1_BE#2V+1-$S="9NX]Q\5,)A,3S^;R,N<^\[[G
+M<@1@<WM]183GIK9@`&8819EEXMR/&,.S.[?O?F=:;6ZMM8][79M6@W1@G<Z^
+M??ZZ_6=MX\/C?^\Z@!#"N5,G3W/4/6#_H$V[TZ+U:Y?=O9]T#MOT?_=9N7EK
+MKMEH/OFX_N[1!$#-,(P0`U$C&B.J$54ERS(.CSHXYUA>OCY7FYE]^O;]Z^4Q
+M@*F"08R!&`(A1F*,.4PC69;RZ<L6.SO?6%JZ=L)Y61UWH`I`B%GN(F8%+`<U
+MF@T6%R^Q</XL@A"R<./5FQ?)6(0<H,286U=5S*SX)LS6:M3K=:Y<OHJJ>5--
+M`)(R0O%\F&&22Q'PX@`I='ZJ*:;Y3Y-J!!%!G,,5C<,:JB'`5$O7!2`7WGN<
+M.!`09()0.E##3"N`0GB?8*)E(PA5,R-`/I_Q&0@DSJ/BBDN%APJAC&!:NBXC
+M"."<1S`$&;D0F9C!?R((WOO1,$4J$:HNID1(?+)WW.M>F)\_4VV=NGC]?H\D
+M\9W!(!V4@#1-[VULKK],T_3B:(N'"VW8:+=)DIE6C.'^ZH.'!O`7:#(PRD="
+.Q)T`````245.1*Y"8((`
+`
+end
only in patch2:
unchanged:
--- gconf-editor-2.24.1.orig/debian/hicolor_status_16x16_type-schema.png.uuencode
+++ gconf-editor-2.24.1/debian/hicolor_status_16x16_type-schema.png.uuencode
@@ -0,0 +1,17 @@
+begin 644 debian/hicolor_status_16x16_type-schema.png
+MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A`````7-21T(`KLX<
+MZ0```B1)1$%4.,MUD\U+5%$8QG_GWHN.;2HI-<M%5FL+Q*VIT&("H8U8+5J$
+M64MEP@AM4:T5&TE'[1L_)HTHR%4@M8R@/R$0G1P_ITTP]YYSWA8S<V<FIV=W
+M[WG?WWF>]YRC`)++\]U*,2E6Z@5`!"$OD4`YSJHQ>O1Z[XW/5%)R:2ZUM[\K
+ME93ULY).;\K[C\M_YA9?W_^WUP'06I\X<O@H.[M;;&ZE2*776?^UQMK&3]+;
+M*3*_,W1?OE+34-<P_&;^Y;T#`"N"(&BC,=9@C<%:@[66(`C8WDGC.`[M[9TU
+MU561D1>O9MO+`&(M"!BC,5JCC<$8DX-90Q#XO/NPQ,K*)UI:SA]R7!4K=V`M
+M`-H$.1<FR,-RH+J&.IJ;3U/?>!R%0@?ZTLSS*0_`*T0`N!L;*AO0H\</\VN*
+M2'4UD4B$LV?.\>7KJBMB/4![A0B]UWI(3";"YN\_OC$R_(#_R.WJZJ3H(!\!
+M8'HV030:I?5"&ZV3;16[^^_T8\66`L)K0S0:+2LL5=^MF\Q,/Z.CXZ(16PJ0
+MHH-3C4UA!("QL=%P;6!@D.3"$D^GXDA^;N$,%A?>TGNUIVS')^/CH%3X'8_'
+M\[?;AJ[#"`J8B$\@"`J%*C0J10%1^&>M('(@@L)UW;`P5ZSR!HHNE,H-O2R"
+MYWH;>_N[)VMKCY665CR!3&8?SW/3V:R?#0&^[_<M)N<3ON\W%5]QX60$*;YM
+A/*]JW1A].S8X)`!_`5H[-#&+%)(-`````$E%3D2N0F""
+`
+end
only in patch2:
unchanged:
--- gconf-editor-2.24.1.orig/debian/hicolor_status_16x16_type-undefined.png.uuencode
+++ gconf-editor-2.24.1/debian/hicolor_status_16x16_type-undefined.png.uuencode
@@ -0,0 +1,16 @@
+begin 644 debian/hicolor_status_16x16_type-undefined.png
+MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A`````7-21T(`KLX<
+MZ0```>1)1$%4.,MUDTUK$U$4AI]S[]"T0E"+IE%Q8=5U_0<%%VZ$@CO!A2O!
+MM104T;_@5D7QDY:65D3!K@1_BE#2V+1-$S="9NX]Q\5,)A,3S^;R,N<^\[[G
+M<@1@<WM]183GIK9@`&8819EEXMR/&,.S.[?O?F=:;6ZMM8][79M6@W1@G<Z^
+M??ZZ_6=MX\/C?^\Z@!#"N5,G3W/4/6#_H$V[TZ+U:Y?=O9]T#MOT?_=9N7EK
+MKMEH/OFX_N[1!$#-,(P0`U$C&B.J$54ERS(.CSHXYUA>OCY7FYE]^O;]Z^4Q
+M@*F"08R!&`(A1F*,.4PC69;RZ<L6.SO?6%JZ=L)Y61UWH`I`B%GN(F8%+`<U
+MF@T6%R^Q</XL@A"R<./5FQ?)6(0<H,286U=5S*SX)LS6:M3K=:Y<OHJJ>5--
+M`)(R0O%\F&&22Q'PX@`I='ZJ*:;Y3Y-J!!%!G,,5C<,:JB'`5$O7!2`7WGN<
+M.!`09()0.E##3"N`0GB?8*)E(PA5,R-`/I_Q&0@DSJ/BBDN%APJAC&!:NBXC
+M"."<1S`$&;D0F9C!?R((WOO1,$4J$:HNID1(?+)WW.M>F)\_4VV=NGC]?H\D
+M\9W!(!V4@#1-[VULKK],T_3B:(N'"VW8:+=)DIE6C.'^ZH.'!O`7:#(PRD="
+.Q)T`````245.1*Y"8((`
+`
+end
only in patch2:
unchanged:
--- gconf-editor-2.24.1.orig/debian/hicolor_status_16x16_type-string.png.uuencode
+++ gconf-editor-2.24.1/debian/hicolor_status_16x16_type-string.png.uuencode
@@ -0,0 +1,18 @@
+begin 644 debian/hicolor_status_16x16_type-string.png
+MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A`````7-21T(`KLX<
+MZ0```CE)1$%4.,M]D\U+E5$0AY_SGA>[YB*54BM:9+5-":.ET**%HE0$"=J7
+M%05!BQ"*J%70HD6[LLC2#&]7-*(@5X'4'R#MBC:!Z.U>O]L$]WW/F6EQ/ZU+
+MLQN8>>;WFW/&`$Q.)WN-85A%FQ5`%:40JK$)@EGOW</^OG,?J1:34Q/IM?55
+MK1:Y**?9;$;?OI_^/9$:O_UW;P#@G-M9OZV!E=4E,DMITMD%%G[.,[_X@^QR
+MFHU?&_1VGZAM:6JY\RHY=NL?@*BB*,X[O'C$>T0\(D(<QRRO9`F"@,[.H[5;
+M:A)W1U^.=&X"J`@H>._PSN&\QWN?AXDGCB/>O)MB9N8#;6WM6P-KAC8K$`'`
+M^3BOPL<%6![4U-)$:^M>FG?MP&!PL3OV[,63$"`L6L@#!/$>4$Z=/@]`0T,]
+M%P<'Z#C43B*18/^^`WSZ/&M5)01<6+)0>#Y440-3J5%$A*_?OO-X^#E'#G=@
+MC"$_4%#)#PTK+1AC,$'`W-P7QL:39#)9I%AH;0F@(B75!4`^L=82F(!'PR-<
+MOW:%]K:#Q"ZFKW\0&X9E!:*H2@6@D%@;HD:(8T==71TBRNO4=$%!)4#02@4J
+M`@;"P"(FX-+@&>[=?X`JG#S>4X*7+*B4K14E&2`(+`:EIZN+WNYN"HOAPMF!
+MTH[^8\%@K2TOTQC`D.\QI:]K3!4+H0T7U]97=S<V;J\LK7IX&QOKA*'-YG)1
+MK@2(HNAR:C+Y-(JB/>4K+AZTHN7;)@QK%KQW5X=NW%2`/_3H50;'JJCB````
+)`$E%3D2N0F""
+`
+end
only in patch2:
unchanged:
--- gconf-editor-2.24.1.orig/debian/hicolor_status_16x16_type-integer.png.uuencode
+++ gconf-editor-2.24.1/debian/hicolor_status_16x16_type-integer.png.uuencode
@@ -0,0 +1,17 @@
+begin 644 debian/hicolor_status_16x16_type-integer.png
+MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A`````7-21T(`KLX<
+MZ0```@5)1$%4.,MUD\UJ%$$4A;];5203-VK09%1<&'4=WR#@PH6!B!)_0"0K
+MP;4$%-%7<*M1B5%)R#`1B>!L%(*^B!"2,9/?<2-,=U5=%]WIGC'QKKJZ[_WJ
+MG--<`:@M+4R(\$*C#BN`*DI>JJD8LQ*"?W[WSM0W#JM:?;ZYN[>CAU4GZ6BK
+MM:&?/B_]F5]\_^3?60/@O3]U[.AQMG<VV=ALTFRML?9KE=7UG[2VFK1_MYD8
+MOSY0':H^_;`P]_@`(*JB*#YX0@S$$(@Q$&,D35.VMEL88Q@;NSS0WU=Y]O;=
+MF[$>@,8("B%X@O?X$`@A9+`82-.$C\MU&HTOC(Y>.F*L3/<JB!$`']),14B9
+M>37+C<E[A!`8J@XQ,G*.X=,G$02?^BNO9U\Z`+=O(0-$8@A,WIXJ/&;?A$I_
+M/Y5*A0OG+_+]QXI5C0[PI87\]Z%*O397`*PQ..NPUN&LRZ&1&+-+7;<%$4&,
+MP8B4`.O8/TG^7F,L5.<`S9LM1@R4\]FMT@N(45&-78#\8*U#)1:-`,ZYXKD$
+M1#174&8@X(S%6L?XM5O%T-6)F]@\`YMGH!H+VX4%`8RQ",K7QG*I0N1`!O^Q
+M(%AKRS!%`"&;D2X;O19<'M3Z[M[.F<'!$]VMARY>N[V'<[;5Z22=`I`DR?W%
+MVL),DB1GRRW>7VA%R]W&N;ZU$/R#Z8>/%.`OVH\J0TO;QW$`````245.1*Y"
+"8((`
+`
+end
only in patch2:
unchanged:
--- gconf-editor-2.24.1.orig/debian/hicolor_status_16x16_type-boolean.png.uuencode
+++ gconf-editor-2.24.1/debian/hicolor_status_16x16_type-boolean.png.uuencode
@@ -0,0 +1,19 @@
+begin 644 debian/hicolor_status_16x16_type-boolean.png
+MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A`````7-21T(`KLX<
+MZ0```F9)1$%4.,MUDTE(56$4QW_??=<I`@="S7!31E)0DI`T2BY:)`A!B\)%
+MM;!:EXW4)FH5M0TQ:%23%!N$-E*4&+:H38.EF6#Z]#F'$;Q[[W=.B_M\#MF!
+M;_>=W__\SV``FEL:JXSAEHKF*8`J2B)4?>,XKZP-;E8?.M+!<M'\N"$Z-3VI
+MRT7<BVLL-JIMSUK^-#RZ?W%IK@,0!,'JK,QL)B;'&!V+$HT-,30RR.#P`+'Q
+M*#._9JBJ/)"1GYM_Z4'CW?/_`$0510EL@!6+6(N(143P?9_QB1B.XU!>7I&1
+MEII^^<Z]V^6JZ@"X`"H""M8&6&M#H`JB@HK@^QZM3Q^3&DECRY:2%=WONFJ!
+M+D!<`!$!(+`^U@JJ@JHB$H)R\W/)S,["]WT,AL`/]MV^4[?$@BJ!E;`"D20T
+MGC)%_;>C/(S6\&GV!47KUB.B$950W)FS8(P!U44CG/7'>?#Y-`7YA>PLW<NG
+MV>>$@H*(+J@@H3:E/VCMO\+/WQ])24FAJ?\LI27;6%6806=/&]OSJID3%`US
+M$CT(:>V]-R@KW<7;GGJ>](VSLVP/WV??,/+1<J:L`\=QF/NOBP")IN5F%/%Z
+MH(&-Z[>Q<>U6^N(OB7U5+NQHQQ@3VDQ4K*HL&J-Q#`>++]/T)<[GP4XRLU?2
+M^V&,J[N[<=T(0!*@__9`,8`Q#H<W76.S'&/R0P'7*]Z3GI:&&W&3[[\6P!")
+MA$K[-QRGLO@$8`A%37)UC5G&@AMQAZ>F)]?DY*Q:^'79PYN9F<9U([%XW(LG
+M`9[GU3QJ;JSS/*]P_HKGMD'1^=O&=5.'K`U.UIXZIP!_`4HD?,S_&M,P````
+)`$E%3D2N0F""
+`
+end
only in patch2:
unchanged:
--- gconf-editor-2.24.1.orig/debian/hicolor_status_16x16_type-float.png.uuencode
+++ gconf-editor-2.24.1/debian/hicolor_status_16x16_type-float.png.uuencode
@@ -0,0 +1,17 @@
+begin 644 debian/hicolor_status_16x16_type-float.png
+MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A`````7-21T(`KLX<
+MZ0```@5)1$%4.,MUD\UJ%$$4A;];5203-VK09%1<&'4=WR#@PH6!B!)_0"0K
+MP;4$%-%7<*M1B5%)R#`1B>!L%(*^B!"2,9/?<2-,=U5=%]WIGC'QKKJZ[_WJ
+MG--<`:@M+4R(\$*C#BN`*DI>JJD8LQ*"?W[WSM0W#JM:?;ZYN[>CAU4GZ6BK
+MM:&?/B_]F5]\_^3?60/@O3]U[.AQMG<VV=ALTFRML?9KE=7UG[2VFK1_MYD8
+MOSY0':H^_;`P]_@`(*JB*#YX0@S$$(@Q$&,D35.VMEL88Q@;NSS0WU=Y]O;=
+MF[$>@,8("B%X@O?X$`@A9+`82-.$C\MU&HTOC(Y>.F*L3/<JB!$`']),14B9
+M>37+C<E[A!`8J@XQ,G*.X=,G$02?^BNO9U\Z`+=O(0-$8@A,WIXJ/&;?A$I_
+M/Y5*A0OG+_+]QXI5C0[PI87\]Z%*O397`*PQ..NPUN&LRZ&1&+-+7;<%$4&,
+MP8B4`.O8/TG^7F,L5.<`S9LM1@R4\]FMT@N(45&-78#\8*U#)1:-`,ZYXKD$
+M1#174&8@X(S%6L?XM5O%T-6)F]@\`YMGH!H+VX4%`8RQ",K7QG*I0N1`!O^Q
+M(%AKRS!%`"&;D2X;O19<'M3Z[M[.F<'!$]VMARY>N[V'<[;5Z22=`I`DR?W%
+MVL),DB1GRRW>7VA%R]W&N;ZU$/R#Z8>/%.`OVH\J0TO;QW$`````245.1*Y"
+"8((`
+`
+end
only in patch2:
unchanged:
--- gconf-editor-2.24.1.orig/debian/hicolor_status_16x16_type-list.png.uuencode
+++ gconf-editor-2.24.1/debian/hicolor_status_16x16_type-list.png.uuencode
@@ -0,0 +1,17 @@
+begin 644 debian/hicolor_status_16x16_type-list.png
+MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A`````7-21T(`KLX<
+MZ0```AI)1$%4.,M]D\U+5%$8QG_GGHNCA946942K:FVK7`IM)`Q!*AN0D#XF
+M7(=01/T+;2.PQ@P'QQD+PT5!]$$%]5<(II/CY[0)YMY[WK?%W#L?-?1N#@?>
+M]W>>YSF\!B!?S(T8PV,5/:8`JBAQJ8;&\SXX%ST:3T^\HUWE"W.EW;T=;5?5
+MH*KE\H:^>EW\/3<_>__O60\@BJ+CAP[VL+VSR<9FB5)YC;6?JZRNKU#>*E'Y
+M56%D>+2K[VC?@Q>YF7O_`$0518E<Q-#P*!<N7D+$(2*$8<C6=AG/\Q@</-^5
+MZNA\F'T^/9@`?``5`07GHCK9.<="?@&`@8%S+"X5Z+`I^OO/[OOV_>L4\`G`
+M`,S,3NNU\>O\**W@G*`JJ"HBBJK@Q%&M!H1A2,^!PWS^\C$0U?V9&Y-1W0)`
+MY`3G:M)%8H@J8.A,I>CN[N;TJ3.(J%41O]5"_'V7KTX`4)C/8@Q8XR5",:9V
+MB@HJVLA`8D#2`&"M3[%0;/FRL;$K)`\FJF.`QD.6I<4<&#`8TNET;3+FUA7$
+MV30`\<5:'S72I,30)*H)4,NG-0,#OF<9&JG)?+/\LO9P$R$!J$I===V"`3S/
+MUIM]Z_,L^[0E@ULW,_^S8+#6\O[M,L88C#'<SDS&`II5M+'@6W]]=V_G1&_O
+MD>;6MHM7J>SA^[9<K0;5.B`(@LQ\/O<D"(*3C2U.%EK1QF[C^QUKSD634W?N
+7*L`?,,D[*C27CR<`````245.1*Y"8((`
+`
+end