Author: ccheney
Date: 2004-03-21 19:59:19 -0700 (Sun, 21 Mar 2004)
New Revision: 69
Modified:
trunk/packages/kdeaccessibility/debian/changelog
trunk/packages/kdeaccessibility/debian/control
trunk/packages/kdeaccessibility/debian/kmag.menu
trunk/packages/kdeaccessibility/debian/kmousetool.menu
trunk/packages/kdeaccessibility/debian/kmouth.install
trunk/packages/kdeaccessibility/debian/kmouth.menu
trunk/packages/kdeaccessibility/debian/patches/01_kdeaccessibility_branch.diff.uu
trunk/packages/kdeaccessibility/debian/patches/02_autotools_update.diff
trunk/packages/kdeaccessibility/debian/patches/05_pedantic-errors.diff
Log:
kdeaccessibility 3.2.1-1 update
Modified: trunk/packages/kdeaccessibility/debian/changelog
===================================================================
--- trunk/packages/kdeaccessibility/debian/changelog 2004-03-22 01:16:28 UTC
(rev 68)
+++ trunk/packages/kdeaccessibility/debian/changelog 2004-03-22 02:59:19 UTC
(rev 69)
@@ -1,3 +1,10 @@
+kdeaccessibility (3.2.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Added Build-Depends: groff-base. (Closes: #235015)
+
+ -- Christopher L Cheney <[EMAIL PROTECTED]> Fri, 5 Mar 2004 17:00:00 -0600
+
kdeaccessibility (3.2.0-0pre1v1) unstable; urgency=low
* New upstream release.
Modified: trunk/packages/kdeaccessibility/debian/control
===================================================================
--- trunk/packages/kdeaccessibility/debian/control 2004-03-22 01:16:28 UTC
(rev 68)
+++ trunk/packages/kdeaccessibility/debian/control 2004-03-22 02:59:19 UTC
(rev 69)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Christopher L Cheney <[EMAIL PROTECTED]>
-Build-Depends: automake1.7, debhelper (>> 4.0.18), gawk, kdelibs4-dev,
sharutils
+Build-Depends: automake1.8, debhelper (>> 4.2.0), gawk, groff-base,
kdelibs4-dev (>> 4:3.2.1), sharutils
Standards-Version: 3.6.1.0
Package: kdeaccessibility
Modified: trunk/packages/kdeaccessibility/debian/kmag.menu
===================================================================
--- trunk/packages/kdeaccessibility/debian/kmag.menu 2004-03-22 01:16:28 UTC
(rev 68)
+++ trunk/packages/kdeaccessibility/debian/kmag.menu 2004-03-22 02:59:19 UTC
(rev 69)
@@ -1,6 +1,6 @@
?package(kmag):\
- needs=x11\
- section=Apps/Tools\
+ needs="x11"\
+ section="Apps/Tools"\
hints="KDE"\
kderemove="y"\
title="KMag"\
Modified: trunk/packages/kdeaccessibility/debian/kmousetool.menu
===================================================================
--- trunk/packages/kdeaccessibility/debian/kmousetool.menu 2004-03-22
01:16:28 UTC (rev 68)
+++ trunk/packages/kdeaccessibility/debian/kmousetool.menu 2004-03-22
02:59:19 UTC (rev 69)
@@ -1,6 +1,6 @@
?package(kmousetool):\
- needs=x11\
- section=Apps/Tools\
+ needs="x11"\
+ section="Apps/Tools"\
hints="KDE"\
kderemove="y"\
title="KMousetool"\
Modified: trunk/packages/kdeaccessibility/debian/kmouth.install
===================================================================
--- trunk/packages/kdeaccessibility/debian/kmouth.install 2004-03-22
01:16:28 UTC (rev 68)
+++ trunk/packages/kdeaccessibility/debian/kmouth.install 2004-03-22
02:59:19 UTC (rev 69)
@@ -1,3 +1,4 @@
+debian/tmp/etc/kde3/kmouthrc
debian/tmp/usr/bin/kmouth
debian/tmp/usr/share/applnk/Applications/kmouth.desktop
debian/tmp/usr/share/apps/kmouth/books/de/de-courteousness.phrasebook
@@ -57,7 +58,6 @@
debian/tmp/usr/share/apps/kmouth/icons/hicolor/48x48/actions/speak.png
debian/tmp/usr/share/apps/kmouth/kmouthui.rc
debian/tmp/usr/share/apps/kmouth/phrasebookdialogui.rc
-debian/tmp/usr/share/config/kmouthrc
debian/tmp/usr/share/doc/kde/HTML/en/kmouth/common
debian/tmp/usr/share/doc/kde/HTML/en/kmouth/index.cache.bz2
debian/tmp/usr/share/doc/kde/HTML/en/kmouth/index.docbook
Modified: trunk/packages/kdeaccessibility/debian/kmouth.menu
===================================================================
--- trunk/packages/kdeaccessibility/debian/kmouth.menu 2004-03-22 01:16:28 UTC
(rev 68)
+++ trunk/packages/kdeaccessibility/debian/kmouth.menu 2004-03-22 02:59:19 UTC
(rev 69)
@@ -1,6 +1,6 @@
?package(kmouth):\
- needs=x11\
- section=Apps/Tools\
+ needs="x11"\
+ section="Apps/Tools"\
hints="KDE"\
kderemove="y"\
title="KMouth"\
Modified:
trunk/packages/kdeaccessibility/debian/patches/01_kdeaccessibility_branch.diff.uu
===================================================================
---
trunk/packages/kdeaccessibility/debian/patches/01_kdeaccessibility_branch.diff.uu
2004-03-22 01:16:28 UTC (rev 68)
+++
trunk/packages/kdeaccessibility/debian/patches/01_kdeaccessibility_branch.diff.uu
2004-03-22 02:59:19 UTC (rev 69)
@@ -1,191 +1,141 @@
begin 644 01_kdeaccessibility_branch.diff
-M9&EF9B`M3G)U82!K9&5A8V-E<W-I8FEL:71Y+3,N,BXP+V%D;6EN+V-V<RYS
-M:"!K9&5A8V-E<W-I8FEL:71Y+6)R86YC:"]A9&UI;B]C=G,N<[EMAIL PROTECTED](&MD
-M96%C8V5S<VEB:6QI='DM,RXR+C`O861M:6XO8W9S+G-H"3(P,#0M,#$M,3<@
-M,#,Z,#DZ,3(N,#`P,#`P,#`P("TP-C`P"BLK*R!K9&5A8V-E<W-I8FEL:71Y
-M+6)R86YC:"]A9&UI;B]C=G,N<V@),C`P-"TP,BTQ,B`P-CHR-CHS-2XP,#`P
-M,#`P,[EMAIL PROTECTED],[EMAIL PROTECTED],V,"PV("LS-C`L,[EMAIL
PROTECTED](&9I.R!D;VYE"B!T
-M97-T("UF(&-O;F9I9W5R92YI;BYM:60@)[EMAIL PROTECTED];R!C;VYF:6=U<F4N:6XN
-M;6ED(#X^(&-O;F9I9W5R92YF:6QE<[EMAIL PROTECTED]&5S="`M9B!C;VYF:6=U<F4N:6XN
-M8F]T("8F(&5C:&[EMAIL PROTECTED])E+FEN+F)O="`^/B!C;VYF:6=U<F4N9FEL
-M97,**VEF('1E<W0@(2`M<R!C;VYF:6=U<F4N9FEL97,[('1H96X**R`@(&5C
-M:&\@(E1H97)E(&%R92!N;R!F:6QE<R!T;R!B=6EL9"!A(&-O;F9I9W5R92X@
-M4&QE87-E(&-H96-K('EO=7(@8VAE8VMO=70N(@HK("[EMAIL PROTECTED]"`Q"BMF:0H@
-M?0H@"B!C<F5A=&5?<W5B9&ER<[EMAIL PROTECTED]"D!`("TU-S<L,[EMAIL
PROTECTED],2PQ,B!`0`H@
-M("!T97-T("UF('!O+R1I('Q\(&5C:&\@(F1I<V%P<&5A<F5D.B`D:2(*(&1O
-M;F4*(&9O<B!I(&EN(&!L<R`M,2!P;R\J+G!O="`R/B]D978O;G5L;"!\('-E
-M9"`M92`B<R-P;R\C(R)@.R!D;PHK("`@<V5D("UE("=S+%XB0V]N=&5N="U4
-M>7!E.B!T97AT+W!L86EN.R!C:&%R<V5T/4-(05)3151<7&XB)"PB0V]N=&5N
-M="U4>7!E.B!T97AT+W!L86EN.R!C:&%R<V5T/5541BTX7%QN(BPG('!O+R1I
-M(#X@<&\O)&DN;F5W("8F(&UV('!O+R1I+FYE=R!P;R\D:0H@("`@;7-G;65R
[EMAIL PROTECTED]@+6\@<&\O)&D@<&\O)&D@<&\O)&D*("`@(&5G<F5P("UV("=>(RA;
-M7CI=?"0I)R!P;R\D:2!\(&5G<F5P("=>+BI;7B!=*RXJ)"<@?"!G<F5P("UV
-M(")<(E!/5"U#<F5A=&EO;B(@/B!T96UP+G!O=`H@("!I9B!T97-T("UF('!O
-M+F)A8VMU<"\D:2`F)B!T97-T("UN(")@9&EF9B!T96UP+G!O="!P;RYB86-K
-M=7`O)&E@([EMAIL PROTECTED]&AE;@H@"65C:&\@(G=I;&[EMAIL
PROTECTED]("1I(@HK("`@("`@
-M("[EMAIL PROTECTED]@)W,L7B)#;VYT96YT+51Y<&4Z('1E>'0O<&QA:6X[(&-H87)S
-M970]0TA!4E-%5%Q<;B(D+")#;VYT96YT+51Y<&4Z('1E>'0O<&QA:6X[(&-H
-M87)S970]551&+3A<7&XB+"<@<&\N8F%C:W5P+R1B86-K=7!?)&D@/B!P;R\D
-M:2YN97<@)B8@;78@<&\O)&DN;F5W('!O+F)A8VMU<"]B86-K=7!?)&D*(`EM
-M<V=M97)G92`M<2!P;RYB86-K=7`O8F%C:W5P7R1I('!O+R1I([EMAIL PROTECTED]&5M<"YP
-M;W0*(`EM=B!T96UP+G!O="!P;R\D:0H@("!E;'-E"D!`("TU.3<L,3(@*S8P
-M,RPQ,B!`0`H@<[EMAIL PROTECTED])F('!O+F)A8VMU<[EMAIL
PROTECTED]@"BUU;G-E="!,0U]!3$P*
-M+75N<V5T($Q!3D<*+75N<V5T($Q#7T-465!%"BUU;G-E="!,04Y'54%'10HK
[EMAIL PROTECTED],('Q\(#H**W5N<V5T($Q!3D<@?'[EMAIL PROTECTED]@[EMAIL PROTECTED]
[EMAIL PROTECTED]'[EMAIL PROTECTED]@[EMAIL PROTECTED]@?'[EMAIL
PROTECTED]@H@"BUU;G-E="!#1%!!
[EMAIL PROTECTED]<V5T($-$4$%42"!\?"`Z"B!A9&UI;F1I<[EMAIL PROTECTED];R`B)#`B('P@
-M<V5D("=S)5M<7"]=6UY<7"]=6UY<7"]=*B0E)2=@"B!T97-T(")X)&%D;6EN
-M9&ER(B`](")X)#`B("8F(&%D;6EN9&ER/2X*(`ID:69F("U.<G5A(&MD96%C
-M8V5S<VEB:6QI='DM,RXR+C`O861M:6XO;'1M86EN+G-H(&MD96%C8V5S<VEB
-M:6QI='DM8G)A;F-H+V%D;6EN+VQT;6%I;BYS:`HM+2T@:V1E86-C97-S:6)I
-M;&ET>2TS+C(N,"]A9&UI;B]L=&UA:6XN<V@),C`P,RTP.2TR-"`P,SHT-#HP
-M,2XP,#`P,#`P,[EMAIL PROTECTED],#`**RLK(&MD96%C8V5S<VEB:6QI='DM8G)A;F-H
-M+V%D;6EN+VQT;6%I;BYS:`DR,#`T+3`R+3$S(#(Q.C0P.C`T+C`P,#`P,#`P
-M,"`M,#8P,`I`0"`M-38R,RPW("LU-C(S+#<@0$`*(`D@("`@("!T;7!D:7(]
-M(B]T;7`B"B`)("`@("[EMAIL PROTECTED]&5S="`M;B`B)%1-4$1)4B(@)[EMAIL
PROTECTED]&UP9&ER/2(D
-M5$U01$E2(@H@"2`@("`@('1M<&1I<CTB)'1M<&1I<B]L:6)T;V]L+20D(@HM
-M"2`@("`@(&EF("1M:V1I<B`M<"`B)'1M<&1I<B(@)[EMAIL PROTECTED];[EMAIL
PROTECTED]("(D
-M=&UP9&ER([EMAIL PROTECTED]&AE;B`Z"BL)("`@("`@:68@)&UK9&ER("(D=&UP9&ER(B`F
-M)B!C:&UO9"`W,#`@(B1T;7!D:7(B.R!T:&5N(#H*(`D@("`@("!E;'-E"B`)
-M"21E8VAO("(D;6]D96YA;64Z(&5R<F]R.B!C86YN;[EMAIL PROTECTED])E871E('1E;7!O
-M<F%R>2!D:7)E8W1O<[EMAIL PROTECTED]&`D=&UP9&ER)R(@,3XF,@H@"0EC;VYT:6YU90ID
-M:69F("U.<G5A(&MD96%C8V5S<VEB:6QI='DM,RXR+C`O:VUA9R]K;6%G+F1E
-M<VMT;W`@:V1E86-C97-S:6)I;&ET>2UB<[EMAIL PROTECTED]:VUA9R]K;6%G+F1E<VMT
-M;W`*+2TM(&MD96%C8V5S<VEB:6QI='DM,RXR+C`O:VUA9R]K;6%G+F1E<VMT
-M;W`),C`P-"TP,2TQ-2`P,3HS,SHU.2XP,#`P,#`P,[EMAIL PROTECTED],#`**RLK(&MD
-M96%C8V5S<VEB:6QI='DM8G)A;F-H+VMM86<O:VUA9RYD97-K=&]P"3(P,#0M
-M,#(M,#(@,#0Z,#DZ,3$N,#`P,#`P,#`P("TP-C`P"D!`("[EMAIL PROTECTED]
[EMAIL PROTECTED]:4EC;VX]:VUA9RYP;F<*($1O8U!A=&@]:VUA9R]I;F1E>"YH=&UL
-M"B!#;VUM96YT/0HK0V]M;65N=%MP;%T]4')O9W)A;2!D;R!O9VS$A61A;FEA
-M('!O=VG$F6MS>F]N>6-H(&9R86=M96YTP[-W(&5K<[EMAIL PROTECTED];65N=%MX
-M>%T]>'AX>[EMAIL PROTECTED]&5R;6EN86P],[EMAIL
PROTECTED]($UA9VYI9FEE<@I`0"`M,38L
-M-R`K,3<[EMAIL PROTECTED]:5T]4W5U<F5N;G5S;&%S:[EMAIL PROTECTED]:5T]
-MX*25X*6'(."DKN"EB."DE^"EC>"DJ."[EMAIL PROTECTED]"DJ^"DON"DK^"[EMAIL PROTECTED]
-M=5T]2TUA9PHK3F%M95MI<UT]2R!S=,.F:VMU;F%R9VQE<@[EMAIL PROTECTED]
-M2TUA9VYI9FEE<@HK3F%M95MP;%T]2TUA9VYI9FEE<B`H3'5P82D*($YA;65;
-M<'1=/4QU<&$*($YA;65;<'1?0E)=/[EMAIL PROTECTED]'[EMAIL PROTECTED]&`
-MT+#0O="]T+#1CR#0N]&#T+_0L`I`0"`M-#(L.2`K-#4L,3(@0$`*($=E;F5R
-M:6-.86UE6V9R73U,;W5P92!D)\.I8W)A;@[EMAIL PROTECTED])I8TYA;65;:&E=/>"D
-MN."EC>"DE>"EC>"DL."[EMAIL PROTECTED]"DJ"[EMAIL PROTECTED])[EMAIL
PROTECTED]@X*2&X*25X*2^X*2P(."DK."D
-MHN"DO."DON"DJ."[EMAIL PROTECTED]@[EMAIL
PROTECTED]@I+X*($=E;F5R:6-.86UE6VAU73U.
-M86=YPZUTP[,**T=E;F5R:6-.86UE6VES73U3:VK#H7-TPZ9K:W5N87)G;&5R
-M"B!'96YE<FEC3F%M95MI=%T]3&5N=&[EMAIL PROTECTED]&D@:6YG<F%N9&EM96YT;R!P97(@
-M;&\@<V-H97)M;PHK1V5N97)I8TYA;65;:F%=/>>4N^F=HN:+H>6DI^F/H0H@
-M1V5N97)I8TYA;65;;FQ=/5-C:&5R;79E<F=R;W1E<@[EMAIL PROTECTED])I8TYA;65;
-M;FY=/5-K:F5R;69O<G-TP[AR<F%R"BM'96YE<FEC3F%M95MP;%T]4&]W:<29
-M:W-Z86YI92!F<F%G;65N=,.S=R!E:W)A;G4*($=E;F5R:6-.86UE6W!T73U,
-M=7!A"B!'96YE<FEC3F%M95MP=%]"4ET]06UP;&EF:6-A9&]R(&1E(%1E;&QA
-M"B!'96YE<FEC3F%M95MR=5T]T*W0NM&`T+#0O="]T+#1CR#0N]&#T+_0L`ID
-M:69F("U.<G5A(&MD96%C8V5S<VEB:6QI='DM,RXR+C`O:VUO=7-E=&]O;"]K
-M;6]U<V5T;V]L+VMM;W5S971O;VPN9&5S:W1O<"!K9&5A8V-E<W-I8FEL:71Y
-M+6)R86YC:"]K;6]U<V5T;V]L+VMM;W5S971O;VPO:VUO=7-E=&]O;"YD97-K
-M=&]P"BTM+2!K9&5A8V-E<W-I8FEL:71Y+3,N,BXP+VMM;W5S971O;VPO:VUO
-M=7-E=&]O;"]K;6]U<V5T;V]L+F1E<VMT;W`),C`P-"TP,2TQ-2`P,3HS-#HP
-M,2XP,#`P,#`P,[EMAIL PROTECTED],#`**RLK(&MD96%C8V5S<VEB:6QI='DM8G)A;F-H
-M+VMM;W5S971O;VPO:VUO=7-E=&]O;"]K;6]U<V5T;V]L+F1E<VMT;W`),C`P
-M-"TP,BTP,B`P-#HP.3HQ,RXP,#`P,#`P,[EMAIL PROTECTED],[EMAIL PROTECTED]([EMAIL
PROTECTED](P
-M+#$R($!`"B!#;VUM96YT6VAE73W7G->5UY?7I2#7HM><(->4UZ+7F]>1UZ@@
-MUZ+7D=>[EMAIL PROTECTED]>;[EMAIL PROTECTED]><(->[EMAIL PROTECTED]>G(->4UYG7
[EMAIL PROTECTED];65N=%MH:5T]X*2&X*2JX*25X*6'(."DLN"DO^"[EMAIL PROTECTED]@I+[@
-MI([EMAIL PROTECTED]@@X*25X*6-X*2RX*2_X*25(."DE>"DL."DI."[EMAIL
PROTECTED]@[EMAIL PROTECTED](."D
-MK."DON"DL"[EMAIL PROTECTED]@[EMAIL
PROTECTED]@X*25X*6-X*2RX*2_X*25(."DE>"[EMAIL PROTECTED])7@
[EMAIL PROTECTED]@I*,@X*2*X*2"X*27X*2RX*2_X*2OX*6+X*2"(."DKN"EA^"[EMAIL
PROTECTED]@
[EMAIL PROTECTED]@[EMAIL PROTECTED]<@X*2UX*2^X*2RX*6`(."DE>"EC>"DM^"DI."[EMAIL
PROTECTED])7@
[EMAIL PROTECTED](."DE>"DL."DI."[EMAIL PROTECTED]@[EMAIL
PROTECTED]($-O;6UE;G1;:'5=/4%U
-M=&]M871I:W5S(&5GPZER:V%T=&EN=,.A<R`H4E-)+7-Z:6YD<L.S;<.A8F%N
-M('-Z96YV963%D6MN96LI"BM#;VUM96YT6VES73U3;65L;&ER(&W#NG-A<FAN
-MP[9P<'[EMAIL PROTECTED]:7(@P[YI9R!O9R!D<F5G=7(@P[IR(,.A:')I9G5M(%)3
[EMAIL PROTECTED];[EMAIL PROTECTED]@;6]U<[EMAIL PROTECTED]@<&]S=&[EMAIL
PROTECTED]'5O
-M"BM#;VUM96YT6VIA73U24TGC@:[EMAIL PROTECTED]([EMAIL PROTECTED]@HOC@:OC
-M@:[EMAIL PROTECTED]@J;[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]/[EMAIL PROTECTED]($-O;6UE;G1;;FQ=/4ML:6MT
-M(&1E(&UU:7-K;F]P('9O;W(@[EMAIL PROTECTED];6EN9&5R="!D92!E9F9E8W1E;B!V
[EMAIL PROTECTED])"B!#;VUM96YT6VYN73U+;&EK:V%R(&UE9"!M=7-A(&9O<B!D96<L
-M(&9O<B##I2!H:6YD<[EMAIL PROTECTED];FEN9W-S:V%D87(**T-O;6UE;G1;<&Q=
-M/4ML:6MA('IA($-I96)I92!M>7-ZQ(4L(&]G<F%N:6-Z86K$A6,@;F%D=WER
-MQ)G%O&%N:64@;6G$F<6;;FD*($-O;6UE;G1;<'1=/4-A<G)E9V$@;F\@<F%T
-M;R!P;W(@<VDL(&%L:79I86YD;R!D;W)E<R!M;W1I=F%D87,@<&]R(%)320H@
-M0V]M;65N=%MP=%]"4ET]($-L:6-A(&\@;6]U<V4@<&%R82!V;V/[EMAIL PROTECTED]
-M:6QI=&%N9&[EMAIL PROTECTED]:69I8W5L9&%D92!D;R!24TD*($-O;6UE;G1;<G5=/="C
-MT8+0N-"[EMAIL PROTECTED]"P(-&[EMAIL
PROTECTED]"PT++0N]"UT+W0N-&/(-"\T8O1B-&,T8X@
-MT+30N]&/(-"^T+'0N]"UT+/1A]"UT+W0N-&/(-"QT+[0N]"UT++1B]&%(-&!
-MT+C0O="TT8#0OM"[EMAIL PROTECTED]"`M-C,L.2`K-C8L,3(@0$`*($=E;F5R:6-.
-M86UE6VAE73W7G->7UYG7IM>J(->BUYO7D=>H(->0UY77F->5UY[7D->8UYG7
[EMAIL PROTECTED]@1V5N97)I8TYA;65;:&E=/>"DN."EC>"DM>"DFN"DON"DLN"DO^"DI"#@
[EMAIL PROTECTED]@I([EMAIL
PROTECTED]@@X*25X*6-X*2RX*2_X*25"B!'96YE<FEC3F%M95MH=5T]
-M075T;VUA=&EK=7,@:V%T=&EN=,.A<PHK1V5N97)I8TYA;65;:7-=/5-JPZ%L
-M9G9I<FMU<B!MP[IS86AN87!P87-M96QL:7(*($=E;F5R:6-.86UE6VET73U#
-M;&EC(&%U=&[EMAIL PROTECTED]&5L(&UO=7-E"BM'96YE<FEC3F%M95MJ85T]Z(>J
-MY8N5XX.>XX*FXX*YXX*OXX.JXX.#XX*O"B!'96YE<FEC3F%M95MN;%T]075T
-M;VUA=&ES8VAE(&UU:7-K;&EK"B!'96YE<FEC3F%M95MN;ET]075T;VUA=&ES
-M:R!M=7-E:VQI:VL**T=E;F5R:6-.86UE6W!L73U!=71O;6%T>6-Z;F4@:VQI
-M:V%N:64@;7ES>L2%"B!'96YE<FEC3F%M95MP=%T]0V%R<F5G87(@;[EMAIL PROTECTED]
-M;[EMAIL PROTECTED])I8TYA;65;<'1?0E)=/4-L:7%U92!!=71O;<.A=&EC;R!D;R!-
-M;[EMAIL PROTECTED])I8TYA;65;<G5=/="[EMAIL PROTECTED]"^T8G0M="[T8?0OM"Z(-"\
-MT8O1B-&,T8X*9&EF9B`M3G)U82!K9&5A8V-E<W-I8FEL:71Y+3,N,BXP+VMM
+M9&EF9B`M3G)U82!K9&5A8V-E<W-I8FEL:71Y+3,N,BXQ+VMM86<O:VUA9RYD
+M97-K=&]P(&MD96%C8V5S<VEB:6QI='DM8G)A;F-H+VMM86<O:VUA9RYD97-K
+M=&]P"BTM+2!K9&5A8V-E<W-I8FEL:71Y+3,N,BXQ+VMM86<O:VUA9RYD97-K
+M=&]P"3(P,#0M,#(M,#(@,#0Z,#DZ,3$N,#`P,#`P,#`P("TP-C`P"BLK*R!K
+M9&5A8V-E<W-I8FEL:71Y+6)R86YC:"]K;6%G+VMM86<N9&5S:W1O<`DR,#`T
+M+3`S+3`S(#`W.C4P.C4U+C`P,#`P,#`P,"`M,#8P,`I`0"`M-#,L-B`K-#,L
[EMAIL PROTECTED])I8TYA;65;971=/45K<F%A;FD@<W5U<F5N9&[EMAIL PROTECTED]
+M97)I8TYA;65;9FE=/5-U=7)E;FYU<VQA<VD*($=E;F5R:6-.86UE6V9R73U,
+M;W5P92!D)\.I8W)A;@HK1V5N97)I8TYA;65;9V%=/49O<FUHPZEA9&%I=&AE
+M;VER(%-CPZ%I;&7#H6EN"B!'96YE<FEC3F%M95MH:5T]X*2XX*6-X*25X*6-
+MX*2PX*6`X*2H(."DE>"[EMAIL PROTECTED](;@I)[EMAIL PROTECTED]@[EMAIL PROTECTED]
+MX*6'(."DM>"DON"DLN"[EMAIL PROTECTED]@1V5N97)I8TYA;65;:'5=/4YA9WG#K73#LPH@
+M1V5N97)I8TYA;65;:7-=/5-K:L.A<W3#IFMK=6YA<F=L97([EMAIL PROTECTED]@
+M*S4X+#<@0$`*($=E;F5R:6-.86UE6W-K73U,=7!A(&]B<F%Z;W9K>[EMAIL PROTECTED]
+M97)I8TYA;65;<VQ=/5!O=F7$C65V86QN:6L@>F%S;&[EMAIL PROTECTED])I8TYA
+M;65;<W)=/="CT++0M="[T+C1A]"PT++0L-&'(-"[EMAIL PROTECTED]"PT+W0L`HK1V5N
+M97)I8TYA;65;<W)`3&%T;ET]579E;&G$C6%V8<2-(&5K<[EMAIL PROTECTED])I
+M8TYA;65;<W9=/4;#MG)S=&]R:6YG<V=L87,*($=E;F5R:6-.86UE6W1A73W@
[EMAIL PROTECTED]@[EMAIL
PROTECTED]@@X*ZJX*^&X*ZPX*Z_X*ZDX*Z^X*Z5X*^-X*Z5X*Z_"B!'
+M96YE<FEC3F%M95MT<ET]0L.\><.\=&7#IPID:69F("U.<G5A(&MD96%C8V5S
+M<VEB:6QI='DM,RXR+C$O:VUO=7-E=&]O;"]K;6]U<V5T;V]L+VMM;W5S971O
+M;VPN9&5S:W1O<"!K9&5A8V-E<W-I8FEL:71Y+6)R86YC:"]K;6]U<V5T;V]L
+M+VMM;W5S971O;VPO:VUO=7-E=&]O;"YD97-K=&]P"BTM+2!K9&5A8V-E<W-I
+M8FEL:71Y+3,N,BXQ+VMM;W5S971O;VPO:VUO=7-E=&]O;"]K;6]U<V5T;V]L
+M+F1E<VMT;W`),C`P-"TP,BTP,B`P-#HP.3HQ,RXP,#`P,#`P,[EMAIL PROTECTED],#`*
+M*RLK(&MD96%C8V5S<VEB:6QI='DM8G)A;F-H+VMM;W5S971O;VPO:VUO=7-E
+M=&]O;"]K;6]U<V5T;V]L+F1E<VMT;W`),C`P-"TP,RTP,R`P-SHU,#HU-RXP
+M,#`P,#`P,[EMAIL PROTECTED],[EMAIL PROTECTED]@*S$W+#<@0$`*($-O;6UE;G1;971=
+M/4MLP[5P<V%B(&AI:7)T('-I;[EMAIL PROTECTED]"[EMAIL
PROTECTED]:&5N9&%D97,@=L.U:6UA
+M;&EK92!L:6AA<V5V86QU9&4@;[EMAIL PROTECTED];65N=%MF:5T]3F%P<V%U='1A
+M82!H:6ER=,.D('!U;VQE<W1A<VD@<F%N;F5V86UM;VIE;B!E:&O#I&ES96UI
+M<V5K<VD*($-O;6UE;G1;9G)=/4-L:7%U92!S=7(@;&$@<V]U<FES(,.@('9O
+M=')E('!L86-E+"!L:6UI=&%N="!L97,@9&]U;&5U<G,@;&G#J65S(&%U>"!4
+M35,**T-O;6UE;G1;9V%=/4=L:6]GPZ%L86YN('-E;R!A;B!L=6-H(&1U:70L
+M(&[EMAIL PROTECTED]&EO;F-H87(@9V]R=,.Z(&%T:'-T<F%I9&AN9<.A;&[EMAIL PROTECTED]
+M9,.Z"B!#;VUM96YT6VAE73W7G->5UY?7I2#7HM><(->4UZ+7F]>1UZ@@UZ+7
+MD=>[EMAIL PROTECTED]>;[EMAIL PROTECTED]><(->[EMAIL PROTECTED]>G(->4UYG7DPH@
+M0V]M;65N=%MH:5T]X*2&X*2JX*25X*6'(."DLN"DO^"[EMAIL PROTECTED]@[EMAIL
PROTECTED](G@
+MI+@@X*25X*6-X*2RX*2_X*25(."DE>"DL."DI."[EMAIL PROTECTED]@[EMAIL
PROTECTED](."DK."D
+MON"DL"[EMAIL PROTECTED]@[EMAIL PROTECTED]@X*25X*6-X*2RX*2_X*25(."DE>"[EMAIL
PROTECTED])[EMAIL PROTECTED]@
[EMAIL PROTECTED],@X*2*X*2"X*27X*2RX*2_X*2OX*6+X*2"(."DKN"EA^"[EMAIL
PROTECTED]@I+G@
[EMAIL PROTECTED]@I8<@X*2UX*2^X*2RX*6`(."DE>"EC>"DM^"DI."[EMAIL
PROTECTED])[EMAIL PROTECTED]@
+MX*25X*2N(."DE>"DL."DI."[EMAIL PROTECTED]@[EMAIL
PROTECTED]($-O;6UE;G1;:'5=/4%U=&]M
+M871I:W5S(&5GPZER:V%T=&EN=,.A<R`H4E-)+7-Z:6YD<L.S;<.A8F%N('-Z
+M96YV963%D6MN96LI"D!`("TS,BPV("LS,RPW($!`"B!#;VUM96YT6W-K73U+
+M;&EKPZ$@>[EMAIL PROTECTED]<R!M><6A;W4L('7$OF%HQ(UU:[EMAIL PROTECTED]:2!24TD*
+M($-O;6UE;G1;<VQ=/5IA('9A<R!K;&EK82!M:<6A:V\L(&1A('9A;2!O;&%J
+MQ:%A(&)O;&7$C6EN92!V('IA<&5S=&IU"B!#;VUM96YT6W-R73W0FM"[T+C0
+MNM&;[EMAIL PROTECTED]&([EMAIL PROTECTED]"#0LM"PT8$L(-"^T+O0L-"ZT8C0L-"RT+#1
+MF-&#T9O0N"#0LM"[EMAIL PROTECTED])(-"QT+[0NPHK0V]M;65N=%MS<D!,871N73U+
+M;&EKQ(=E(&UIQ:%A('IA('9A<RP@;VQA:\6A879A:[EMAIL PROTECTED](%)322!B
+M;VP*($-O;6UE;G1;<W9=/4ML:6-K87(@;[EMAIL PROTECTED](&[EMAIL PROTECTED]<B!A
+M='0@;6EL9')A('-MPZ1R=&[EMAIL PROTECTED]@;75S87)M"B!#;VUM96YT6W1A73U#
+M;&EC:W,@=&AE(&UO=7-E(&9O<B!Y;W4L(')E9'5C:6YG('1H92!E9F9E8W1S
+M(&]F(%)322!24TD*($-O;6UE;G1;=')=/5)322##MGIE;&QI:VQE<FEN:2!A
+M>F%L=&%R86L@<VEZ:6X@:<.G:[EMAIL PROTECTED]('3$L6ML87([EMAIL PROTECTED]@
+M*S8U+#<@0$`*($=E;F5R:6-.86UE6V5T73U(:6ER92!A=71O;6%A=&YE(&ML
+MP[5P<[EMAIL PROTECTED])I8TYA;65;9FE=/4%U=&]M86%T=&EN96X@:&EI<F5N
+M;F%P<V%U='5S"B!'96YE<FEC3F%M95MF<ET]0VQI8R!D92!S;W5R:7,@875T
+M;VUA=&EQ=64**T=E;F5R:6-.86UE6V=A73U';&EO9\.A:[EMAIL PROTECTED]:&]I8G+#
+MK6]C:"!L=6EC:&4*($=E;F5R:6-.86UE6VAE73W7G->7UYG7IM>J(->BUYO7
+MD=>H(->0UY77F->5UY[7D->[EMAIL PROTECTED]@1V5N97)I8TYA;65;:&E=/>"DN."E
+MC>"DM>"DFN"DON"DLN"DO^"DI"[EMAIL PROTECTED]@[EMAIL PROTECTED]([EMAIL
PROTECTED]@@X*25X*6-X*2RX*2_
+MX*25"B!'96YE<FEC3F%M95MH=5T]075T;VUA=&EK=7,@:V%T=&EN=,.A<PI`
+M0"[EMAIL PROTECTED]@1V5N97)I8TYA;65;<VM=/4%U=&]M871I8VO#
+MJ2!K;&EK86YI92!M><6A;W4*($=E;F5R:6-.86UE6W-L73U386UO9&5J;FD@
+M:VQI:R!M:<6A:V4*($=E;F5R:6-.86UE6W-R73W0D-&#T8+0OM"[EMAIL PROTECTED]&!
+MT+K0N"#0NM"[T+C0NB#0O-"XT8C0L`HK1V5N97)I8TYA;65;<W)`3&%T;ET]
+M075T;VUA='-K:2!K;&EK(&UIQ:%A"B!'96YE<FEC3F%M95MS=ET]075T;VUA
+M=&ES:V$@;75S:VQI8VL*($=E;F5R:[EMAIL PROTECTED]@[EMAIL PROTECTED]@KK_@
[EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]@X*Z:X*^!X*Z?X*^-X*Z?X*Z_(."NI."NG^"O
+MC>"NG^"NLN"[EMAIL PROTECTED])I8TYA;65;=')=/4]T;VUA=&EK($9A<[EMAIL
PROTECTED],2Q
+M:VQA;6%SQ+$*9&EF9B`M3G)U82!K9&5A8V-E<W-I8FEL:71Y+3,N,BXQ+VMM
M;W5T:"]B;V]K<R]D92YD97-K=&]P(&MD96%C8V5S<VEB:6QI='DM8G)A;F-H
M+VMM;W5T:"]B;V]K<R]D92YD97-K=&]P"BTM+2!K9&5A8V-E<W-I8FEL:71Y
-M+3,N,BXP+VMM;W5T:"]B;V]K<R]D92YD97-K=&]P"3(P,#0M,#$M,34@,#$Z
-M,S0Z,#,N,#`P,#`P,#`P("TP-C`P"BLK*R!K9&5A8V-E<W-I8FEL:71Y+6)R
-M86YC:"]K;6]U=&@O8F]O:W,O9&4N9&5S:W1O<`DR,#`T+3`Q+3,P(#$Q.C(W
-M.C0U+C`P,#`P,#`P,"`M,#8P,`I`0"`M-#$L,[EMAIL PROTECTED]($!`"B!.86UE
-M6VUS73U*97)M86X*($YA;65;;71=/<[EMAIL PROTECTED])M86YIQ;P*($YA;65;;F)=/51Y
-M<VL**TYA;65;;F1S73U(;V-H9,.\P[QT<V-H"B!.86UE6VYL73U$=6ET<PH@
-M3F%M95MN;ET]5'ES:[EMAIL PROTECTED]<V]=/5-E+4=E<FUA;@[EMAIL PROTECTED]
-M06QE;6%N:0HM3F%M95MP;%T]3FEE;6EE8VMI"BM.86UE6W!L73U.:65M:65C
-M:V$*($YA;65;<'1=/4%L96W#HV\*($YA;65;<'1?0E)=/4%L96W#HV\*($YA
-M;65;<F]=/4=E<FUA;L2#"[EMAIL PROTECTED]@:V1E86-C97-S:6)I;&ET>2TS
-M+C(N,"]K;6]U=&@O8F]O:W,O96XN9&5S:W1O<"!K9&5A8V-E<W-I8FEL:71Y
-M+6)R86YC:"]K;6]U=&@O8F]O:W,O96XN9&5S:W1O<`HM+2T@:V1E86-C97-S
-M:6)I;&ET>2TS+C(N,"]K;6]U=&@O8F]O:W,O96XN9&5S:W1O<`DR,#`T+3`Q
-M+3$U(#`Q.C,T.C`U+C`P,#`P,#`P,"`M,#8P,`HK*RL@:V1E86-C97-S:6)I
-M;&ET>2UB<[EMAIL PROTECTED]:VUO=71H+V)O;VMS+V5N+F1E<VMT;W`),C`P-"TP,BTP
-M,B`P-#HP.3HQ-2XP,#`P,#`P,[EMAIL PROTECTED],[EMAIL PROTECTED]("LQ-2PQ-"!`
[EMAIL PROTECTED]>2UYS7F=>J"[EMAIL PROTECTED]"X*27
-MX*6-X*2PX*6'X*2<X*6`"B!.86UE6VAU73U!;F=O;`HK3F%M95MI<UT]16YS
-M:V$*($YA;65;:71=/4EN9VQE<V4**TYA;65;:F%=/>B+L>[EMAIL PROTECTED]@3F%M95MM
-M<UT]26YG9V5R:7,*($YA;65;;71=/4EN9VQIQ;P*($YA;65;;FQ=/45N9V5L
-M<[EMAIL PROTECTED];ET]16YG96QS:PHK3F%M95MP;%T]06YG:65L<VMA"B!.86UE
-M6W!T73U);F=LPZIS"B!.86UE6W!T7T)273U);F=LPZIS"B!.86UE6W)O73U%
-M;[EMAIL PROTECTED]:69F("U.<G5A(&MD96%C8V5S<VEB:6QI='DM,RXR+C`O:VUO
-M=71H+V)O;VMS+W-V+F1E<VMT;W`@:V1E86-C97-S:6)I;&ET>2UB<[EMAIL PROTECTED]
-M:VUO=71H+V)O;VMS+W-V+F1E<VMT;W`*+2TM(&MD96%C8V5S<VEB:6QI='DM
-M,RXR+C`O:VUO=71H+V)O;VMS+W-V+F1E<VMT;W`),C`P-"TP,2TQ-2`P,3HS
-M-#HP-RXP,#`P,#`P,[EMAIL PROTECTED],#`**RLK(&MD96%C8V5S<VEB:6QI='DM8G)A
-M;F-H+VMM;W5T:"]B;V]K<R]S=BYD97-K=&]P"3(P,#0M,#$M,S`@,3$Z,C<Z
-M-#DN,#`P,#`P,#`P("TP-C`P"D!`("TT,2PQ,2`K-#$L,3(@0$`*($YA;65;
-M;7-=/5-W961E;@[EMAIL PROTECTED]&[EMAIL PROTECTED];G-K
-M"BM.86UE6VYD<[EMAIL PROTECTED]($YA;65;;FQ=/5IW965D<[EMAIL PROTECTED]
-M;ET]4W9E;G-K"B!.86UE6VYS;UT]4V4M4W=E9&ES:[EMAIL PROTECTED]
-M9,.H<PHM3F%M95MP;%T]4WIW961Z:VD**TYA;65;<&Q=/5-Z=V5D>FMA"B!.
-M86UE6W!T73U3=65C;[EMAIL PROTECTED]"4ET]4W7#K<.G;[EMAIL PROTECTED];UT]
-M4W5E9&5ZQ(,*9&EF9B`M3G)U82!K9&5A8V-E<W-I8FEL:71Y+3,N,BXP+VMM
-M;W5T:"]K;6]U=&@N9&5S:W1O<"!K9&5A8V-E<W-I8FEL:71Y+6)R86YC:"]K
-M;6]U=&@O:VUO=71H+F1E<VMT;W`*+2TM(&MD96%C8V5S<VEB:6QI='DM,RXR
-M+C`O:VUO=71H+VMM;W5T:"YD97-K=&]P"3(P,#0M,#$M,34@,#$Z,S0Z,#DN
-M,#`P,#`P,#`P("TP-C`P"BLK*R!K9&5A8V-E<W-I8FEL:71Y+6)R86YC:"]K
-M;6]U=&@O:VUO=71H+F1E<VMT;W`),C`P-"TP,BTP-R`P-CHS.3HR,RXP,#`P
-M,#`P,[EMAIL PROTECTED],[EMAIL PROTECTED],3(@*S8L,[EMAIL
PROTECTED]($EC;VX]:VUO=71H+G!N
[EMAIL PROTECTED]&]C4&%T:#UK;6]U=&@O:[EMAIL PROTECTED]:'1M;[EMAIL
PROTECTED];65N=#T**T-O;6UE
-M;G1;<&Q=/5!R;[EMAIL PROTECTED]&\@;V=LQ(5D86YI82!P;W=IQ)EK<WIO;GEC:"!F
-M<F%G;65N=,.S=R!E:W)A;G4*($-O;6UE;G1;>'A=/7AX>'@*(%1E<FUI;F%L
-M/3`*($YA;64]2TUO=71H"B!.86UE6V-Y73U+0V5G"B!.86UE6V5O73U+0G7%
-MG6\*($YA;65;:&E=/>"DE>"[EMAIL PROTECTED]@[EMAIL PROTECTED]([EMAIL
PROTECTED];65;:7-=/4M-
-M=6YN=7(*($YA;65;<'1?0E)=/4M";V-A"B!.86UE6W-V73U+;6]U=&@*($YA
-M;65;=&%=/[EMAIL PROTECTED]"D!`("TS,2PY("LS,RPQ,B!`0`H@
-M1V5N97)I8TYA;65;9G)=/4EN=&5R9F%C92!G<F%P:&[EMAIL PROTECTED]&4@<WEN=&C#
-MJ'-E('[EMAIL PROTECTED])I8TYA;65;:&E=/>"DN."EC>"DJN"[EMAIL PROTECTED]"DFB#@
+M+3,N,BXQ+VMM;W5T:"]B;V]K<R]D92YD97-K=&]P"3(P,#0M,#$M,S`@,3$Z
+M,C<Z-#4N,#`P,#`P,#`P("TP-C`P"BLK*R!K9&5A8V-E<W-I8FEL:71Y+6)R
+M86YC:"]K;6]U=&@O8F]O:W,O9&4N9&5S:W1O<`DR,#`T+3`R+3(Y(#`X.C0P
+M.C(V+C`P,#`P,#`P,"`M,#8P,`I`0"[EMAIL PROTECTED]
+M:UT]3F5M96-K>[EMAIL PROTECTED];%T];F5MQ:%K;[EMAIL PROTECTED]<ET]T)W0M="\
+MT+#1A]"[EMAIL PROTECTED];65;<W)`3&%T;ET]3F5M8<2-:VD*($YA;65;<W-=/5-I
+M2F%L:6UA;F4*($YA;65;<W9=/51Y<VMA"[EMAIL PROTECTED]@KX;@KK#@
[EMAIL PROTECTED]@[EMAIL PROTECTED]&EF9B`M3G)U82!K9&5A8V-E<W-I8FEL:71Y+3,N,BXQ
+M+VMM;W5T:"]B;V]K<R]E;BYD97-K=&]P(&MD96%C8V5S<VEB:6QI='DM8G)A
+M;F-H+VMM;W5T:"]B;V]K<R]E;BYD97-K=&]P"BTM+2!K9&5A8V-E<W-I8FEL
+M:71Y+3,N,BXQ+VMM;W5T:"]B;V]K<R]E;BYD97-K=&]P"3(P,#0M,#(M,#(@
+M,#0Z,#DZ,34N,#`P,#`P,#`P("TP-C`P"BLK*R!K9&5A8V-E<W-I8FEL:71Y
+M+6)R86YC:"]K;6]U=&@O8F]O:W,O96XN9&5S:W1O<`DR,#`T+3`S+3`S(#`W
+M.C4P.C4Y+C`P,#`P,#`P,"`M,#8P,`I`0"`M,3(L,3(@*S$R+#$T($!`"B!.
+M86UE6V5T73U);F=L:7-E"B!.86UE6V9I73U%;F=L86YT:6QA:6YE;@[EMAIL PROTECTED]
+M95MF<ET]06YG;&%I<PHK3F%M95MG85T]0L.I87)[EMAIL PROTECTED]
+MH->2UYS7F=>J"[EMAIL PROTECTED]"X*27X*6-X*2PX*6'X*2<X*6`
+M"B!.86UE6VAU73U!;F=O;[EMAIL PROTECTED]<UT]16YS:V$*($YA;65;:71=/4EN
+M9VQE<V4*($YA;65;:F%=/>B+L>[EMAIL PROTECTED];ET]T)#0O="ST+O0N`H@
+M3F%M95MM<UT]26YG9V5R:7,*($YA;65;;71=/4EN9VQIQ;P*($YA;65;;FQ=
+M/45N9V5L<PI`0"`M,S`L-B`K,S([EMAIL PROTECTED]:UT]06YG;&EC:WD*
+M($YA;65;<VQ=/6%N9VQEQ:%K;[EMAIL PROTECTED]<ET]T)70O="ST+O0M=&!T+K0
+MN`HK3F%M95MS<D!,871N73U%;F=L97-K:[EMAIL PROTECTED]:V$*
+M($YA;65;=&%=/>"NAN"NF>"OC>"NE>"NO^"NL^"NKN"[EMAIL PROTECTED]<ET]
+MQ+!N9VEL:7IC90ID:69F("U.<G5A(&MD96%C8V5S<VEB:6QI='DM,RXR+C$O
+M:VUO=71H+V)O;VMS+W-V+F1E<VMT;W`@:V1E86-C97-S:6)I;&ET>2UB<F%N
[EMAIL PROTECTED]:VUO=71H+V)O;VMS+W-V+F1E<VMT;W`*+2TM(&MD96%C8V5S<VEB:6QI
+M='DM,RXR+C$O:VUO=71H+V)O;VMS+W-V+F1E<VMT;W`),C`P-"TP,2TS,"`Q
+M,3HR-SHT.2XP,#`P,#`P,[EMAIL PROTECTED],#`**RLK(&MD96%C8V5S<VEB:6QI='DM
+M8G)A;F-H+VMM;W5T:"]B;V]K<R]S=BYD97-K=&]P"3(P,#0M,#(M,CD@,[EMAIL PROTECTED]
+M-#`Z,S`N,#`P,#`P,#`P("TP-C`P"D!`("TU-2PV("LU-2PW($!`"B!.86UE
+M6W-K73W%H';#J61S:WD*($YA;65;<VQ=/<6A=F5D<VMO"B!.86UE6W-R73W0
+MJ-"RT+70M-&!T+K0N`HK3F%M95MS<D!,871N73W%H'9E9'-K:[EMAIL PROTECTED]
+M<UT]4VE3=VED:[EMAIL PROTECTED];[EMAIL PROTECTED]
+MX*ZUX*^`X*Z?X*Z_X*ZWX*^-"[EMAIL PROTECTED]@:V1E86-C97-S:6)I;&ET
+M>2TS+C(N,2]K;6]U=&@O:VUO=71H+F1E<VMT;W`@:V1E86-C97-S:6)I;&ET
+M>2UB<[EMAIL PROTECTED]:VUO=71H+VMM;W5T:"YD97-K=&]P"BTM+2!K9&5A8V-E<W-I
+M8FEL:71Y+3,N,BXQ+VMM;W5T:"]K;6]U=&@N9&5S:W1O<`DR,#`T+3`R+3`W
+M(#`V.C,Y.C(S+C`P,#`P,#`P,"`M,#8P,`HK*RL@:V1E86-C97-S:6)I;&ET
+M>2UB<[EMAIL PROTECTED]:VUO=71H+VMM;W5T:"YD97-K=&]P"3(P,#0M,#,M,#,@,#<Z
+M-3$Z,#$N,#`P,#`P,#`P("TP-C`P"D!`("TQ-"PV("LQ-"PW($!`"B!.86UE
+M6V5O73U+0G7%G6\*($YA;65;:&E=/>"DE>"[EMAIL PROTECTED]@[EMAIL PROTECTED]([EMAIL
PROTECTED]($YA
+M;65;:7-=/4M-=6YN=7(**TYA;65;;6Y=/4O0G-"PT80HT)I-;W5T:"D*($YA
+M;65;<'1?0E)=/4M";V-A"B!.86UE6W-V73U+;6]U=&@*($YA;65;=&%=/4L@
+MX*ZNX*ZUX*^!X*ZDX*^-"D!`("TS,2PV("LS,BPW($!`"B!'96YE<FEC3F%M
+M95ME=%T]2\.U;F5SP[QN=&5S86%T;W(*($=E;F5R:6-.86UE6V9I73U0=6AE
+M<WEN=&5T:7-A871T;W)I;B!KPZ1Y='3#MFQI:71T>[EMAIL PROTECTED])I8TYA
+M;65;9G)=/4EN=&5R9F%C92!G<F%P:&[EMAIL PROTECTED]&4@<WEN=&C#J'-E('9O8V%L
+M90HK1V5N97)I8TYA;65;9V%=/4-LPZ%R('1O<V%I9V@@86X@<VEN=,.I:7-E
+M;VER(&-A:[EMAIL PROTECTED])I8TYA;65;:&E=/>"DN."EC>"DJN"[EMAIL PROTECTED]"DFB#@
[EMAIL PROTECTED]@I([EMAIL PROTECTED]@[EMAIL PROTECTED]@[EMAIL
PROTECTED]([EMAIL PROTECTED])[EMAIL PROTECTED]@[EMAIL PROTECTED]
MX*6-X*2?X*2/X*2CX*6-X*2A"B!'96YE<FEC3F%M95MH=5T]0F5S>L.I9'-Z
-M:6YT971I>L.A=&]R"BM'96YE<FEC3F%M95MI<UT]5FG#L&[EMAIL PROTECTED]@=&%L
-M9V5R9FEL:6YN"B!'96YE<FEC3F%M95MI=%T]26YT97)F86-C:[EMAIL PROTECTED])A9FEC
-M82!P97(@:6P@<VEN=&5T:7IZ871O<[EMAIL PROTECTED]"BM'96YE<FEC3F%M95MJ
-M85T]XX*YXX.4XX.\XX.!XX*WXX.SXX*[XX*UXX*DXX*VXX.5XX.MXX.SXX.(
-MXX*HXX.SXX.)"B!'96YE<FEC3F%M95MN;%T]4W!R86%K<WEN=&AE<VEZ97(*
-M($=E;F5R:6-.86UE6VYN73U'<F5N<V5S;FET="!F;W(@=&%L97-Y;G1E<V4*
-M*T=E;F5R:6-.86UE6W!L73U0<F]G<F%M(&]B<\6"=6=U:L2%8WD@<WEN=&5Z
-M871O<B!M;W=Y"B!'96YE<FEC3F%M95MP=%T]4VEN=&5T:7IA9&]R(&1E($9A
-M;&$*($=E;F5R:6-.86UE6W!T7T)273U);G1E<[EMAIL PROTECTED]&[EMAIL
PROTECTED]&5T:7IA
-M9&]R(&1E($9A;&$*($=E;F5R:6-.86UE6W)U73W0F-"]T8+0M=&`T830M="Y
[EMAIL PROTECTED]@T8'0N-"]T8+0M="[EMAIL PROTECTED]"[EMAIL PROTECTED]@-"UT8?0N`H`
+M:6YT971I>L.A=&]R"B!'96YE<FEC3F%M95MI<UT]5FG#L&[EMAIL PROTECTED]@=&%L
+M9V5R9FEL:6YN"D!`("TT-2PV("LT-RPW($!`"B!'96YE<FEC3F%M95MS:UT]
+M4F]Z:')A;FEE('!R92!S>6YT97K#H71O<B!R9<2-:[EMAIL PROTECTED])I8TYA;65;
+M<VQ=/59M97-N:6L@>F$@<VEN=&5Z;R!G;W9O<F$*($=E;F5R:6-.86UE6W-R
+M73W0H=&#T8?0M=&[EMAIL PROTECTED]"[EMAIL
PROTECTED]"XT8+0M=&"T+C0M]"PT8+0OM&`(-"S
+MT+[0LM"^T8#0L`HK1V5N97)I8TYA;65;<W)`3&%T;ET]4W7$C65L:F4@>F$@
+M<VET971I>F%T;W(@9V]V;W)A"B!'96YE<FEC3F%M95MS=ET]1W+#I&YS<VYI
+M='[EMAIL PROTECTED]<B!T86QS>6YT97,*($=E;F5R:[EMAIL PROTECTED]@[EMAIL
PROTECTED]@
[EMAIL PROTECTED]@[EMAIL PROTECTED]:X*Z_X*ZIX*^-X*ZDX*Z:X*^(X*Z:X*ZPX*^-(."NJN"O
+MC>"NL."NON"NJ>"OC>"NG^"NG^"OC>"NFN"[EMAIL PROTECTED])I8TYA;65;=')=
+A/4MO;G7%GVUA(%-E;G1E>FQE>6EC:2!!<F%YP[QZP[P*
`
end
Modified:
trunk/packages/kdeaccessibility/debian/patches/02_autotools_update.diff
===================================================================
--- trunk/packages/kdeaccessibility/debian/patches/02_autotools_update.diff
2004-03-22 01:16:28 UTC (rev 68)
+++ trunk/packages/kdeaccessibility/debian/patches/02_autotools_update.diff
2004-03-22 02:59:19 UTC (rev 69)
@@ -1,24 +1,159 @@
-diff -Nrua kdebase-3.1.94/admin/compile kdebase-patched/admin/compile
---- kdebase-3.1.94/admin/compile 2002-09-30 07:18:17.000000000 -0500
-+++ kdebase-patched/admin/compile 2003-12-15 22:48:04.000000000 -0600
-@@ -28,6 +28,14 @@
- # compile PROGRAM [ARGS]...
- # `-o FOO.o' is removed from the args passed to the actual compile.
+diff -Nrua kdeaccessibility-3.2.1/admin/compile
kdeaccessibility-patched/admin/compile
+--- kdeaccessibility-3.2.1/admin/compile 2002-09-30 07:18:17.000000000
-0500
++++ kdeaccessibility-patched/admin/compile 2004-01-14 19:49:36.000000000
-0600
+@@ -1,8 +1,9 @@
+ #! /bin/sh
+-
+ # Wrapper for compilers which do not understand `-c -o'.
-+# Usage statement added by Billy Biggs <[EMAIL PROTECTED]>.
-+if [ -z $1 ]; then
-+ echo "Wrapper for compilers which do not understand '-c -o'."
-+ echo "usage: compile PROGRAM [ARGS]..."
-+ echo "'-o FOO.o' is removed from the args passed to the actual compile."
-+ exit 1
-+fi
+-# Copyright 1999, 2000 Free Software Foundation, Inc.
++scriptversion=2003-11-09.00
+
++# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
+ # Written by Tom Tromey <[EMAIL PROTECTED]>.
+ #
+ # This program is free software; you can redistribute it and/or modify
+@@ -24,9 +25,36 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+
+-# Usage:
+-# compile PROGRAM [ARGS]...
+-# `-o FOO.o' is removed from the args passed to the actual compile.
++# This file is maintained in Automake, please report
++# bugs to <bug-automake@gnu.org> or send patches to
++# <automake-patches@gnu.org>.
++
++case $1 in
++ '')
++ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
++ exit 1;
++ ;;
++ -h | --h*)
++ cat <<\EOF
++Usage: compile [--help] [--version] PROGRAM [ARGS]
++
++Wrapper for compilers which do not understand `-c -o'.
++Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
++arguments, and rename the output as expected.
++
++If you are trying to build a whole package this is not the
++right script to run: please start by reading the file `INSTALL'.
++
++Report bugs to <bug-automake@gnu.org>.
++EOF
++ exit 0
++ ;;
++ -v | --v*)
++ echo "compile $scriptversion"
++ exit 0
++ ;;
++esac
++
+
prog=$1
shift
+@@ -35,39 +63,39 @@
+ cfile=
+ args=
+ while test $# -gt 0; do
+- case "$1" in
++ case "$1" in
+ -o)
+- # configure might choose to run compile as `compile cc -o foo foo.c'.
+- # So we do something ugly here.
+- ofile=$2
+- shift
+- case "$ofile" in
++ # configure might choose to run compile as `compile cc -o foo foo.c'.
++ # So we do something ugly here.
++ ofile=$2
++ shift
++ case "$ofile" in
+ *.o | *.obj)
+- ;;
++ ;;
+ *)
+- args="$args -o $ofile"
+- ofile=
+- ;;
+- esac
++ args="$args -o $ofile"
++ ofile=
++ ;;
++ esac
+ ;;
+ *.c)
+- cfile=$1
+- args="$args $1"
+- ;;
++ cfile=$1
++ args="$args $1"
++ ;;
+ *)
+- args="$args $1"
+- ;;
+- esac
+- shift
++ args="$args $1"
++ ;;
++ esac
++ shift
+ done
-diff -Nrua kdebase-3.1.94/admin/config.guess kdebase-patched/admin/config.guess
---- kdebase-3.1.94/admin/config.guess 2002-10-26 11:44:28.000000000 -0500
-+++ kdebase-patched/admin/config.guess 2004-01-08 21:12:01.000000000 -0600
+ if test -z "$ofile" || test -z "$cfile"; then
+- # If no `-o' option was seen then we might have been invoked from a
+- # pattern rule where we don't need one. That is ok -- this is a
+- # normal compilation that the losing compiler can handle. If no
+- # `.c' file was seen then we are probably linking. That is also
+- # ok.
+- exec "$prog" $args
++ # If no `-o' option was seen then we might have been invoked from a
++ # pattern rule where we don't need one. That is ok -- this is a
++ # normal compilation that the losing compiler can handle. If no
++ # `.c' file was seen then we are probably linking. That is also
++ # ok.
++ exec "$prog" $args
+ fi
+
+ # Name of file we expect compiler to create.
+@@ -79,10 +107,10 @@
+ # object file name, since that is what matters with a parallel build.
+ lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
+ while true; do
+- if mkdir $lockdir > /dev/null 2>&1; then
+- break
+- fi
+- sleep 1
++ if mkdir $lockdir > /dev/null 2>&1; then
++ break
++ fi
++ sleep 1
+ done
+ # FIXME: race condition here if user kills between mkdir and trap.
+ trap "rmdir $lockdir; exit 1" 1 2 15
+@@ -92,8 +120,17 @@
+ status=$?
+
+ if test -f "$cofile"; then
+- mv "$cofile" "$ofile"
++ mv "$cofile" "$ofile"
+ fi
+
+ rmdir $lockdir
+ exit $status
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+diff -Nrua kdeaccessibility-3.2.1/admin/config.guess
kdeaccessibility-patched/admin/config.guess
+--- kdeaccessibility-3.2.1/admin/config.guess 2002-10-26 11:44:28.000000000
-0500
++++ kdeaccessibility-patched/admin/config.guess 2004-01-08
21:12:01.000000000 -0600
@@ -1,9 +1,9 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -555,9 +690,9 @@
# Apollos put the system type in the environment.
-diff -Nrua kdebase-3.1.94/admin/config.sub kdebase-patched/admin/config.sub
---- kdebase-3.1.94/admin/config.sub 2002-10-26 11:44:28.000000000 -0500
-+++ kdebase-patched/admin/config.sub 2004-01-08 21:12:01.000000000 -0600
+diff -Nrua kdeaccessibility-3.2.1/admin/config.sub
kdeaccessibility-patched/admin/config.sub
+--- kdeaccessibility-3.2.1/admin/config.sub 2002-10-26 11:44:28.000000000
-0500
++++ kdeaccessibility-patched/admin/config.sub 2004-01-08 21:12:01.000000000
-0600
@@ -1,9 +1,9 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -936,19 +1071,58 @@
-vxsim* | -vxworks* | -windiss*)
vendor=wrs
;;
-diff -Nrua kdebase-3.1.94/admin/depcomp kdebase-patched/admin/depcomp
---- kdebase-3.1.94/admin/depcomp 2003-04-16 16:53:18.000000000 -0500
-+++ kdebase-patched/admin/depcomp 2003-12-15 22:48:04.000000000 -0600
-@@ -1,7 +1,7 @@
+diff -Nrua kdeaccessibility-3.2.1/admin/depcomp
kdeaccessibility-patched/admin/depcomp
+--- kdeaccessibility-3.2.1/admin/depcomp 2003-04-16 16:53:18.000000000
-0500
++++ kdeaccessibility-patched/admin/depcomp 2004-01-14 19:49:36.000000000
-0600
+@@ -1,7 +1,9 @@
#! /bin/sh
-
+-
# depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-+# Copyright 1999, 2000, 2003 Free Software Foundation, Inc.
++
++scriptversion=2003-11-08.23
++
++# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-@@ -31,7 +31,16 @@
+@@ -25,13 +27,52 @@
+
+ # Originally written by Alexandre Oliva <[EMAIL PROTECTED]>.
+
++case $1 in
++ '')
++ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
++ exit 1;
++ ;;
++ -h | --h*)
++ cat <<\EOF
++Usage: depcomp [--help] [--version] PROGRAM [ARGS]
++
++Run PROGRAMS ARGS to compile a file, generating dependencies
++as side-effects.
++
++Environment variables:
++ depmode Dependency tracking mode.
++ source Source file read by `PROGRAMS ARGS'.
++ object Object file output by `PROGRAMS ARGS'.
++ depfile Dependency file to output.
++ tmpdepfile Temporary file to use when outputing dependencies.
++ libtool Whether libtool is used (yes/no).
++
++Report bugs to <bug-automake@gnu.org>.
++EOF
++ exit 0
++ ;;
++ -v | --v*)
++ echo "depcomp $scriptversion"
++ exit 0
++ ;;
++esac
++
+ if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+ echo "depcomp: Variables source, object and depmode must be set" 1>&2
+ exit 1
fi
# `libtool' can also be set to `yes' or `no'.
@@ -966,7 +1140,7 @@
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
-@@ -163,19 +172,25 @@
+@@ -163,19 +204,25 @@
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
@@ -998,7 +1172,7 @@
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
-@@ -183,6 +198,7 @@
+@@ -183,6 +230,7 @@
fi
if test -f "$tmpdepfile"; then
@@ -1006,7 +1180,7 @@
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
-@@ -198,11 +214,9 @@
+@@ -198,11 +246,9 @@
;;
icc)
@@ -1020,7 +1194,7 @@
# foo.o: sub/foo.c
# foo.o: sub/foo.h
# which is wrong. We want:
-@@ -210,6 +224,12 @@
+@@ -210,6 +256,12 @@
# sub/foo.o: sub/foo.h
# sub/foo.c:
# sub/foo.h:
@@ -1033,7 +1207,7 @@
"$@" -MD -MF "$tmpdepfile"
stat=$?
-@@ -219,26 +239,35 @@
+@@ -219,26 +271,35 @@
exit $stat
fi
rm -f "$depfile"
@@ -1076,7 +1250,7 @@
"$@" -MD
fi
-@@ -256,8 +285,8 @@
+@@ -256,8 +317,8 @@
fi
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
@@ -1087,7 +1261,7 @@
else
echo "#dummy" > "$depfile"
fi
-@@ -270,34 +299,42 @@
+@@ -270,34 +331,42 @@
dashmstdout)
# Important note: in order to support this mode, a compiler *must*
@@ -1156,7 +1330,7 @@
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
tr ' ' '
-@@ -315,36 +352,40 @@
+@@ -315,36 +384,40 @@
;;
makedepend)
@@ -1224,7 +1398,7 @@
' | \
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
-@@ -354,35 +395,39 @@
+@@ -354,35 +427,39 @@
cpp)
# Important note: in order to support this mode, a compiler *must*
@@ -1289,7 +1463,7 @@
rm -f "$depfile"
echo "$object : \\" > "$depfile"
cat < "$tmpdepfile" >> "$depfile"
-@@ -392,34 +437,27 @@
+@@ -392,34 +469,27 @@
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
@@ -1342,20 +1516,47 @@
rm -f "$depfile"
echo "$object : \\" > "$depfile"
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >>
"$depfile"
-diff -Nrua kdebase-3.1.94/admin/install-sh kdebase-patched/admin/install-sh
---- kdebase-3.1.94/admin/install-sh 2003-08-07 04:41:31.000000000 -0500
-+++ kdebase-patched/admin/install-sh 2003-12-15 22:48:04.000000000 -0600
-@@ -1,19 +1,37 @@
+@@ -439,3 +509,12 @@
+ esac
+
+ exit 0
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+diff -Nrua kdeaccessibility-3.2.1/admin/install-sh
kdeaccessibility-patched/admin/install-sh
+--- kdeaccessibility-3.2.1/admin/install-sh 2003-08-07 04:41:31.000000000
-0500
++++ kdeaccessibility-patched/admin/install-sh 2004-01-14 19:49:36.000000000
-0600
+@@ -1,19 +1,38 @@
#!/bin/sh
- #
+-#
# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
- #
--# Copyright 1991 by the Massachusetts Institute of Technology
++
++scriptversion=2004-01-12.10
++
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
++#
++# Copyright (C) 1994 X Consortium
++#
++# Permission is hereby granted, free of charge, to any person obtaining a copy
++# of this software and associated documentation files (the "Software"), to
++# deal in the Software without restriction, including without limitation the
++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++# sell copies of the Software, and to permit persons to whom the Software is
++# furnished to do so, subject to the following conditions:
#
+-# Copyright 1991 by the Massachusetts Institute of Technology
++# The above copyright notice and this permission notice shall be included in
++# all copies or substantial portions of the Software.
+ #
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
@@ -1365,18 +1566,6 @@
-# written prior permission. M.I.T. makes no representations about the
-# suitability of this software for any purpose. It is provided "as is"
-# without express or implied warranty.
-+# Copyright (C) 1994 X Consortium
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a copy
-+# of this software and associated documentation files (the "Software"), to
-+# deal in the Software without restriction, including without limitation the
-+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-+# sell copies of the Software, and to permit persons to whom the Software is
-+# furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice shall be included in
-+# all copies or substantial portions of the Software.
-+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -1394,62 +1583,851 @@
#
# Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it
-@@ -221,8 +239,8 @@
+@@ -23,13 +42,11 @@
+ # from scratch. It can only install one file at a time, a restriction
+ # shared with many OS's install programs.
- # Make a couple of temp file names in the proper directory.
+-
+ # set DOITPROG to echo to test this script
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+ doit="${DOITPROG-}"
+
+-
+ # put in absolute paths if you don't have them in your path; or use env. vars.
+
+ mvprog="${MVPROG-mv}"
+@@ -41,236 +58,253 @@
+ rmprog="${RMPROG-rm}"
+ mkdirprog="${MKDIRPROG-mkdir}"
+
+-transformbasename=""
+-transform_arg=""
++transformbasename=
++transform_arg=
+ instcmd="$mvprog"
+ chmodcmd="$chmodprog 0755"
+-chowncmd=""
+-chgrpcmd=""
+-stripcmd=""
++chowncmd=
++chgrpcmd=
++stripcmd=
+ rmcmd="$rmprog -f"
+ mvcmd="$mvprog"
+-src=""
+-dst=""
+-dir_arg=""
+-
+-while [ x"$1" != x ]; do
+- case $1 in
+- -c) instcmd=$cpprog
+- shift
+- continue;;
+-
+- -d) dir_arg=true
+- shift
+- continue;;
+-
+- -m) chmodcmd="$chmodprog $2"
+- shift
+- shift
+- continue;;
+-
+- -o) chowncmd="$chownprog $2"
+- shift
+- shift
+- continue;;
+-
+- -g) chgrpcmd="$chgrpprog $2"
+- shift
+- shift
+- continue;;
+-
+- -s) stripcmd=$stripprog
+- shift
+- continue;;
+-
+- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
+- shift
+- continue;;
+-
+- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+- shift
+- continue;;
+-
+- *) if [ x"$src" = x ]
+- then
+- src=$1
+- else
+- # this colon is to work around a 386BSD /bin/sh bug
+- :
+- dst=$1
+- fi
+- shift
+- continue;;
+- esac
++src=
++dst=
++dir_arg=
++
++usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
++ or: $0 [OPTION]... SRCFILES... DIRECTORY
++ or: $0 -d DIRECTORIES...
++
++In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
++In the second, create the directory path DIR.
++
++Options:
++-b=TRANSFORMBASENAME
++-c copy source (using $cpprog) instead of moving (using $mvprog).
++-d create directories instead of installing files.
++-g GROUP $chgrp installed files to GROUP.
++-m MODE $chmod installed files to MODE.
++-o USER $chown installed files to USER.
++-s strip installed files (using $stripprog).
++-t=TRANSFORM
++--help display this help and exit.
++--version display version info and exit.
++
++Environment variables override the default commands:
++ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
++"
++
++while test -n "$1"; do
++ case $1 in
++ -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
++ shift
++ continue;;
++
++ -c) instcmd=$cpprog
++ shift
++ continue;;
++
++ -d) dir_arg=true
++ shift
++ continue;;
++
++ -g) chgrpcmd="$chgrpprog $2"
++ shift
++ shift
++ continue;;
++
++ --help) echo "$usage"; exit 0;;
++
++ -m) chmodcmd="$chmodprog $2"
++ shift
++ shift
++ continue;;
++
++ -o) chowncmd="$chownprog $2"
++ shift
++ shift
++ continue;;
++
++ -s) stripcmd=$stripprog
++ shift
++ continue;;
++
++ -t=*) transformarg=`echo $1 | sed 's/-t=//'`
++ shift
++ continue;;
++
++ --version) echo "$0 $scriptversion"; exit 0;;
++
++ *) # When -d is used, all remaining arguments are directories to create.
++ test -n "$dir_arg" && break
++ # Otherwise, the last argument is the destination. Remove it from
[EMAIL PROTECTED]
++ for arg
++ do
++ if test -n "$dstarg"; then
++ # $@ is not empty: it contains at least $arg.
++ set fnord "$@" "$dstarg"
++ shift # fnord
++ fi
++ shift # arg
++ dstarg=$arg
++ done
++ break;;
++ esac
+ done
+
+-if [ x"$src" = x ]
+-then
+- echo "$0: no input file specified" >&2
+- exit 1
+-else
+- :
+-fi
+-
+-if [ x"$dir_arg" != x ]; then
+- dst=$src
+- src=""
+-
+- if [ -d "$dst" ]; then
+- instcmd=:
+- chmodcmd=""
+- else
+- instcmd=$mkdirprog
+- fi
+-else
+-
+-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+-# might cause directories to be created, which would be especially bad
+-# if $src (and thus $dsttmp) contains '*'.
+-
+- if [ -f "$src" ] || [ -d "$src" ]
+- then
+- :
+- else
+- echo "$0: $src does not exist" >&2
+- exit 1
+- fi
+-
+- if [ x"$dst" = x ]
+- then
+- echo "$0: no destination specified" >&2
+- exit 1
+- else
+- :
+- fi
+-
+-# If destination is a directory, append the input filename; if your system
+-# does not like double slashes in filenames, you may need to add some logic
+-
+- if [ -d "$dst" ]
+- then
+- dst=$dst/`basename "$src"`
+- else
+- :
+- fi
++if test -z "$1"; then
++ if test -z "$dir_arg"; then
++ echo "$0: no input file specified." >&2
++ exit 1
++ fi
++ # It's OK to call `install-sh -d' without argument.
++ # This can happen when creating conditional directories.
++ exit 0
+ fi
+
+-## this sed command emulates the dirname command
+-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+-
+-# Make sure that the destination directory exists.
+-# this part is taken from Noah Friedman's mkinstalldirs script
+-
+-# Skip lots of stat calls in the usual case.
+-if [ ! -d "$dstdir" ]; then
+-defaultIFS='
+- '
+-IFS="${IFS-$defaultIFS}"
+-
+-oIFS=$IFS
+-# Some sh's can't handle IFS=/ for some reason.
+-IFS='%'
+-set - `echo "$dstdir" | sed -e 's@/@[EMAIL PROTECTED]' -e '[EMAIL
PROTECTED]@/@'`
+-IFS=$oIFS
+-
+-pathcomp=''
+-
+-while [ $# -ne 0 ] ; do
+- pathcomp=$pathcomp$1
+- shift
+-
+- if [ ! -d "$pathcomp" ] ;
+- then
+- $mkdirprog "$pathcomp"
+- else
+- :
+- fi
++for src
++do
++ # Protect names starting with `-'.
++ case $src in
++ -*) src=./$src ;;
++ esac
++
++ if test -n "$dir_arg"; then
++ dst=$src
++ src=
++
++ if test -d "$dst"; then
++ instcmd=:
++ chmodcmd=
++ else
++ instcmd=$mkdirprog
++ fi
++ else
++ # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
++ # might cause directories to be created, which would be especially bad
++ # if $src (and thus $dsttmp) contains '*'.
++ if test ! -f "$src" && test ! -d "$src"; then
++ echo "$0: $src does not exist." >&2
++ exit 1
++ fi
++
++ if test -z "$dstarg"; then
++ echo "$0: no destination specified." >&2
++ exit 1
++ fi
++
++ dst=$dstarg
++ # Protect names starting with `-'.
++ case $dst in
++ -*) dst=./$dst ;;
++ esac
+
+- pathcomp=$pathcomp/
++ # If destination is a directory, append the input filename; won't work
++ # if double slashes aren't ignored.
++ if test -d "$dst"; then
++ dst=$dst/`basename "$src"`
++ fi
++ fi
++
++ # This sed command emulates the dirname command.
++ dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
++
++ # Make sure that the destination directory exists.
++
++ # Skip lots of stat calls in the usual case.
++ if test ! -d "$dstdir"; then
++ defaultIFS='
++ '
++ IFS="${IFS-$defaultIFS}"
++
++ oIFS=$IFS
++ # Some sh's can't handle IFS=/ for some reason.
++ IFS='%'
++ set - `echo "$dstdir" | sed -e 's@/@[EMAIL PROTECTED]' -e '[EMAIL
PROTECTED]@/@'`
++ IFS=$oIFS
++
++ pathcomp=
++
++ while test $# -ne 0 ; do
++ pathcomp=$pathcomp$1
++ shift
++ test -d "$pathcomp" || $mkdirprog "$pathcomp"
++ pathcomp=$pathcomp/
++ done
++ fi
++
++ if test -n "$dir_arg"; then
++ $doit $instcmd "$dst" \
++ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
++ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
++
++ else
++ # If we're going to rename the final executable, determine the name now.
++ if test -z "$transformarg"; then
++ dstfile=`basename "$dst"`
++ else
++ dstfile=`basename "$dst" $transformbasename \
++ | sed $transformarg`$transformbasename
++ fi
++
++ # don't allow the sed command to completely eliminate the filename.
++ test -z "$dstfile" && dstfile=`basename "$dst"`
++
++ # Make a couple of temp file names in the proper directory.
++ dsttmp=$dstdir/_inst.$$_
++ rmtmp=$dstdir/_rm.$$_
++
++ # Trap to clean up those temp files at exit.
++ trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
++ trap '(exit $?); exit' 1 2 13 15
++
++ # Move or copy the file name to the temp name
++ $doit $instcmd "$src" "$dsttmp" &&
++
++ # and set any options; do chmod last to preserve setuid bits.
++ #
++ # If any of these fail, we abort the whole thing. If we want to
++ # ignore errors from any of these, just make sure not to ignore
++ # errors from the above "$doit $instcmd $src $dsttmp" command.
++ #
++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
++ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
++
++ # Now remove or move aside any old file at destination location. We
++ # try this two ways since rm can't unlink itself on some systems and
++ # the destination file might be busy for other reasons. In this case,
++ # the final cleanup might fail but the new file should still install
++ # successfully.
++ {
++ if test -f "$dstdir/$dstfile"; then
++ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
++ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
++ || {
++ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
++ (exit 1); exit
++ }
++ else
++ :
++ fi
++ } &&
++
++ # Now rename the file to the real destination.
++ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
++ fi || { (exit 1); exit; }
+ done
+-fi
+-
+-if [ x"$dir_arg" != x ]
+-then
+- $doit $instcmd "$dst" &&
+-
+- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
+- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
+- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
+- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
+-else
+-
+-# If we're going to rename the final executable, determine the name now.
+-
+- if [ x"$transformarg" = x ]
+- then
+- dstfile=`basename "$dst"`
+- else
+- dstfile=`basename "$dst" $transformbasename |
+- sed $transformarg`$transformbasename
+- fi
+-
+-# don't allow the sed command to completely eliminate the filename
+-
+- if [ x"$dstfile" = x ]
+- then
+- dstfile=`basename "$dst"`
+- else
+- :
+- fi
+-
+-# Make a couple of temp file names in the proper directory.
+-
- dsttmp=$dstdir/#inst.$$#
- rmtmp=$dstdir/#rm.$$#
-+ dsttmp=$dstdir/_inst.$$_
-+ rmtmp=$dstdir/_rm.$$_
+-
+-# Trap to clean up temp files at exit.
+-
+- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+- trap '(exit $?); exit' 1 2 13 15
+-
+-# Move or copy the file name to the temp name
+-
+- $doit $instcmd "$src" "$dsttmp" &&
+-
+-# and set any options; do chmod last to preserve setuid bits
+-
+-# If any of these fail, we abort the whole thing. If we want to
+-# ignore errors from any of these, just make sure not to ignore
+-# errors from the above "$doit $instcmd $src $dsttmp" command.
+-
+- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
+- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
+- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
+- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
+-
+-# Now remove or move aside any old file at destination location. We try this
+-# two ways since rm can't unlink itself on some systems and the destination
+-# file might be busy for other reasons. In this case, the final cleanup
+-# might fail but the new file should still install successfully.
+-
+-{
+- if [ -f "$dstdir/$dstfile" ]
+- then
+- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
+- $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
+- {
+- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+- (exit 1); exit
+- }
+- else
+- :
+- fi
+-} &&
+-
+-# Now rename the file to the real destination.
+-
+- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+-
+-fi &&
- # Trap to clean up temp files at exit.
-
-diff -Nrua kdebase-3.1.94/admin/missing kdebase-patched/admin/missing
---- kdebase-3.1.94/admin/missing 2002-10-26 11:44:28.000000000 -0500
-+++ kdebase-patched/admin/missing 2003-12-15 22:48:04.000000000 -0600
-@@ -1,6 +1,6 @@
+ # The final little trick to "correctly" pass the exit status to the exit trap.
+-
+ {
+- (exit 0); exit
++ (exit 0); exit
+ }
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+diff -Nrua kdeaccessibility-3.2.1/admin/missing
kdeaccessibility-patched/admin/missing
+--- kdeaccessibility-3.2.1/admin/missing 2002-10-26 11:44:28.000000000
-0500
++++ kdeaccessibility-patched/admin/missing 2004-01-14 19:49:36.000000000
-0600
+@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation,
Inc.
++
++scriptversion=2003-09-02.23
++
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003
++# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <[EMAIL PROTECTED]>, 1996.
# This program is free software; you can redistribute it and/or modify
-@@ -165,7 +165,7 @@
- WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+@@ -38,12 +42,23 @@
+ configure_ac=configure.in
+ fi
+
++msg="missing on your system"
++
+ case "$1" in
+ --run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
++ # Exit code 63 means version mismatch. This often happens
++ # when the user try to use an ancient version of a tool on
++ # a file that requires a minimum version. In this case we
++ # we should proceed has if the program had been absent, or
++ # if --run hadn't been passed.
++ if test $? = 63; then
++ run=:
++ msg="probably too old"
++ fi
+ ;;
+ esac
+
+@@ -74,11 +89,13 @@
+ lex create \`lex.yy.c', if possible, from existing .c
+ makeinfo touch the output file
+ tar try tar, gnutar, gtar, then tar without non-portable flags
+- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
++ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
++
++Send bug reports to <bug-automake@gnu.org>."
+ ;;
+
+ -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+- echo "missing 0.4 - GNU automake"
++ echo "missing $scriptversion (GNU Automake)"
+ ;;
+
+ -*)
+@@ -94,7 +111,7 @@
+ fi
+
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
+ to install the \`Automake' and \`Perl' packages. Grab them from
+ any GNU archive site."
+@@ -108,7 +125,7 @@
+ fi
+
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified \`${configure_ac}'. You might want to install the
+ \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
+ archive site."
+@@ -122,7 +139,7 @@
+ fi
+
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acconfig.h' or \`${configure_ac}'. You might want
+ to install the \`Autoconf' and \`GNU m4' packages. Grab them
+ from any GNU archive site."
+@@ -146,7 +163,7 @@
+ fi
+
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+ You might want to install the \`Automake' and \`Perl' packages.
+ Grab them from any GNU archive site."
+@@ -162,10 +179,10 @@
+ fi
+
+ echo 1>&2 "\
+-WARNING: \`$1' is needed, and you do not seem to have it handy on your
+- system. You might have modified some files without having the
++WARNING: \`$1' is needed, but is $msg.
++ You might have modified some files without having the
proper tools for further handling them.
- You can get \`$1Help2man' as part of \`Autoconf' from any GNU
+ You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-@@ -326,7 +326,7 @@
- WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+@@ -185,7 +202,7 @@
+
+ bison|yacc)
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' $msg. You should only need it if
+ you modified a \`.y' file. You may need the \`Bison' package
+ in order for those modifications to take effect. You can get
+ \`Bison' from any GNU archive site."
+@@ -215,7 +232,7 @@
+
+ lex|flex)
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.l' file. You may need the \`Flex' package
+ in order for those modifications to take effect. You can get
+ \`Flex' from any GNU archive site."
+@@ -243,7 +260,7 @@
+ fi
+
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified a dependency of a manual page. You may need the
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+@@ -268,7 +285,7 @@
+ fi
+
+ echo 1>&2 "\
+-WARNING: \`$1' is missing on your system. You should only need it if
++WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.texi' or \`.texinfo' file, or any other file
+ indirectly affecting the aspect of the manual. The spurious
+ call might also be the consequence of using a buggy \`make' (AIX,
+@@ -323,10 +340,10 @@
+
+ *)
+ echo 1>&2 "\
+-WARNING: \`$1' is needed, and you do not seem to have it handy on your
+- system. You might have modified some files without having the
++WARNING: \`$1' is needed, and is $msg.
++ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequirements for installing
+ it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
-diff -Nrua kdebase-3.1.94/admin/ylwrap kdebase-patched/admin/ylwrap
---- kdebase-3.1.94/admin/ylwrap 2001-10-04 19:46:36.000000000 -0500
-+++ kdebase-patched/admin/ylwrap 2003-12-15 22:48:04.000000000 -0600
-@@ -1,6 +1,9 @@
+@@ -334,3 +351,10 @@
+ esac
+
+ exit 0
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+diff -Nrua kdeaccessibility-3.2.1/admin/mkinstalldirs
kdeaccessibility-patched/admin/mkinstalldirs
+--- kdeaccessibility-3.2.1/admin/mkinstalldirs 2002-10-26 11:53:16.000000000
-0500
++++ kdeaccessibility-patched/admin/mkinstalldirs 2004-01-14
19:49:36.000000000 -0600
+@@ -1,20 +1,32 @@
#! /bin/sh
+ # mkinstalldirs --- make directory hierarchy
+-# Author: Noah Friedman <[EMAIL PROTECTED]>
++
++scriptversion=2003-11-08.23
++
++# Original author: Noah Friedman <[EMAIL PROTECTED]>
+ # Created: 1993-05-16
+-# Public domain
++# Public domain.
++#
++# This file is maintained in Automake, please report
++# bugs to <bug-automake@gnu.org> or send patches to
++# <automake-patches@gnu.org>.
+
+ errstatus=0
+ dirmode=""
+
+ usage="\
+-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
++Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
++
++Create each directory DIR (with mode MODE, if specified), including all
++leading file name components.
++
++Report bugs to <bug-automake@gnu.org>."
+
+ # process command line arguments
+ while test $# -gt 0 ; do
+ case $1 in
+ -h | --help | --h*) # -h for help
+- echo "$usage" 1>&2
++ echo "$usage"
+ exit 0
+ ;;
+ -m) # -m PERM arg
+@@ -23,6 +35,10 @@
+ dirmode=$1
+ shift
+ ;;
++ --version)
++ echo "$0 $scriptversion"
++ exit 0
++ ;;
+ --) # stop option processing
+ shift
+ break
+@@ -55,12 +71,25 @@
+ if mkdir -p -- . 2>/dev/null; then
+ echo "mkdir -p -- $*"
+ exec mkdir -p -- "$@"
++ else
++ # On NextStep and OpenStep, the `mkdir' command does not
++ # recognize any option. It will interpret all options as
++ # directories to create, and then abort because `.' already
++ # exists.
++ test -d ./-p && rmdir ./-p
++ test -d ./-- && rmdir ./--
+ fi
+ ;;
+ *)
+ if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+ echo "mkdir -m $dirmode -p -- $*"
+ exec mkdir -m "$dirmode" -p -- "$@"
++ else
++ # Clean up after NextStep and OpenStep mkdir.
++ for d in ./-m ./-p ./-- "./$dirmode";
++ do
++ test -d $d && rmdir $d
++ done
+ fi
+ ;;
+ esac
+@@ -84,17 +113,17 @@
+ mkdir "$pathcomp" || lasterr=$?
+
+ if test ! -d "$pathcomp"; then
+- errstatus=$lasterr
++ errstatus=$lasterr
+ else
+- if test ! -z "$dirmode"; then
++ if test ! -z "$dirmode"; then
+ echo "chmod $dirmode $pathcomp"
+- lasterr=""
+- chmod "$dirmode" "$pathcomp" || lasterr=$?
++ lasterr=""
++ chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+- if test ! -z "$lasterr"; then
+- errstatus=$lasterr
+- fi
+- fi
++ if test ! -z "$lasterr"; then
++ errstatus=$lasterr
++ fi
++ fi
+ fi
+ fi
+
+@@ -107,5 +136,8 @@
+ # Local Variables:
+ # mode: shell-script
+ # sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
+ # End:
+-# mkinstalldirs ends here
+diff -Nrua kdeaccessibility-3.2.1/admin/ylwrap
kdeaccessibility-patched/admin/ylwrap
+--- kdeaccessibility-3.2.1/admin/ylwrap 2001-10-04 19:46:36.000000000
-0500
++++ kdeaccessibility-patched/admin/ylwrap 2004-01-14 19:49:36.000000000
-0600
+@@ -1,6 +1,11 @@
+ #! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
-# Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
++
++scriptversion=2003-11-18.20
++
++# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003
++# Free Software Foundation, Inc.
+#
-+# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003 Free Software
-+# Foundation, Inc.
-+#
# Written by Tom Tromey <[EMAIL PROTECTED]>.
#
# This program is free software; you can redistribute it and/or modify
-@@ -44,14 +47,6 @@
+@@ -22,44 +27,65 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+
+-# Usage:
+-# ylwrap INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
+-# * INPUT is the input file
+-# * OUTPUT is file PROG generates
+-# * DESIRED is file we actually want
+-# * PROGRAM is program to run
+-# * ARGS are passed to PROG
+-# Any number of OUTPUT,DESIRED pairs may be used.
++# This file is maintained in Automake, please report
++# bugs to <bug-automake@gnu.org> or send patches to
++# <automake-patches@gnu.org>.
++
++case "$1" in
++ '')
++ echo "$0: No files given. Try \`$0 --help' for more information." 1>&2
++ exit 1
++ ;;
++ --basedir)
++ basedir=$2
++ shift 2
++ ;;
++ -h|--h*)
++ cat <<\EOF
++Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM
[ARGS]...
++
++Wrapper for lex/yacc invocations, renaming files as desired.
++
++ INPUT is the input file
++ OUTPUT is one file PROG generates
++ DESIRED is the file we actually want instead of OUTPUT
++ PROGRAM is program to run
++ ARGS are passed to PROG
++
++Any number of OUTPUT,DESIRED pairs may be used.
++
++Report bugs to <bug-automake@gnu.org>.
++EOF
++ exit 0
++ ;;
++ -v|--v*)
++ echo "ylwrap $scriptversion"
++ exit 0
++ ;;
++esac
++
+
+ # The input.
+ input="$1"
+ shift
+ case "$input" in
+- [\\/]* | ?:[\\/]*)
++ [\\/]* | ?:[\\/]*)
+ # Absolute path; do nothing.
;;
+- *)
++ *)
+ # Relative path. Make it absolute.
+ input="`pwd`/$input"
+ ;;
esac
-# The directory holding the input.
@@ -1462,59 +2440,197 @@
-
pairlist=
while test "$#" -ne 0; do
- if test "$1" = "--"; then
-@@ -79,7 +74,10 @@
+- if test "$1" = "--"; then
+- shift
+- break
+- fi
+- pairlist="$pairlist $1"
+- shift
++ if test "$1" = "--"; then
++ shift
++ break
++ fi
++ pairlist="$pairlist $1"
++ shift
+ done
+ # The program to run.
+@@ -67,8 +93,8 @@
+ shift
+ # Make any relative path in $prog absolute.
+ case "$prog" in
+- [\\/]* | ?:[\\/]*) ;;
+- *[\\/]*) prog="`pwd`/$prog" ;;
++ [\\/]* | ?:[\\/]*) ;;
++ *[\\/]*) prog="`pwd`/$prog" ;;
+ esac
+
+ # FIXME: add hostname here for parallel makes that run commands on
+@@ -79,61 +105,105 @@
+
cd $dirname
-$prog ${1+"$@"} "$input"
+case $# in
-+ 0) $prog "$input" ;;
-+ *) $prog "$@" "$input" ;;
++ 0) $prog "$input" ;;
++ *) $prog "$@" "$input" ;;
+esac
status=$?
if test $status -eq 0; then
-@@ -94,6 +92,12 @@
- y_tab_nodot="yes"
- fi
-
-+ # The directory holding the input.
-+ input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
-+ # Quote $INPUT_DIR so we can use it in a regexp.
-+ # FIXME: really we should care about more than `.' and `\'.
-+ input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
-+
- while test "$#" -ne 0; do
- from="$1"
- # Handle y_tab.c and y_tab.h output by DOS
-@@ -114,11 +118,24 @@
- *) target="../$2";;
- esac
-
+- set X $pairlist
+- shift
+- first=yes
+- # Since DOS filename conventions don't allow two dots,
+- # the DOS version of Bison writes out y_tab.c instead of y.tab.c
+- # and y_tab.h instead of y.tab.h. Test to see if this is the case.
+- y_tab_nodot="no"
+- if test -f y_tab.c || test -f y_tab.h; then
+- y_tab_nodot="yes"
+- fi
+-
+- while test "$#" -ne 0; do
+- from="$1"
+- # Handle y_tab.c and y_tab.h output by DOS
+- if test $y_tab_nodot = "yes"; then
+- if test $from = "y.tab.c"; then
+- from="y_tab.c"
+- else
+- if test $from = "y.tab.h"; then
+- from="y_tab.h"
+- fi
+- fi
+- fi
+- if test -f "$from"; then
+- # If $2 is an absolute path name, then just use that,
+- # otherwise prepend `../'.
+- case "$2" in
+- [\\/]* | ?:[\\/]*) target="$2";;
+- *) target="../$2";;
+- esac
+-
- # Edit out `#line' or `#' directives. We don't want the
- # resulting debug information to point at an absolute srcdir;
- # it is better for it to just mention the .y file with no
- # path.
- sed -e "/^#/ s,$input_rx,," "$from" > "$target" || status=$?
-+ # Edit out `#line' or `#' directives.
-+ #
-+ # We don't want the resulting debug information to point at
-+ # an absolute srcdir; it is better for it to just mention the
-+ # .y file with no path.
-+ #
-+ # We want to use the real output file name, not yy.lex.c for
-+ # instance.
-+ #
-+ # We want the include guards to be adjusted too.
-+ FROM=`echo "$from" | sed \
-+ -e
'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
-+ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
-+ TARGET=`echo "$2" | sed \
-+ -e
'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
-+ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
-+ sed "/^#/{s,$input_rx,,;s,$from,$2,;s,$FROM,$TO,;}" "$from"
>"$target" ||
-+ status=$?
++ set X $pairlist
++ shift
++ first=yes
++ # Since DOS filename conventions don't allow two dots,
++ # the DOS version of Bison writes out y_tab.c instead of y.tab.c
++ # and y_tab.h instead of y.tab.h. Test to see if this is the case.
++ y_tab_nodot="no"
++ if test -f y_tab.c || test -f y_tab.h; then
++ y_tab_nodot="yes"
++ fi
++
++ # The directory holding the input.
++ input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
++ # Quote $INPUT_DIR so we can use it in a regexp.
++ # FIXME: really we should care about more than `.' and `\'.
++ input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
++
++ while test "$#" -ne 0; do
++ from="$1"
++ # Handle y_tab.c and y_tab.h output by DOS
++ if test $y_tab_nodot = "yes"; then
++ if test $from = "y.tab.c"; then
++ from="y_tab.c"
else
- # A missing file is only an error for the first file. This
- # is a blatant hack to let us support using "yacc -d". If -d
+- # A missing file is only an error for the first file. This
+- # is a blatant hack to let us support using "yacc -d". If -d
+- # is not specified, we don't want an error when the header
+- # file is "missing".
+- if test $first = yes; then
+- status=1
+- fi
++ if test $from = "y.tab.h"; then
++ from="y_tab.h"
++ fi
+ fi
+- shift
+- shift
+- first=no
+- done
++ fi
++ if test -f "$from"; then
++ # If $2 is an absolute path name, then just use that,
++ # otherwise prepend `../'.
++ case "$2" in
++ [\\/]* | ?:[\\/]*) target="$2";;
++ *) target="../$2";;
++ esac
++
++ # We do not want to overwrite a header file if it hasn't
++ # changed. This avoid useless recompilations. However the
++ # parser itself (the first file) should always be updated,
++ # because it is the destination of the .y.c rule in the
++ # Makefile. Divert the output of all other files to a temporary
++ # file so we can compare them to existing versions.
++ if test $first = no; then
++ realtarget="$target"
++ target="tmp-`echo $target | sed s/.*[\\/]//g`"
++ fi
++ # Edit out `#line' or `#' directives.
++ #
++ # We don't want the resulting debug information to point at
++ # an absolute srcdir; it is better for it to just mention the
++ # .y file with no path.
++ #
++ # We want to use the real output file name, not yy.lex.c for
++ # instance.
++ #
++ # We want the include guards to be adjusted too.
++ FROM=`echo "$from" | sed \
++ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
++ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
++ TARGET=`echo "$2" | sed \
++ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
++ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
++
++ sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
++ -e "s,$FROM,$TARGET," "$from" >"$target" || status=$?
++
++ # Check whether header files must be updated.
++ if test $first = no; then
++ if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
++ echo "$2" is unchanged
++ rm -f "$target"
++ else
++ echo updating "$2"
++ mv -f "$target" "$realtarget"
++ fi
++ fi
++ else
++ # A missing file is only an error for the first file. This
++ # is a blatant hack to let us support using "yacc -d". If -d
++ # is not specified, we don't want an error when the header
++ # file is "missing".
++ if test $first = yes; then
++ status=1
++ fi
++ fi
++ shift
++ shift
++ first=no
++ done
+ else
+- status=$?
++ status=$?
+ fi
+
+ # Remove the directory.
+@@ -141,3 +211,12 @@
+ rm -rf $dirname
+
+ exit $status
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
Modified: trunk/packages/kdeaccessibility/debian/patches/05_pedantic-errors.diff
===================================================================
--- trunk/packages/kdeaccessibility/debian/patches/05_pedantic-errors.diff
2004-03-22 01:16:28 UTC (rev 68)
+++ trunk/packages/kdeaccessibility/debian/patches/05_pedantic-errors.diff
2004-03-22 02:59:19 UTC (rev 69)
@@ -1,6 +1,6 @@
-diff -Nrua kdebase-3.1.95/admin/acinclude.m4.in
kdebase-patched/admin/acinclude.m4.in
---- kdebase-3.1.95/admin/acinclude.m4.in 2004-01-21 22:30:54.000000000
-0600
-+++ kdebase-patched/admin/acinclude.m4.in 2004-01-21 22:48:10.000000000
-0600
+diff -Nrua kdeaccessibility-3.2.1/admin/acinclude.m4.in
kdeaccessibility-patched/admin/acinclude.m4.in
+--- kdeaccessibility-3.2.1/admin/acinclude.m4.in 2004-02-23
15:30:44.000000000 -0600
++++ kdeaccessibility-patched/admin/acinclude.m4.in 2004-03-02
00:25:48.000000000 -0600
@@ -2108,9 +2108,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
