[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.2-2-11-g21b906d

Pino Toscano pino-guest at alioth.debian.org
Sat Mar 27 12:19:14 UTC 2010 

The following commit has been merged in the master branch:
commit 21b906da7b709edd2af3ae9cc3bab98b846171b9
Author: Pino Toscano <pino at kde.org>
Date:   Sat Mar 27 13:15:39 2010 +0100

    Make more use of the dpkg source 3.0 format: directly ship the binary files
    
    ... (eg PNG icons and qch) instead of uuencode them at install time.
---
 debian/changelog                |    5 +-
 debian/collection/qtdemo.qhc    |  Bin 0 -> 10240 bytes
 debian/collection/qtdemo.qhc.uu |  231 ---------------------------------------
 debian/desktop/assistant.png    |  Bin 0 -> 2034 bytes
 debian/desktop/assistant.png.uu |   49 --------
 debian/desktop/designer.png     |  Bin 0 -> 1443 bytes
 debian/desktop/designer.png.uu  |   36 ------
 debian/desktop/linguist.png     |  Bin 0 -> 1382 bytes
 debian/desktop/linguist.png.uu  |   34 ------
 debian/desktop/qtconfig.png     |  Bin 0 -> 1422 bytes
 debian/desktop/qtconfig.png.uu  |   35 ------
 debian/rules                    |   24 ++---
 debian/source/include-binaries  |    5 +
 13 files changed, 19 insertions(+), 400 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 781d319..c760075 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
 qt4-x11 (4:4.6.2-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Make more use of the dpkg source 3.0 format: directly ship the binary files
+    (PNG icons and qch) instead of uuencode them at install time.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 27 Mar 2010 13:06:16 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 27 Mar 2010 13:11:34 +0100
 
 qt4-x11 (4:4.6.2-2) experimental; urgency=low
 
diff --git a/debian/collection/qtdemo.qhc b/debian/collection/qtdemo.qhc
new file mode 100644
index 0000000..5e48dd4
Binary files /dev/null and b/debian/collection/qtdemo.qhc differ
diff --git a/debian/collection/qtdemo.qhc.uu b/debian/collection/qtdemo.qhc.uu
deleted file mode 100644
index 4e4898e..0000000
--- a/debian/collection/qtdemo.qhc.uu
+++ /dev/null
@@ -1,231 +0,0 @@
-begin 644 qtdemo.qhc
-M4U%,:71E(&9O<FUA="`S``0``0$`0"`@````%@````````````````````8`
-M```!```````````````"````````````````````````````````````````
-M``````````````4````!`_L`````"`/[````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M```````````````````````````````````````````&`PT````"`MT``X$"
-MW0``````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M``"!(0(%`'6!76,`;P!M`"X`=`!R`&\`;`!L`'0`90!C`&@`+@!D`&4`<P!I
-M`&<`;@!E`'(`+@`T`#0`,``N`"X`+P`N`"X`+P`N`"X`+P`N`"X`+P!S`&@`
-M80!R`&4`+P!Q`'0`-``O`&0`;P!C`"\`:`!T`&T`;``M`&0`90!S`&D`9P!N
-M`&4`<@`O`&0`90!S`&D`9P!N`&4`<@`N`'$`8P!H`'T!!0!=@2UC`&\`;0`N
-M`'0`<@!O`&P`;`!T`&4`8P!H`"X`<0!T`"X`-``T`#``+@`N`"\`+@`N`"\`
-M+@`N`"\`+@`N`"\`<P!H`&$`<@!E`"\`<0!T`#0`+P!D`&\`8P`O`&@`=`!M
-M`&P`+0!Q`'0`+P!Q`'0`+@!Q`&,`:``-`````@/B``/Q`^(`````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````#0($``$=`G$`9`!O`&,`#0$$
-M``$=`7$`9`!O`&,`#0````4#KP`#]P/H`],#Q`.O````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M`````````````!,%`P`M9`!E`',`:0!G`&X`90!R``T$`P`A=`!O`&\`;`!S
-M`!,#`P`M<0!T`'(`90!F`&0`;P!C``T"`P`A-``N`#0`+@`P``<!`P`5<0!T
-M``T````"`\(``^L#P@``````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````)P(#`%51`'0`(`!$`&4`<P!I`&<`;@!E`'(`
-M(`!-`&$`;@!U`&$`;``3`0,`+5$`=``@`#0`+@`T`"X`,``-`````P$_``$_
-M`BH##P``````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````@6@!!R%%
-M10&"270`80!B`&P`90!.`&$`;0!E`',`<`!A`&,`90!4`&$`8@!L`&4`3@!A
-M`&T`90!S`'``80!C`&4`5`!A`&(`;`!E``)#`%(`10!!`%0`10`@`%0`00!"
-M`$P`10`@`$X`80!M`&4`<P!P`&$`8P!E`%0`80!B`&P`90`@`"@`20!D`"``
-M20!.`%0`10!'`$4`4@`@`%``4@!)`$T`00!2`%D`(`!+`$4`60`L`"``3@!A
-M`&T`90`@`%0`10!8`%0`+``@`$8`:0!L`&4`4`!A`'0`:``@`%0`10!8`%0`
-M(``I`(%B`@<A.3D!@E5T`&$`8@!L`&4`1@!O`&P`9`!E`'(`5`!A`&(`;`!E
-M`$8`;P!L`&0`90!R`%0`80!B`&P`90`#0P!2`$4`00!4`$4`(`!4`$$`0@!,
-M`$4`(`!&`&\`;`!D`&4`<@!4`&$`8@!L`&4`(``H`$D`9``@`$D`3@!4`$4`
-M1P!%`%(`(`!0`%(`20!-`$$`4@!9`"``2P!%`%D`+``@`$X`80!M`&4`<P!P
-M`&$`8P!E`$D`9``@`$D`3@!4`$4`1P!%`%(`+``@`$X`80!M`&4`(`!4`$4`
-M6`!4`"``*0"!;@,'(5U=`8(E=`!A`&(`;`!E`$8`:0!L`'0`90!R`$$`=`!T
-M`'(`:0!B`'4`=`!E`%0`80!B`&P`90!&`&D`;`!T`&4`<@!!`'0`=`!R`&D`
-M8@!U`'0`90!4`&$`8@!L`&4`!$,`4@!%`$$`5`!%`"``5`!!`$(`3`!%`"``
-M1@!I`&P`=`!E`'(`00!T`'0`<@!I`&(`=0!T`&4`5`!A`&(`;`!E`"``*`!)
-M`&0`(`!)`$X`5`!%`$<`10!2`"``4`!2`$D`30!!`%(`60`@`$L`10!9`"P`
-M(`!.`&$`;0!E`"``5`!%`%@`5``@`"D`#0````4#W0`#^0/R`^L#Y`/=````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M```````````````````````````````%!0,!`0(%!00#`0$"!`4#`P$!`@$%
-M`@,!`0$"!0$#`0$!`0T"7@`$`2L``F(#-0$K`?``````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````@4(&
-M!R%!00&"!70`80!B`&P`90!3`&4`=`!T`&D`;@!G`',`5`!A`&(`;`!E`%,`
-M90!T`'0`:0!N`&<`<P!4`&$`8@!L`&4`"4,`4@!%`$$`5`!%`"``5`!!`$(`
-M3`!%`"``4P!E`'0`=`!I`&X`9P!S`%0`80!B`&P`90`@`"@`2P!E`'D`(`!4
-M`$4`6`!4`"``4`!2`$D`30!!`%(`60`@`$L`10!9`"P`(`!6`&$`;`!U`&4`
-M(`!"`$P`3P!"`"``*0!L!P<A at 0U!`0!I`&X`9`!E`'@`<P!Q`&P`:0!T`&4`
-M7P!A`'4`=`!O`&D`;@!D`&4`>`!?`%,`90!T`'0`:0!N`&<`<P!4`&$`8@!L
-M`&4`7P`Q`%,`90!T`'0`:0!N`&<`<P!4`&$`8@!L`&4`"@````2!4`0'(4E)
-M`8(1=`!A`&(`;`!E`$8`:0!L`'0`90!R`$X`80!M`&4`5`!A`&(`;`!E`$8`
-M:0!L`'0`90!R`$X`80!M`&4`5`!A`&(`;`!E``5#`%(`10!!`%0`10`@`%0`
-M00!"`$P`10`@`$8`:0!L`'0`90!R`$X`80!M`&4`5`!A`&(`;`!E`"``*`!)
-M`&0`(`!)`$X`5`!%`$<`10!2`"``4`!2`$D`30!!`%(`60`@`$L`10!9`"P`
-M(`!.`&$`;0!E`"``5`!%`%@`5``@`"D`@4@%!R$Y.0&"(70`80!B`&P`90!&
-M`&D`;`!T`&4`<@!4`&$`8@!L`&4`1@!I`&P`=`!E`'(`5`!A`&(`;`!E``=#
-M`%(`10!!`%0`10`@`%0`00!"`$P`10`@`$8`:0!L`'0`90!R`%0`80!B`&P`
-M90`@`"@`3@!A`&T`90!)`&0`(`!)`$X`5`!%`$<`10!2`"P`(`!&`&D`;`!T
-M`&4`<@!!`'0`=`!R`&D`8@!U`'0`90!)`&0`(`!)`$X`5`!%`$<`10!2`"``
-M*0`-``````0`````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````"@`````$````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-9````````````````````````````````````
-`
-end
diff --git a/debian/desktop/assistant.png b/debian/desktop/assistant.png
new file mode 100644
index 0000000..ea4d1e7
Binary files /dev/null and b/debian/desktop/assistant.png differ
diff --git a/debian/desktop/assistant.png.uu b/debian/desktop/assistant.png.uu
deleted file mode 100644
index 124f306..0000000
--- a/debian/desktop/assistant.png.uu
+++ /dev/null
@@ -1,49 +0,0 @@
-begin 644 assistant.png
-MB5!.1PT*&@H````-24A$4@```"`````@"`8```!S>GKT````!&=!34$``-;8
-MU$]8,@```!ET15AT4V]F='=A<F4`061O8F4 at 26UA9V5296%D>7')93P```>$
-M241!5'C:Q%=K;!37%?YF]KW>A?5C=XT-?O"(,4M`H8E!X(*!*%`:@1N5A#Z2
-M"J55BMP\&JE1'Q%5FXK0JA51TOQHE:H%DI`T*42JK*9I0Y*6NFN'D`"."7B-
-M\6*OL8W7[_6^YD[/O;,[ZUW6P>F?C'UFYYZ9N=]WSCWWG#.2JJKX/`^C<6<E
-M&%.?DE3UR8T-+M36%D!1=%(!+K(DMS+&_"K4@"1)@?1-TM.[#*0'Z9%/?U,"
-M)#]6$\J36[<7HZ;&CF0RZZ6E7)C*MH/FER!E$2-I)?'/&']V#RA)Y2>228;/
-M5X!X?,[+,1=B;2172#IFGT85'K![O69R&0TI'FX,"55SI?:O04G23-";$;OA
-M08$#;8F,8F+U1G!M29GX4YA"!)44`0,,DD&LL[;N4HIDZCWDQ=2-802BL"22
-M+$[7BO!`UI&>4Y(8+E^91'>`8>>:7?ARW1;,GV?"V8%3.-GU*DP&"XR2D8B(
-M:05!J&2S()>/A"J,5`@XJDSCY=V7]"#,`N=>D&45;[XU at .1H!8*'3V5-LZ9L
-M*QJ7?Q<_^L<NLB*&B4F&XV]<0__1,_C3F5_ at XX%6 at C9"DO*`JPG$"?P/.R]E
-M=LP,>.U,FIY@!-T=2A;X:RU_P2]?^YVX+K1Y\=CZ9Y%48^2E<?A*ZU!D+8?/
-MLXXL3.CKFPN>8--X^+;3B"G)K&V8XWX5_M8PFAH?U/571MOQ1O\3./;*$,8B
-M8SCPK2>PO(1`[5Y<#9W#WKI-XKFX$B60."T!Q8EL2H5'!GS?RC8DR`.,F71H
-M.3OH^*^*\,5Q?+_QVSH!?^_?8#98L?;V$KQX\D2&?=]=>'SK03RR:Z\8;ZZ^
-M#[_:UHRJ0A_A,B%I\)_7?XPX_3(UD96 at LH.02%P;B!%K!4O**W7UY7`[,36B
-MT&6#_Y,/=?W==VR&P6"$UU4LQ at ZS2TB!Q:DM`UG/P9M6G]8L)W`M:-5\,:`=
-MT2B#LZPZAY<LSI45UJSH+BVUH/X;=^#?[:UB_.OFGV'#3WVXU'^>(!2*D2CV
-MUOHI6*>%)[A'M/FD63R02A++RA?/*1W>XKY-F&`T:-/4+BO'N2A9+4]B5>EZ
-ME-NV$'CT':/*&E3-UE%:ZE:#++U$UUR8G"]9?*;Z*,V\E%+>H at RG+$=?OX]J
-M2Z+!:C8CH<IP.1RNL:GXMJ.G.HZ\>R$8R.L!S)9D/Y6#E**>O:,<%C.N3T4P
-M'HNBN,`*M\N!I0O<<-HL^*`[5+UR8<F)/)E00F??Y3D!]TZVSY)U95C,$RBP
-M?8"OK=GS'5Z8HC%E1TN@]VF'W0:/RPG?0C=.=?8UWK`$5JN,B5!W;@87YP&^
-M0V;8*4DR\J5^7B=:>E]'<]=^/GR!Y!R]=7!!H>-$>&)*>(Q[)Y9(YNP">JK4
-M:Z$)#0CT]>CJ5:7UO"1A.II$05E5UO;DJ3.S:"PEH()EI."TX+Y7J]`].(W0
-MZ`2B\>0&61)EDI*60O7$D"&0KH0J%93"&B>.OG-<!UKI62_R_ND/A_$EVOOI
-MHWVP19!->Z+45HNWWQW$>-BL=4D\).D>!R4YTM$W[.'NCY/E_>$)^,I*WI.S
-MMZ!&8%U=$0X=?T'75[E\J)+OQDC(CN>;#@@=3S#^X)NP5,U#(!04NB\LJD?O
-M<]?Q4,.CHCKR<GOLJQ1/$CO\=D?/_37E;F%UW_`H[%83:LJ*'I"S_,_/Y,'*
-M"CL<[E'L>?H1_>Y3C8>0;.Z!9WZA&/_F/TU4CBUHV.C!@[]]&$?_^5>A[QP^
-M at X_Z_Z7'#LWZS;^?ZWK`M\A#T6]%U[5AZCD5?.7V6^KHD:"$[>6J=X$%NW>[
-MD4BH>E!)DH*3[PVBF*W&#W<_BIWK[A2W0A.7\>Q_'T-HO`L6HY52,36 at Q#I)
-M55!1F.9VV2C6-D&9<-^M_N[>\%#UBD5N7!T:P?!D!%_?L&(;W7XK;RH6R\#;
-M,\I16S9Y,6]Q)_8<;-+O.RG7#TSVZ-V0R at A2-0AO\()E(N&-BB2"$[@:'J^.
-M)I,8')_`)_W7L<E7^4P:/"^!#!&:G+)7=94#TR/7\/[%\QH!2Q'^>,]9W.K=
-M("Q7]50DBS+, at XYG(57K`X).FUFTZ$-CDR(!E;L*CN6VY9_6M)+(V+RK#'6/
-M[T#S_I>P8^U&/=7-FC/)C1R4 at O"Y[:N\OP>\!X+#$^Z*8N?+D5BB36%L1@^9
-M$P.Y7;'8MM0C1*)Q](8B<!4XL7I)#:Z,=(BF0]8;TTPEX3L at KD8.';GGP@\^
-MZAF.O_[^!=EF,L!I->.A+:N?5YCZO73%,=XLW6J$)%@I<RVI,HF2&AR[*,!3
-M<3#"OYBH4VZFH`_0L at 0H(%OC+,I?W/_GU at MRW6(OBAQV=`V$<?;J4!,G@!D$
-MXB3FN9"@JS99EOTR,_*/#NJ766MN*><M=XR:CU?N%>G\B]QR#EY6XJ(=,(5$
-MDN>'3,TU2DQ=1H;TY!3D-M+YJ5IW45CY(XBT62C*<9,ZR?<][_>/W=N95KWH
-MG6^_LVLPC!&JBL'KXUBYT!.D;]$,`2(=K*XP>V5F6!I3IUK,L/S?7[K<`SS[
-MS3 at .WU^_8NWYWJ%]R23#JD6>2+5G_EU9,?9Y?Y[_3X`!`$9H at 75@F=\\````
-)`$E%3D2N0F""
-`
-end
diff --git a/debian/desktop/designer.png b/debian/desktop/designer.png
new file mode 100644
index 0000000..6c12047
Binary files /dev/null and b/debian/desktop/designer.png differ
diff --git a/debian/desktop/designer.png.uu b/debian/desktop/designer.png.uu
deleted file mode 100644
index 91747ad..0000000
--- a/debian/desktop/designer.png.uu
+++ /dev/null
@@ -1,36 +0,0 @@
-begin 644 designer.png
-MB5!.1PT*&@H````-24A$4@```"`````@"`8```!S>GKT````"7!(67,```[$
-M```.Q`&5*PX;```%54E$0518A;V7:VP4513'?W?VO7391VDII0JQY6642GE)
-M"A10HQ9!>5F((3$JD42-;X5(B'[4Q)AHHL0'BL:8^$9"B*""B@@*B/8IK]*J
-MM;#MMMUMN]/9V3E^J&RI%+JEQ?^W<^ZY\__-G;EG[BC.J at 0WOE%C;YB;&;RJ
-MP.U,:C3&C(/'/[J3))=1"H"%HY^VV]3&DI*`-S_?FQH4$0.H`:D1H0I-*FW8
-MJB0O>>SU:8<20P.P<-023=D^G3(E at ZE3AZ<U241,!<<%JI222D35*+NJ=-HB
-M-:^4'N\:$(!:./ISI=3M2Y=F$0HY+NDNS@%+*CAE0:6&5%E8'[^YY/"AB\VQ
-M(^)'*1P.-2AS`*64#<C7(!_48 at U-!RX*H/5W4=,4.CN$88X0-F4?-.1_=<$K
-M&H9%]6^*!Q8\Q;)9"_&Z/9A6 at M\:]_))Y2LT=?X%0")AH26]^(>[:3=:!PS0
-MYPJ("+N_B?+RZM=9/7\Y7K<'W=!1HE&4.Y]U<]\BTS,*@-I:G2N2M_/BK5^2
-M-WS<T`#4U>G<-&DQ,\9?!T!#K):'/BNEZ+%YG&X)XW,%67'M(P`T-AH47SU]
-MP,87!3AQ(LY=\Y>FXJ^.OX_F[L`WLH5-.]X#H#!G+J=J7)1-OYOK)Q0!4)!9
-MR)7^"8,':`Y;S/SW[@'JVXX",'*D at Y^/'NF>J#1"7,.S*]>3X1D&P*K)3[)V
-MQO.#`S!-(>C-QN/RI')1O0D`K]=&0^1T*C]_YM4\^-HSJ7A;^1:^*-\R.`!=
-MMPAE!'KE#*N[N=GMBM:.:"H_)B>+?=4'4_&1IEWL;_QL<``BPG!O1I_%3F?O
-M<I?=VV?=H```8O&./HM-4WK%2<L<D)F(C#:CT9UBFO>=S9W7B-QNC5B\O5?.
-MKCF[#9."V^%*Y3L34=*5B(SN"C?MB1XX7.#('G&CF*9=V>V;S at -P.#3^;FW`
-MLBPTK7N!?,X at L:X(NFX1S/"G:EOU</KF7<:>YO:. at KBN(\=J5:=AO"JF:?3Y
-M"'Q^H>J/HZDXQS<&@%C,)#]W;"K_1]NQM,R3QG=[8FT?%;0G39IS,FDUN at B?
-MJ%/QMNBB/@'R\ESL.+@[%1?FS`&@OE[GYBDE`'08;=2U56"8/>>2+.=XO/K$
-M5)SKNRHO:7RW)]&^O"`CO at 8K\CDMNLZ93#]C;IA3[@D%U_0),&&"ES=VO4MG
-M5QR`&7DW,RO[+I85KF%ER1T`?'/R0]!,FN-_$HEU?X36%F_DI;+N/A!P9W%_
-MT8K[$NW+"U2L!5LXSMC(>H+Z#TR;-:,\D)>[0"G5I%1I[FZE:?/*RK+Q^7I>
-MB;HZG1'&;#8__!).A[,78,7I'WGUP!,DQ:2Y.8'7&,?J>64X7!:_AP]RLJ6"
-M1V?>0\!:BXJUH(5-K":%Q`,X9GU<;LM9L$`IU01P00"`2"1!/#R2>XH?8FEQ
-M*0`[CK[#UNI-"+VWY%D%W%EIFT,_!Y)0R$'HRC`;WNOI[_FAR8P)3!H2\WX!
-M`#P>&Z;[;[;__#4`XT<4L;[D[2$QAXN<B,Y5<;&?%W:NXXQ^+T7YDS&LWIWR
-M4LW3!G`Z-29>`_LC;[,_TGM,4S8>G/HX`:MLP.9I`YPK$6D7J.[^'Z!RQ;6/
-MY;N:76O;S5+\\2T#,@>PB\@&1+8#_G,'+)%.#6H$*D!56B0KQ&%5;K[MEWKH
-MV0(O1V_\Z4S-7F`)*BX,BV]+VQQZ?LT*5Y5E/SK,9Z_6D"I+TRK>//Q3'<]A
-M];,:LT_^^OWW=J/[N;C]V01'!`\Y0A-O2<=\T*JOK]^Z:N4J.56Q3_18\[<B
-MLDA$^MU90R(1<9RLK8W^U=#P at 8A,^U],+X?^`54Z=M]S`7B.`````$E%3D2N
-#0F""
-`
-end
diff --git a/debian/desktop/linguist.png b/debian/desktop/linguist.png
new file mode 100644
index 0000000..d388cbd
Binary files /dev/null and b/debian/desktop/linguist.png differ
diff --git a/debian/desktop/linguist.png.uu b/debian/desktop/linguist.png.uu
deleted file mode 100644
index eedb682..0000000
--- a/debian/desktop/linguist.png.uu
+++ /dev/null
@@ -1,34 +0,0 @@
-begin 644 linguist.png
-MB5!.1PT*&@H````-24A$4@```"`````@"`8```!S>GKT````!&=!34$``-;8
-MU$]8,@```!ET15AT4V]F='=A<F4`061O8F4 at 26UA9V5296%D>7')93P```3X
-M241!5'C:Q%=K3%ME&'[.Z0$'=*.L18)R*<Q!N<@("PK,#!A9IF$3FAB"<\H6
-MI at DN7D"#B3^6 at 8G1.:<DZC*S119O4W^P+:(S$2PZK<+H2A"&;$"!#1R7T99R
-ML9R>X_D.],BE0(%&WK3I=[[S]GN>[WV?][M0/,]C/8UR$J"T$0J&91,/%X8X
-MWYE.Y>I-JQQ7(7Q?OGZ[K>!J1[V:IBD('VCNBS.'J<(O*#<J*X3W1A$7N6H%
-MQ;)5*J57QN[=FR&7R^:,Q(/7$3(R2M8-#CHWB"4:NAJJ/KORH?H?;A"J`!I^
-M?C0F)GE81SD,CK#(BMF/@HQG#@F^E12=??\GH*B#^?E!"\"7LD6(F7^Y_G/7
-MI>;CBH at P!CX^%!@&H&F`XP"6!28%(ET]+%3>.U&:4ZJEZ+TAO%+I!:TV<,WY
-MW*=Y%KJK5Q"EL<#/5P at OY8*XD/%1&]#29D=1Q at D333J]O6G/",J^"0YJ"(S,
-M-;CH(_3[^@"!FV5H[&I0TYY4M-Q'CK$)#O:II2M+)B.3I at 0R0HH6<QH>GD);
-M,Y#WT--(CT_!ML at X\4_ZGFI\^]<9C$^-+O@/2UGA1:E at L9`44"*02_T(_`;O
-M.O!X6K+)901L-@>JJX?Q^0N?XNB3Q4A_,!4*OTWP]=J(K"WY*-GQD=@F1OS2
-MY*_B=,X?J.D\CZ<>>0XW3%,8OLO#;I\&FP]NM?*0TS&(#=54N"1@,(RBZ-%#
-MXJR)]5K:D?3:=NQZ/4]\#O6/$HDX(T4(BNWQ?M3VG49^RDOHZO3'C0X6??T<
-MQL9XL0H((;.91W,K at X,[CY#*>=\E@?;V<;R8<UAZ)B%/3F-@,-7CXN\_B'VI
-MH=EBBE*C'X;ZWNG%*TJ5-!V5GG>0GYF']"U'$.;S!#I,K$!""/L0AS_;&!1E
-ME1DC at M1:XKN`0'^_70RW<U"1T)!!_`T/WX"FKE:QK?0-QO:@QU#[YM>2WRL[
-M3B$OOEC41^6U<E1UEF5&!R?H&!F%V_T.M+8+X+N.&1/"XS(%=[-+`C8;*X7>
-M:4[!D7(U=K9(_7WF/E1<.BNV+6-65-:=PO=-%^=.:.16XHB%PZ0U"B</G+F0
-M$!XO@;LD,#KJ6+*$S`*0TV)#8J24^`M1TYLKT6J[++W/UA1F=/S=K=@35V0^
-M?N!$<8`\0#L;G)C+,LR8$9536*NUB("X at KV:U#(BMOG`BT9`W`;O]$IMDNO5
-MV@?Z$K+A'%L,?'$"`[?<`G"U&*W4%A`@&]-2-KLZR/K@<0)D2ZYKUL\E-9,&
-MNYV#.BC4(_I8,@*DW)SJGKW`='=/8EM$K`0^G\"$=8.X,JZ)`+'X>#^<J_E&
-M>B:+2\-O+"(#-<A)V2/VZ7NK$1Q\SYRR+$Q\"Z59)SU#H+;E1XD$V7@,;S?"
-M4'%9RGU-QWF!@#<&)FZB_,OW1.$F:^(Q,'ES96<(<B(B,\G.5B[8$?5Z"S(>
-MV(>C^TLD\1G[ZW#NVAMN50#-TYG",4VWX@@XQ4 at .J8UWOD/Y%_^%M7W8X)'R
-M6Y:`T[9N]14%Z<PUT0/9=-PQ!QSF-1, at 51$9S8MG@?GEN=RI^>/<>N-R?HP[
-M at R4ED=//"-[]]7E\U1$@'#S'E at 6?XJ>T[HS-K"1?1/4.S`$G,S31%-W$<9Q1
-M`#:Y,^LY!/CI01*7\2,W(>-:@!8GP#"97M[43S,D3&1PX;93)]QV3#.W'=W_
-@<CE=]]OQ>MF_`@P`H6P.V)9`3VL`````245.1*Y"8((`
-`
-end
diff --git a/debian/desktop/qtconfig.png b/debian/desktop/qtconfig.png
new file mode 100644
index 0000000..2dc6716
Binary files /dev/null and b/debian/desktop/qtconfig.png differ
diff --git a/debian/desktop/qtconfig.png.uu b/debian/desktop/qtconfig.png.uu
deleted file mode 100644
index 8878a6b..0000000
--- a/debian/desktop/qtconfig.png.uu
+++ /dev/null
@@ -1,35 +0,0 @@
-begin 644 qtconfig.png
-MB5!.1PT*&@H````-24A$4@```"`````@"`8```!S>GKT````!'-"250("`@(
-M?`ADB`````EP2%ES````?P```'\!N+;,B0```!ET15AT4V]F='=A<F4`=W=W
-M+FEN:W-C87!E+F]R9YON/!H```4+241!5%B%K9=I;%15%,=_;V8Z^TRG"X4"
-M;2T%+1`@1F at 1&S81:;#!A("):T!0C!&"2XQ$A:)&C'X0XR=%(QJ,F"@:8F)E
-M4VA91%)J%S'*6B at MG7:ZS/)F>??Z`7DS+=!.ISV?WOW?Y?S.O??=>ZXBI231
-M7.4%#P-K\HNL)9-G.#+M3J-12JD%_<(7#HGF<%@T1"/R:"PJJJHK&\\S3%,2
-M`5SE!1N`#PLF6KEOD6?0SFI(B(!?ZU:#HCFBBJ9(1!Z+1>4OU94-9X8,X"HO
-MR`(N`H[E3^5 at L1F&&HQN856(@%_K58/B2E at 53=&(/!&-R@/56QIJ!P)8#%0Y
-M7$:6/38J9><#630B9:!7\U]M#B\_O+EA'T!BF+D`-GOJD0]F:69%\6297`8#
-M!3>T1&]*4J-(B*@"6YIS1*!,R3;L]L7HN&3GF<7/,J]X$3F>,5SM/<^IEH-4
-M7_P!7^A:2@!)S;>W-<K%>C.[-^YAQ>S'R?&,`2#75<A#=SW-*V6?X+'&]\WI
-MW_WD!!?RWH,_490Y8_@`IX[V\O[:;62ZLJ\#!5MX^>LUO/#I<P!DV7/9,.<C
-M#,KUX=I;(BR=N12/-1NKR3X\@(YK45PV)V7%\W1M5]TV>ASU[*\]P+O?O07`
-M6-<$)H\J0=,@%)#,GE263&R#`YS]*\3*^ROZ:"T]9U&`_`DV?CU]1->G93W`
-MQ5H7]9\=T[6*XK6LOJ>2T<[\U`!ZNF+,*(ROHY""GG`G`#:'`6]7EUYW=UXI
-M4BIDN^+[H3!C*J7CEY!NS4X-(!04%.9,U,O=JA<A!0!VNP%?MU^O<ULS,7LZ
-M6;7]25W;7;>=[34;N=I[ZVMCT-]0#6D4C9FDE[O4=OW;YC32TZO&HU&,..T.
-MNKMZ=*TM>)XF;WQ)^MN`,Q#3)(JB8#?'=W*WZHW3FQ2$$`3"\5E(MV4,%E/R
-M`$:C at M#Z7M?6-$>\($$*L"4`QK3HR`$H at -&DX`MTZ)HG83.%PP*+Q:3__P"]
-M:O?(`0"8+08N=UQ.`,C1OT-!@=MEU<M":GV68T0`[$X#_[3$\PNKR8[%9+L.
-M$-#PN%UZ77O@"A)YTQC#`AB;;^7[FA_[:#?._5!(D.6)9TYGVD^"HD!"EF4V
-M6H8'D%=HH>9TWT1FRJA2)-#\KTIYR2)=;VH_@<MMY%);JZY-'SV?L899Y+F+
-M4P-PNHU8'!I?'-JA:\LFK^,.PP(>6;""]4M?`N!LYY_4M1XA,SN-*ZU>?2_,
-M*2AG<\7'Y'DFWG+\I/*!>Q>FL_7+#RB95,J4\=.PI3G95+%-K^]2V]E9^S92
-M"E"@9+Z;]3M7\>C<)\AP.SGC_8/ZMIK4`<P6`W.7N'AQUQJFY,SBC9659#BR
-M`*AK/<SGI[:@Q@)Z^S'CS,`EOOW[G4''3CH!M%@-%!3#\7.'>&WGJW'=9._C
-M/!D3DK8A`]RP_"(K!TX>U\O%V3-Y??Y7%&9,3:I_*""TPV\V[$T9(#W#1/8X
-MP?H=S^M:7OJ=M[UN^YNO(]KGT9)T4IIHTV>Y\`5.L.Z;)91.+"/-9.2"KW'0
-M?FTMD6:?-]HGNTD)`,#N,"+Q<?S*WEO62PE!OQ8-^C6O&A+GU)#8=W!3?67_
-M=HD`0SM#^SL*:!UJ2)R/J/)T-")^B\5D5<W6QJ[!^B<"[`%6`W-OUSCHUV(!
-M__^.PK(N&A&'8U'Y<\W6QLY4X.'FU[$M-\^R?_9\=TG`+WQJ4+L0CCNJJMG:
-;F-KK8P#[#Y:$%BML<Q+D`````$E%3D2N0F""
-`
-end
diff --git a/debian/rules b/debian/rules
index 8a9574a..24359b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -217,31 +217,27 @@ override_dh_auto_install:
 	$(CURDIR)/bin/lrelease-qt4 debian/translations/qt_ca.ts \
 		-qm $(CURDIR)/debian/libqtcore4/usr/share/qt4/translations/qt_ca.qm
 
-	mkdir -p debian/qt4-demos/usr/lib/qt4/demos/qtdemo
-	uudecode -o debian/qt4-demos/usr/lib/qt4/demos/qtdemo/qtdemo.qhc \
-		debian/collection/qtdemo.qhc.uu
+	install -D -p -m0644 debian/collection/qtdemo.qhc \
+		debian/qt4-demos/usr/lib/qt4/demos/qtdemo/qtdemo.qhc
 
 	install -D -p -m0644 debian/desktop/designer-qt4.desktop \
 		debian/qt4-designer/usr/share/applications/designer-qt4.desktop
-	mkdir -p debian/qt4-designer/usr/share/pixmaps
-	uudecode -o debian/qt4-designer/usr/share/pixmaps/designer.png \
-		debian/desktop/designer.png.uu
+	install -D -p -m0644 debian/desktop/designer.png \
+		debian/qt4-designer/usr/share/pixmaps/designer.png
 
 	install -D -p -m0644 debian/desktop/assistant-qt4.desktop \
 		debian/qt4-dev-tools/usr/share/applications/assistant-qt4.desktop
 	install -D -p -m0644 debian/desktop/linguist-qt4.desktop \
 		debian/qt4-dev-tools/usr/share/applications/linguist-qt4.desktop
-	mkdir -p debian/qt4-dev-tools/usr/share/pixmaps
-	uudecode -o debian/qt4-dev-tools/usr/share/pixmaps/assistant.png \
-		debian/desktop/assistant.png.uu
-	uudecode -o debian/qt4-dev-tools/usr/share/pixmaps/linguist.png \
-		debian/desktop/linguist.png.uu
+	install -D -p -m0644 debian/desktop/assistant.png \
+		debian/qt4-dev-tools/usr/share/pixmaps/assistant.png
+	install -D -p -m0644 debian/desktop/linguist.png \
+		debian/qt4-dev-tools/usr/share/pixmaps/linguist.png
 
 	install -D -p -m0644 debian/desktop/qt4config.desktop \
 		debian/qt4-qtconfig/usr/share/applications/qt4config.desktop
-	mkdir -p debian/qt4-qtconfig/usr/share/pixmaps
-	uudecode -o debian/qt4-qtconfig/usr/share/pixmaps/qtconfig.png \
-		debian/desktop/qtconfig.png.uu
+	install -D -p -m0644 debian/desktop/qtconfig.png \
+		debian/qt4-qtconfig/usr/share/pixmaps/qtconfig.png
 
 	# Remove phonon development files
 	rm -f debian/tmp/usr/lib/libphonon.la
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..656f8f2
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1,5 @@
+debian/collection/qtdemo.qhc
+debian/desktop/assistant.png
+debian/desktop/designer.png
+debian/desktop/linguist.png
+debian/desktop/qtconfig.png

-- 
Qt 4 Debian packaging

More information about the pkg-kde-commits mailing list