[Pkg-kde-commits] rev 329 - branches/kde-3.3.2/kdenetwork/debian/patches
Adeodato Sim??
dato-guest@haydn.debian.org
Fri, 17 Dec 2004 08:03:34 -0700
Author: dato-guest
Date: 2004-12-17 08:02:19 -0700 (Fri, 17 Dec 2004)
New Revision: 329
Added:
branches/kde-3.3.2/kdenetwork/debian/patches/01_kdenetwork_branch.diff.uu
Removed:
branches/kde-3.3.2/kdenetwork/debian/patches/01_kdenetwork_branch.diff
Modified:
branches/kde-3.3.2/kdenetwork/debian/patches/02_autotools_update.diff
Log:
uuencode branch diff, update autotools patch.
Deleted: branches/kde-3.3.2/kdenetwork/debian/patches/01_kdenetwork_branch.diff
Added: branches/kde-3.3.2/kdenetwork/debian/patches/01_kdenetwork_branch.diff.uu
===================================================================
--- branches/kde-3.3.2/kdenetwork/debian/patches/01_kdenetwork_branch.diff.uu 2004-12-17 14:58:29 UTC (rev 328)
+++ branches/kde-3.3.2/kdenetwork/debian/patches/01_kdenetwork_branch.diff.uu 2004-12-17 15:02:19 UTC (rev 329)
@@ -0,0 +1,322 @@
+begin 644 01_kdenetwork_branch.diff
+M9&EF9B`M3G)U82`M>"!#5E,@+7@@0U93(&MD96YE='=O<FLM,RXS+C(O861M
+M:6XO86-I;F-L=61E+FTT+FEN(&MD96YE='=O<FLO861M:6XO86-I;F-L=61E
+M+FTT+FEN"BTM+2!K9&5N971W;W)K+3,N,RXR+V%D;6EN+V%C:6YC;'5D92YM
+M-"YI;@DR,#`T+3$R+3$W(#`R.C0T.C,S+C`P,#`P,#`P,"`K,#$P,`HK*RL@
+M:V1E;F5T=V]R:R]A9&UI;B]A8VEN8VQU9&4N;30N:6X),C`P-"TQ,BTP.2`R
+M,CHR,CHQ-"XP,#`P,#`P,#`@*S`Q,#`*0$`@+30R-30L-R`K-#(U-"PX($!`
+M"B`*($%#7T1%1E5.*%M+1$5?0TA%0TM?4%E42$].72P*(%L*+2`@2T1%7T-(
+M14-+7U!95$A/3E])3E1%4DXH(C(N,R(L(`HK("!+1$5?0TA%0TM?4%E42$].
+M7TE.5$523B@B,BXT(BP**R`@(%M+1$5?0TA%0TM?4%E42$].7TE.5$523B@B
+M,BXS(BP@"B`@("!;2T1%7T-(14-+7U!95$A/3E])3E1%4DXH(C(N,B(L(`H@
+M("`@("!;2T1%7T-(14-+7U!95$A/3E])3E1%4DXH(C(N,2(L(`H@("`@("`@
+M(%M+1$5?0TA%0TM?4%E42$].7TE.5$523B@B,BXP(BP@"D!`("TT,C8R+#8@
+M*S0R-C,L-R!`0`H@("`@("`@(%TI"B`@("`@(%TI"B`@("!=*0HK("!=*0H@
+M72D*(`H@04-?1$5&54XH6TM$15]#2$5#2U]35$Q=+`ID:69F("U.<G5A("UX
+M($-64R`M>"!#5E,@:V1E;F5T=V]R:RTS+C,N,B]K;W!E=&4O:V]P971E+V-H
+M871W:6YD;W<O8VAA='9I97<N8W!P(&MD96YE='=O<FLO:V]P971E+VMO<&5T
+M92]C:&%T=VEN9&]W+V-H871V:65W+F-P<`HM+2T@:V1E;F5T=V]R:RTS+C,N
+M,B]K;W!E=&4O:V]P971E+V-H871W:6YD;W<O8VAA='9I97<N8W!P"3(P,#0M
+M,3(M,3<@,#(Z-#0Z,S0N,#`P,#`P,#`P("LP,3`P"BLK*R!K9&5N971W;W)K
+M+VMO<&5T92]K;W!E=&4O8VAA='=I;F1O=R]C:&%T=FEE=RYC<'`),C`P-"TQ
+M,BTQ-2`Q.#HS,SHR,BXP,#`P,#`P,#`@*S`Q,#`*0$`@+3@U+#$W("LX-2PR
+M,"!`0`H@(V1E9FEN92!)1%]45"`Y-PH@(V1E9FEN92!)1%]53"`Y.0H@"BMC
+M;&%S<R!#:&%T5FEE=TUE;6)E<G-4:7`["B`*(&-L87-S($MO<&5T94-H8716
+M:65W4')I=F%T90H@>PH@"7!U8FQI8SH*(`D)2V]P971E6%-,5"`J>'-L=%!A
+M<G-E<CL**PD)0VAA=%9I97=-96UB97)S5&EP("IM96UB97)S5&EP.PH@?3L*
+M(`H@8VQA<W,@0VAA=%9I97=-96UB97)S5&EP(#H@<'5B;&EC(%%4;V]L5&EP
+M"B!["B`)<'5B;&EC.@H@"0E#:&%T5FEE=TUE;6)E<G-4:7`H($M,:7-T5FEE
+M=R`J<&%R96YT("D["BL)"7Y#:&%T5FEE=TUE;6)E<G-4:7`H*3L*(`D)=F]I
+M9"!M87EB951I<"@@8V]N<W0@45!O:6YT("9P;W,@*3L*(`H@"7!R:79A=&4Z
+M"D!`("TQ,#<L-B`K,3$P+#$R($!`"B`);5]L:7-T5FEE=R`]('!A<F5N=#L*
+M('T*(`HK0VAA=%9I97=-96UB97)S5&EP.CI^0VAA=%9I97=-96UB97)S5&EP
+M*"D**WL**PER96UO=F4H(&U?;&ES=%9I97<M/G9I97=P;W)T*"D@*3L**WT*
+M*PHK"B!V;VED($-H8716:65W365M8F5R<U1I<#HZ;6%Y8F54:7`H(&-O;G-T
+M(%%0;VEN="`F<&]S("D*('L*(`EI9B@@(6U?;&ES=%9I97<@*0I`0"`M,C<Y
+M+#8@*S(X."PW($!`"B`);5]T>7!E(#T@2V]P971E365S<V%G93HZ0VAA=#L*
+M(`EM7VUA:6Y7:6YD;W<@/2`P3#L*(`EM96UB97)S1&]C:R`](#!,.PHK"60M
+M/FUE;6)E<G-4:7`@/2`P.PH@"6)A8VMG<F]U;F1&:6QE(#T@45-T<FEN9SHZ
+M;G5L;#L*(`ER;V]T(#T@,$P["B`):7-!8W1I=F4@/2!F86QS93L*0$`@+3,R
+M,"PW("LS,S`L-R!`0`H@"7-A=F5/<'1I;VYS*"D["B`*(`ED96QE=&4@;4-O
+M;7!L971E.PHM"BL)9&5L971E(&0M/FUE;6)E<G-4:7`["B`)9&5L971E(&0[
+M"B!]"B`*0$`@+3,V."PV("LS-S@L-R!`0`H@"4M&:6QE1&EA;&]G(&1L9R@@
+M45-T<FEN9SHZ;G5L;"P@45-T<FEN9SHZ9G)O;4QA=&EN,2@@(G1E>'0O:'1M
+M;"!T97AT+WAM;"!T97AT+W!L86EN(B`I+"!T:&ES("P@(F9I;&53879E1&EA
+M;&]G(BP@9F%L<V4@*3L*(`ED;&<N<V5T0V%P=&EO;B@@:3$X;B@@(E-A=F4@
+M0V]N=F5R<V%T:6]N(B`I("D["B`)9&QG+G-E=$]P97)A=&EO;DUO9&4H($M&
+M:6QE1&EA;&]G.CI3879I;F<@*3L**PED;&<N<V5T36]D92@@2T9I;&4Z.DQO
+M8V%L3VYL>2`I.R`O+R!792!C86XG="!S879E(')E;6]T96QY('5S:6YG(%%4
+M97AT4W1R96%M"B`*(`EI9B@@9&QG+F5X96,H*2`A/2!11&EA;&]G.CI!8V-E
+M<'1E9"`I"B`)"7)E='5R;CL*0$`@+34S-RPW("LU-#@L-R!`0`H@"0D)45-T
+M<FEN9SHZ9G)O;4QA=&EN,2@@(FUE;6)E<G-$;V-K(B`I+"!14W1R:6YG.CIF
+M<F]M3&%T:6XQ*"`B("(@*2`I.PH@"0EM96UB97)S3&ES="`](&YE=R!+3&ES
+M=%9I97<H('1H:7,L(")M96UB97)S3&ES="(@*3L*(`D);65M8F5R<TQI<W0M
+M/G-E=%-H;W=4;V]L5&EP<R@@9F%L<V4@*3L*+0D);F5W($-H8716:65W365M
+M8F5R<U1I<"@@;65M8F5R<TQI<W0@*3L**PD)9"T^;65M8F5R<U1I<"`](&YE
+M=R!#:&%T5FEE=TUE;6)E<G-4:7`H(&UE;6)E<G-,:7-T("D["B`)"6UE;6)E
+M<G-,:7-T+3YS971!;&Q#;VQU;6YS4VAO=T9O8W5S*"!T<G5E("D["B`)"6UE
+M;6)E<G-,:7-T+3YA9&1#;VQU;6XH(&DQ.&XH(D-H870@365M8F5R<R(I+"`M
+M,2`I.PH@"0EM96UB97)S3&ES="T^<V5T4V]R=&EN9R@@,"P@=')U92`I.PID
+M:69F("U.<G5A("UX($-64R`M>"!#5E,@:V1E;F5T=V]R:RTS+C,N,B]K;W!E
+M=&4O<&QU9VEN<R]C;VYN96-T:6]N<W1A='5S+V-O;FYE8W1I;VYS=&%T=7-P
+M;'5G:6XN8W!P(&MD96YE='=O<FLO:V]P971E+W!L=6=I;G,O8V]N;F5C=&EO
+M;G-T871U<R]C;VYN96-T:6]N<W1A='5S<&QU9VEN+F-P<`HM+2T@:V1E;F5T
+M=V]R:RTS+C,N,B]K;W!E=&4O<&QU9VEN<R]C;VYN96-T:6]N<W1A='5S+V-O
+M;FYE8W1I;VYS=&%T=7-P;'5G:6XN8W!P"3(P,#0M,3(M,3<@,#(Z-#0Z,S4N
+M,#`P,#`P,#`P("LP,3`P"BLK*R!K9&5N971W;W)K+VMO<&5T92]P;'5G:6YS
+M+V-O;FYE8W1I;VYS=&%T=7,O8V]N;F5C=&EO;G-T871U<W!L=6=I;BYC<'`)
+M,C`P-"TQ,BTP-R`R,#HP,3HS-2XP,#`P,#`P,#`@*S`Q,#`*0$`@+38U+#<@
+M*S8U+#<@0$`*(`DO+R!N971S=&%T("UR;B!I;B!S;&]T4')O8V5S<U-T9&]U
+M="@I('1O('-E92!I9B!I="!M96YT:6]N<R!T:&4*(`DO+R!D969A=6QT(&=A
+M=&5W87DN($EF('-O+"!W92=R92!C;VYN96-T960L(&EF(&YO="P@=V4G<F4@
+M;V9F;&EN90H@"6U?<')O8V5S<R`](&YE=R!+4')O8V5S<SL*+0DJ;5]P<F]C
+M97-S(#P\(")N971S=&%T(B`\/"`B+7)N(CL**PDJ;5]P<F]C97-S(#P\(")N
+M971S=&%T(B`\/"`B+7(B.PH@"B`)8V]N;F5C="@@;5]P<F]C97-S+"!324=.
+M04PH(')E8V5I=F5D4W1D;W5T*"!+4')O8V5S<R`J+"!C:&%R("HL(&EN="`I
+M("DL('1H:7,L(%-,3U0H('-L;W10<F]C97-S4W1D;W5T*"!+4')O8V5S<R`J
+M+"!C:&%R("HL(&EN="`I("D@*3L*(`EC;VYN96-T*"!M7W!R;V-E<W,L(%-)
+M1TY!3"@@<')O8V5S<T5X:71E9"@@2U!R;V-E<W,@*B`I("DL('1H:7,L(%-,
+M3U0H('-L;W10<F]C97-S17AI=&5D*"!+4')O8V5S<R`J("D@*2`I.PID:69F
+M("U.<G5A("UX($-64R`M>"!#5E,@:V1E;F5T=V]R:RTS+C,N,B]K;W!E=&4O
+M<&QU9VEN<R]T<F%N<VQA=&]R+VMO<&5T95]T<F%N<VQA=&]R7V-O;F9I9RYD
+M97-K=&]P(&MD96YE='=O<FLO:V]P971E+W!L=6=I;G,O=')A;G-L871O<B]K
+M;W!E=&5?=')A;G-L871O<E]C;VYF:6<N9&5S:W1O<`HM+2T@:V1E;F5T=V]R
+M:RTS+C,N,B]K;W!E=&4O<&QU9VEN<R]T<F%N<VQA=&]R+VMO<&5T95]T<F%N
+M<VQA=&]R7V-O;F9I9RYD97-K=&]P"3(P,#0M,3(M,3<@,#(Z-#0Z,S4N,#`P
+M,#`P,#`P("LP,3`P"BLK*R!K9&5N971W;W)K+VMO<&5T92]P;'5G:6YS+W1R
+M86YS;&%T;W(O:V]P971E7W1R86YS;&%T;W)?8V]N9FEG+F1E<VMT;W`),C`P
+M-"TQ,BTQ-"`P.#HR.3HU,RXP,#`P,#`P,#`@*S`Q,#`*0$`@+3$T+#8@*S$T
+M+#<@0$`*($YA;65;87)=/=BGV839A=BJV+'8K-F%"B!.86UE6V)E73W0G]"U
+MT8#0L-"ZT+O0L-"TT8?1B]"Z"B!.86UE6V)G73W0G]&`T+70LM"^T+30L-&'
+M"BM.86UE6V)R73U4<F]E<@H@3F%M95MB<UT]4')E=F]D:6QA8PH@3F%M95MC
+M85T]5')A9'5C=&]R"B!.86UE6V-S73U0Q9EE:VQA9&'$C0ID:69F("U.<G5A
+M("UX($-64R`M>"!#5E,@:V1E;F5T=V]R:RTS+C,N,B]K;W!E=&4O<&QU9VEN
+M<R]T<F%N<VQA=&]R+VMO<&5T95]T<F%N<VQA=&]R+F1E<VMT;W`@:V1E;F5T
+M=V]R:R]K;W!E=&4O<&QU9VEN<R]T<F%N<VQA=&]R+VMO<&5T95]T<F%N<VQA
+M=&]R+F1E<VMT;W`*+2TM(&MD96YE='=O<FLM,RXS+C(O:V]P971E+W!L=6=I
+M;G,O=')A;G-L871O<B]K;W!E=&5?=')A;G-L871O<BYD97-K=&]P"3(P,#0M
+M,3(M,3<@,#(Z-#0Z,S4N,#`P,#`P,#`P("LP,3`P"BLK*R!K9&5N971W;W)K
+M+VMO<&5T92]P;'5G:6YS+W1R86YS;&%T;W(O:V]P971E7W1R86YS;&%T;W(N
+M9&5S:W1O<`DR,#`T+3$R+3$T(#`X.C(Y.C4R+C`P,#`P,#`P,"`K,#$P,`I`
+M0"`M,3@L-B`K,3@L-R!`0`H@3F%M95MA<ET]V*?9A-F%V*K8L=BLV84*($YA
+M;65;8F5=/="?T+71@-"PT+K0N]"PT+31A]&+T+H*($YA;65;8F==/="?T8#0
+MM="RT+[0M-"PT8<**TYA;65;8G)=/51R;V5R"B!.86UE6V)S73U0<F5V;V1I
+M;&%C"B!.86UE6V-A73U4<F%D=6-T;W(*($YA;65;8W-=/5#%F65K;&%D8<2-
+M"F1I9F8@+4YR=6$@+7@@0U93("UX($-64R!K9&5N971W;W)K+3,N,RXR+VMO
+M<&5T92]P<F]T;V-O;',O9V%D=2]G861U9&-C=')A;G-A8W1I;VXN8W!P(&MD
+M96YE='=O<FLO:V]P971E+W!R;W1O8V]L<R]G861U+V=A9'5D8V-T<F%N<V%C
+M=&EO;BYC<'`*+2TM(&MD96YE='=O<FLM,RXS+C(O:V]P971E+W!R;W1O8V]L
+M<R]G861U+V=A9'5D8V-T<F%N<V%C=&EO;BYC<'`),C`P-"TQ,BTQ-R`P,CHT
+M-#HS-2XP,#`P,#`P,#`@*S`Q,#`**RLK(&MD96YE='=O<FLO:V]P971E+W!R
+M;W1O8V]L<R]G861U+V=A9'5D8V-T<F%N<V%C=&EO;BYC<'`),C`P-"TQ,BTQ
+M,R`Q,SHT.#HU."XP,#`P,#`P,#`@*S`Q,#`*0$`@+30T+#$T("LT-"PQ-"!`
+M0`H@(VEN8VQU9&4@(FQI8F=A9'4N:"(*(`H@1V%D=41#0U1R86YS86-T:6]N
+M.CI'861U1$-#5')A;G-A8W1I;VXH(&=G7V1C8RH@<V]C:V5T+"!'861U1$-#
+M*B!P87)E;G0L(&-O;G-T(&-H87(J(&YA;64@*0HM.E%/8FIE8W0H('!A<F5N
+M="P@;F%M92`I+"!R96%D7R@@3E5,3"`I+"!W<FET95\H($Y53$P@*2P@86-C
+M;W5N="@@3E5,3"`I+"!C;VYT86-T*"!.54Q,("DL('1R86YS9F5R7R@@3E5,
+M3"`I(`HK.E%/8FIE8W0H('!A<F5N="P@;F%M92`I+"!R96%D7R@@3E5,3"`I
+M+"!W<FET95\H($Y53$P@*2P@86-C;W5N="@@3E5,3"`I+"!C;VYT86-T*"!.
+M54Q,("DL('1R86YS9F5R7R@@3E5,3"`I+"!P965R*"`P("D@"B!["B`)9&-C
+M4V]C:U\@/2!S;V-K970["B`)9V%D=41#0U\@/2!P87)E;G0["B!]"B`*($=A
+M9'5$0T-4<F%N<V%C=&EO;CHZ1V%D=41#0U1R86YS86-T:6]N*"!G9U]D8V,J
+M('-O8VME="P@1V%D=4-O;G1A8W0J(&-O;G0L($=A9'5$0T,J('!A<F5N="P@
+M8V]N<W0@8VAA<BH@;F%M92`I"BTZ44]B:F5C="@@<&%R96YT+"!N86UE*2P@
+M<F5A9%\H($Y53$P@*2P@=W)I=&5?*"!.54Q,("DL(&%C8V]U;G0H($Y53$P@
+M*2P@8V]N=&%C="@@8V]N="`I+"!T<F%N<V9E<E\H($Y53$P@*0HK.E%/8FIE
+M8W0H('!A<F5N="P@;F%M92DL(')E861?*"!.54Q,("DL('=R:71E7R@@3E5,
+M3"`I+"!A8V-O=6YT*"!.54Q,("DL(&-O;G1A8W0H(&-O;G0@*2P@=')A;G-F
+M97)?*"!.54Q,("DL('!E97(H(#`@*0H@>PH@"61C8U-O8VM?(#T@<V]C:V5T
+M.PH@"6=A9'5$0T-?(#T@<&%R96YT.PID:69F("U.<G5A("UX($-64R`M>"!#
+M5E,@:V1E;F5T=V]R:RTS+C,N,B]K;W!E=&4O<')O=&]C;VQS+V=A9'4O9V%D
+M=61C8W1R86YS86-T:6]N+F@@:V1E;F5T=V]R:R]K;W!E=&4O<')O=&]C;VQS
+M+V=A9'4O9V%D=61C8W1R86YS86-T:6]N+F@*+2TM(&MD96YE='=O<FLM,RXS
+M+C(O:V]P971E+W!R;W1O8V]L<R]G861U+V=A9'5D8V-T<F%N<V%C=&EO;BYH
+M"3(P,#0M,3(M,3<@,#(Z-#0Z,S4N,#`P,#`P,#`P("LP,3`P"BLK*R!K9&5N
+M971W;W)K+VMO<&5T92]P<F]T;V-O;',O9V%D=2]G861U9&-C=')A;G-A8W1I
+M;VXN:`DR,#`T+3$R+3$S(#$S.C0X.C4X+C`P,#`P,#`P,"`K,#$P,`I`0"`M
+M-SDL-R`K-SDL-R!`0`H@"4MO<&5T951R86YS9F5R*B!T<F%N<V9E<E\["B`)
+M;&]N9R!T<F%N<V9E<DED7SL*(`E11FEL92!L;V-A;$9I;&5?.PHM"6)O;VP@
+M<&5E<CL**PEI;G0@<&5E<CL*(`EU;G-I9VYE9"!I;G0@:6YC;VUI;F<["B`)
+M1V%D=41#0RH@9V%D=41#0U\["B!].PID:69F("U.<G5A("UX($-64R`M>"!#
+M5E,@:V1E;F5T=V]R:RTS+C,N,B]K;W!E=&4O<')O=&]C;VQS+V=A9'4O;&EB
+M9V%D=2]C;VUM;VXN8R!K9&5N971W;W)K+VMO<&5T92]P<F]T;V-O;',O9V%D
+M=2]L:6)G861U+V-O;6UO;BYC"BTM+2!K9&5N971W;W)K+3,N,RXR+VMO<&5T
+M92]P<F]T;V-O;',O9V%D=2]L:6)G861U+V-O;6UO;BYC"3(P,#0M,3(M,3<@
+M,#(Z-#0Z,S4N,#`P,#`P,#`P("LP,3`P"BLK*R!K9&5N971W;W)K+VMO<&5T
+M92]P<F]T;V-O;',O9V%D=2]L:6)G861U+V-O;6UO;BYC"3(P,#0M,3(M,#<@
+M,3,Z-3@Z,S0N,#`P,#`P,#`P("LP,3`P"D!`("TQ+#0@*S$L-"!`0`HM+RH@
+M)$ED.B!C;VUM;VXN8RQV(#$N,2XT+C$@,C`P-"\Q,"\R.2`Q,SHT,3HR,2!G
+M:B!%>'`@)"`J+PHK+RH@)$ED.B!C;VUM;VXN8RQV(#$N,2XT+C(@,C`P-"\Q
+M,B\P-R`Q,CHU.#HS-"!D:G5R8F%N($5X<"`D("HO"B`*("\J"B`@*B`@*$,I
+M($-O<'ER:6=H="`R,#`Q+3(P,#(@5V]J=&5K($MA;FEE=W-K:2`\=V]J=&5K
+M:V%`:7)C+G!L/@I`0"`M-C$S+#<@*S8Q,RPW($!`"B`):68@*"%R97,I"B`)
+M"7)E='5R;B!.54Q,.PH@"0HM"7=H:6QE("AJ(#P](&QE;BD@>PHK"7=H:6QE
+M("AJ(#P@;&5N*2!["B`)"7-W:71C:"`H:2`E(#0I('L*(`D)"6-A<V4@,#H*
+M(`D)"0EK(#T@*&)U9EMJ72`F(#(U,BD@/CX@,CL*9&EF9B`M3G)U82`M>"!#
+M5E,@+7@@0U93(&MD96YE='=O<FLM,RXS+C(O:V]P971E+W!R;W1O8V]L<R]G
+M861U+VQI8F=A9'4O;&EB9V%D=2YC(&MD96YE='=O<FLO:V]P971E+W!R;W1O
+M8V]L<R]G861U+VQI8F=A9'4O;&EB9V%D=2YC"BTM+2!K9&5N971W;W)K+3,N
+M,RXR+VMO<&5T92]P<F]T;V-O;',O9V%D=2]L:6)G861U+VQI8F=A9'4N8PDR
+M,#`T+3$R+3$W(#`R.C0T.C,U+C`P,#`P,#`P,"`K,#$P,`HK*RL@:V1E;F5T
+M=V]R:R]K;W!E=&4O<')O=&]C;VQS+V=A9'4O;&EB9V%D=2]L:6)G861U+F,)
+M,C`P-"TQ,BTQ-2`R,CHS,#HR,2XP,#`P,#`P,#`@*S`Q,#`*0$`@+3$L-"`K
+M,2PT($!`"BTO*B`D260Z(&QI8F=A9'4N8RQV(#$N,2XT+C$@,C`P-"\Q,"\R
+M.2`Q,SHT,3HR,2!G:B!%>'`@)"`J+PHK+RH@)$ED.B!L:6)G861U+F,L=B`Q
+M+C$N-"XR(#(P,#0O,3(O,34@,C$Z,S`Z,C$@9&IU<F)A;B!%>'`@)"`J+PH@
+M"B`O*@H@("H@("A#*2!#;W!Y<FEG:'0@,C`P,2TR,#`S(%=O:G1E:R!+86YI
+M97=S:VD@/'=O:G1E:VMA0&ER8RYP;#X*0$`@+3<Q+#<@*S<Q+#<@0$`*("-I
+M9F1E9B!?7T=.54-?7PH@7U]A='1R:6)U=&5?7R`H*'5N=7-E9"DI"B`C96YD
+M:68*+3T@(B1)9#H@;&EB9V%D=2YC+'8@,2XQ+C0N,2`R,#`T+S$P+S(Y(#$S
+M.C0Q.C(Q(&=J($5X<"`D(CL**ST@(B1)9#H@;&EB9V%D=2YC+'8@,2XQ+C0N
+M,B`R,#`T+S$R+S$U(#(Q.C,P.C(Q(&1J=7)B86X@17AP("0B.PH@(V5N9&EF
+M(`H@"B`O*@I`0"`M,C0P+#8@*S(T,"PX($!`"B`)<W1R=6-T(&=G7W)E<V]L
+M=F5?<'1H<F5A9%]D871A("ID(#T@87)G.PH@"7-T<G5C="!I;E]A9&1R(&$[
+M"B`**PEP=&AR96%D7V1E=&%C:"AP=&AR96%D7W-E;&8H*2D["BL*(`EI9B`H
+M*&$N<U]A9&1R(#T@:6YE=%]A9&1R*&0M/FAO<W1N86UE*2D@/3T@24Y!1$12
+M7TY/3D4I('L*(`D)<W1R=6-T(&EN7V%D9'(@*FAN.PH@"0D*9&EF9B`M3G)U
+M82`M>"!#5E,@+7@@0U93(&MD96YE='=O<FLM,RXS+C(O:V]P971E+W!R;W1O
+M8V]L<R]J86)B97(O:F%B8F5R<F5S;W5R8V5P;V]L+F-P<"!K9&5N971W;W)K
+M+VMO<&5T92]P<F]T;V-O;',O:F%B8F5R+VIA8F)E<G)E<V]U<F-E<&]O;"YC
+M<'`*+2TM(&MD96YE='=O<FLM,RXS+C(O:V]P971E+W!R;W1O8V]L<R]J86)B
+M97(O:F%B8F5R<F5S;W5R8V5P;V]L+F-P<`DR,#`T+3$R+3$W(#`R.C0T.C,V
+M+C`P,#`P,#`P,"`K,#$P,`HK*RL@:V1E;F5T=V]R:R]K;W!E=&4O<')O=&]C
+M;VQS+VIA8F)E<B]J86)B97)R97-O=7)C97!O;VPN8W!P"3(P,#0M,3$M,S`@
+M,#,Z,3,Z,#DN,#`P,#`P,#`P("LP,3`P"D!`("TR,#0L-R`K,C`T+#<@0$`*
+M(`E["B`)"6EF("@@*&U297-O=7)C92T^:FED*"DN=7-E<DAO<W0H*2YL;W=E
+M<B@I(#T](&II9"YU<V5R2&]S="@I+FQO=V5R*"DI("D*(`D)>PHM"0D);4QO
+M8VM,:7-T+G)E;6]V92`H*3L**PD)"6U,;V-K3&ES="YR96UO=F4@*&U297-O
+M=7)C92D["B`)"7T*(`E]"B`*9&EF9B`M3G)U82`M>"!#5E,@+7@@0U93(&MD
+M96YE='=O<FLM,RXS+C(O:W)F8B]K8VU?:W)F8B]K8VU?:W)F8BYC<'`@:V1E
+M;F5T=V]R:R]K<F9B+VMC;5]K<F9B+VMC;5]K<F9B+F-P<`HM+2T@:V1E;F5T
+M=V]R:RTS+C,N,B]K<F9B+VMC;5]K<F9B+VMC;5]K<F9B+F-P<`DR,#`T+3$R
+M+3$W(#`R.C0T.C0P+C`P,#`P,#`P,"`K,#$P,`HK*RL@:V1E;F5T=V]R:R]K
+M<F9B+VMC;5]K<F9B+VMC;5]K<F9B+F-P<`DR,#`T+3$R+3$T(#$Q.C`Q.C(T
+M+C`P,#`P,#`P,"`K,#$P,`I`0"`M-#<L-R`K-#<L-R!`0`H@97AT97)N(")#
+M(B!["B`@('9O:60@*FEN:71?:V-M7VMR9F(H*2!["B`@("`@2T=L;V)A;#HZ
+M;&]C86QE*"DM/FEN<V5R=$-A=&%L;V=U92@B:W)F8B(I.R`O+R!&;W(@:6YV
+M:71A=&EO;B!T<F%N<VQA=&EO;G,*+2`@("!R971U<FX@;F5W($MC;4M29F)&
+M86-T;W)Y*")K8VU?:W)F8B(I.R`**R`@("!R971U<FX@;F5W($MC;4M29F)&
+M86-T;W)Y*")K8VU?:W)F8B(I.PH@("!]"B!]"B`*0$`@+3@P+#D@*S@P+#D@
+M0$`*(`EC;VYN96-T*&U?8V]N9E=I9&=E="T^86QL;W=$97-K=&]P0V]N=')O
+M;$-"+"!324=.04PH8VQI8VME9"@I*2P@4TQ/5"AC;VYF:6=#:&%N9V5D*"DI
+M("D["B`)8V]N;F5C="AM7V-O;F97:61G970M/F%U=&]0;W)T0T(L(%-)1TY!
+M3"AC;&EC:V5D*"DI+"!33$]4*&-O;F9I9T-H86YG960H*2D@*3L*(`EC;VYN
+M96-T*&U?8V]N9E=I9&=E="T^<&]R=$EN<'5T+"!324=.04PH=F%L=65#:&%N
+M9V5D*&EN="DI+"!33$]4*&-O;F9I9T-H86YG960H*2D@*3L*+0EC;VYN96-T
+M*"A13V)J96-T*BEM7V-O;F97:61G970M/FUA;F%G94EN=FET871I;VYS+"!3
+M24=.04PH8VQI8VME9"@I*2P@"BL)8V]N;F5C="@H44]B:F5C="HI;5]C;VYF
+M5VED9V5T+3YM86YA9V5);G9I=&%T:6]N<RP@4TE'3D%,*&-L:6-K960H*2DL
+M"B`)"29M7V-O;F9I9W5R871I;VXL(%-,3U0H<VAO=TUA;F%G94EN=FET871I
+M;VYS1&EA;&]G*"DI("D["BT)8V]N;F5C="@F;5]C;VYF:6=U<F%T:6]N+"!3
+M24=.04PH:6YV:71A=&EO;DYU;4-H86YG960H:6YT*2DL(`HK"6-O;FYE8W0H
+M)FU?8V]N9FEG=7)A=&EO;BP@4TE'3D%,*&EN=FET871I;VY.=6U#:&%N9V5D
+M*&EN="DI+`H@"0ET:&ES+"!33$]4*'-E=$EN=FET871I;VY.=6TH:6YT*2DI
+M.PH@"7-E=$EN=FET871I;VY.=6TH;5]C;VYF:6=U<F%T:6]N+FEN=FET871I
+M;VYS*"DN<VEZ92@I*3L*(`EC;VYN96-T*&U?8V]N9E=I9&=E="T^9&ES86)L
+M94)A8VMG<F]U;F1#0BP@4TE'3D%,*&-L:6-K960H*2DL(%-,3U0H8V]N9FEG
+M0VAA;F=E9"@I*2`I.PI`0"`M,34Q+#8@*S$U,2PW($!`"B`)"6U?8V]N9FEG
+M=7)A=&EO;BYS9710<F5F97)R9610;W)T*&U?8V]N9E=I9&=E="T^<&]R=$EN
+M<'5T+3YV86QU92@I*3L*(`EM7V-O;F9I9W5R871I;VXN<V5T1&ES86)L94)A
+M8VMG<F]U;F0H;5]C;VYF5VED9V5T+3YD:7-A8FQE0F%C:V=R;W5N9$-"+3YI
+M<T-H96-K960H*2D["B`);5]C;VYF:6=U<F%T:6]N+G-A=F4H*3L**R`@("`@
+M("`@:V%P<"T^9&-O<$-L:65N="@I+3YE;6ET1$-/4%-I9VYA;"@B2U)&0CHZ
+M0V]N9FEG0VAA;F=E9"(L(")+4D9"7T-O;F9I9T-H86YG960H*2(L(%%">71E
+M07)R87DH*2D["B`)96UI="!C:&%N9V5D*&9A;'-E*3L*('T*(`ID:69F("U.
+M<G5A("UX($-64R`M>"!#5E,@:V1E;F5T=V]R:RTS+C,N,B]K<F9B+VMR9F(O
+M8V]N9FEG=7)A=&EO;BYC8R!K9&5N971W;W)K+VMR9F(O:W)F8B]C;VYF:6=U
+M<F%T:6]N+F-C"BTM+2!K9&5N971W;W)K+3,N,RXR+VMR9F(O:W)F8B]C;VYF
+M:6=U<F%T:6]N+F-C"3(P,#0M,3(M,3<@,#(Z-#0Z-#`N,#`P,#`P,#`P("LP
+M,3`P"BLK*R!K9&5N971W;W)K+VMR9F(O:W)F8B]C;VYF:6=U<F%T:6]N+F-C
+M"3(P,#0M,3(M,30@,3$Z,#$Z,C0N,#`P,#`P,#`P("LP,3`P"D!`("TU-"PV
+M("LU-"PY($!`"B`)<V%V951O1&EA;&]G<R@I.PH@"61O2VEN971D0V]N9B@I
+M.PH@"BL@("`@("`@(&-O;FYE8W1$0T]04VEG;F%L*"`P+"`B2U)&0CHZ0V]N
+M9FEG0VAA;F=E9"(L(")+4D9"7T-O;F9I9T-H86YG960H*2(L"BL@("`@("`@
+M("`@("`@("`@("`@("`@("`@("`B=7!D871E2T-O;F9I9R@I(BP@9F%L<V4@
+M*3L**PH@"6-O;FYE8W0H:6YV36YG1&QG+FYE=U!E<G-O;F%L26YV:71A=&EO
+M;D)U='1O;BP@4TE'3D%,*&-L:6-K960H*2DL"B`)"5-,3U0H<VAO=U!E<G-O
+M;F%L26YV:71A=&EO;D1I86QO9R@I*2D["B`)8V]N;F5C="AI;G9-;F=$;&<N
+M;F5W16UA:6Q);G9I=&%T:6]N0G5T=&]N+"!324=.04PH8VQI8VME9"@I*2P@
+M4TQ/5"AI;G9I=&5%;6%I;"@I*2D["D!`("TX,RPV("LX-BPQ,2!`0`H@("`@
+M("`@("!S879E*"D["B!]"B`**W9O:60@0V]N9FEG=7)A=&EO;CHZ=7!D871E
+M2T-O;F9I9R@I"BM["BL@("`@;&]A9$9R;VU+0V]N9FEG*"D["BM]"BL*('9O
+M:60@0V]N9FEG=7)A=&EO;CHZ<V5T2TEN971D16YA8FQE9"AB;V]L(&5N86)L
+M960I('L*(`EK:6YE=&12968N<V5N9"@B<V5T16YA8FQE9"(L(%%3=')I;F<H
+M(FMR9F(B*2P@96YA8FQE9"D["B`):VEN971D4F5F+G-E;F0H(G-E=$5N86)L
+M960B+"!14W1R:6YG*")K<F9B7VAT='!D(BDL(&5N86)L960I.PID:69F("U.
+M<G5A("UX($-64R`M>"!#5E,@:V1E;F5T=V]R:RTS+C,N,B]K<F9B+VMR9F(O
+M8V]N9FEG=7)A=&EO;BYH(&MD96YE='=O<FLO:W)F8B]K<F9B+V-O;F9I9W5R
+M871I;VXN:`HM+2T@:V1E;F5T=V]R:RTS+C,N,B]K<F9B+VMR9F(O8V]N9FEG
+M=7)A=&EO;BYH"3(P,#0M,3(M,3<@,#(Z-#0Z-#`N,#`P,#`P,#`P("LP,3`P
+M"BLK*R!K9&5N971W;W)K+VMR9F(O:W)F8B]C;VYF:6=U<F%T:6]N+F@),C`P
+M-"TQ,BTQ-"`Q,3HP,3HR-"XP,#`P,#`P,#`@*S`Q,#`*0$`@+3,X+#$W("LS
+M."PQ.2!`0`H@"4M21D)?0T].1DE'55)!5$E/3E]-3T1%"B!].PH@"BLC:6YC
+M;'5D92`\9&-O<&]B:F5C="YH/@H@"B`O*BH*("`J(%1H:7,@8VQA<W,@<W1O
+M<F5S('1H92!A<'`G<R!C;VYF:6=U<F%T:6]N+"!M86YA9V5S('1H90H@("H@
+M<W1A;F1A;&]N92UC;VYF:6<M9&EA;&]G(&%N9"!A;&P@=&AE(&EN=FET871I
+M;VX@9&EA;&]G<PH@("H@0&%U=&AO<B!4:6T@2F%N<V5N"B`@*B\*+6-L87-S
+M($-O;F9I9W5R871I;VX@.B!P=6)L:6,@44]B:F5C="!["BMC;&%S<R!#;VYF
+M:6=U<F%T:6]N(#H@<'5B;&EC(%%/8FIE8W0L('!U8FQI8R!$0T]03V)J96-T
+M('L**R`@("!+7T1#3U`*("`@(`E17T]"2D5#5`H@<'5B;&EC.@H@"4-O;F9I
+M9W5R871I;VXH:W)F8E]M;V1E(&UO9&4I.PHM"7Y#;VYF:6=U<F%T:6]N*"D[
+M"BL)=FER='5A;"!^0V]N9FEG=7)A=&EO;B@I.PH@"B`):W)F8E]M;V1E(&UO
+M9&4H*2!C;VYS=#L*(`EB;V]L(&%S:T]N0V]N;F5C="@I(&-O;G-T.PI`0"`M
+M,3(R+#8@*S$R-"PQ,B!`0`H@"B`)8F]O;"!D:7-A8FQE0F%C:V=R;W5N9$9L
+M86<["B`)8F]O;"!D:7-A8FQE6%-H;49L86<["BL)"BMK7V1C;W`Z"BL@("`@
+M+R\@0V]N;F5C=&5D('1O('1H92!$0T]0('-I9VYA;`HK("`@('9O:60@=7!D
+M871E2T-O;F9I9R@I.PHK"BL*('!R:79A=&4@<VQO=',Z"B`@("`@("`@('9O
+M:60@<F5F<F5S:%1I;65O=70H*3L*(`ID:69F("U.<G5A("UX($-64R`M>"!#
+M5E,@:V1E;F5T=V]R:RTS+C,N,B]K<F9B+VMR9F(O979E;G1S<F,@:V1E;F5T
+M=V]R:R]K<F9B+VMR9F(O979E;G1S<F,*+2TM(&MD96YE='=O<FLM,RXS+C(O
+M:W)F8B]K<F9B+V5V96YT<W)C"3(P,#0M,3(M,3<@,#(Z-#0Z-#$N,#`P,#`P
+M,#`P("LP,3`P"BLK*R!K9&5N971W;W)K+VMR9F(O:W)F8B]E=F5N='-R8PDR
+M,#`T+3$R+3$T(#`X.C(Y.C4S+C`P,#`P,#`P,"`K,#$P,`I`0"`M,C<Q+#8@
+M*S(W,2PW($!`"B!.86UE/4-O;FYE8W1I;VY#;&]S960*($YA;65;87)=/=BG
+MV*K8M=BGV80@V878NMF$V8(*($YA;65;8F==/="2T8#1BM"WT+K0L-&"T+`@
+MT+4@T+_1@-"UT+K1BM&!T+W0L-&"T+`**TYA;65;8G)=/4ME=G)E861U<B!S
+M97)R970*($YA;65;8V%=/4-O;FYE>&G#LR!T86YC861A"B!.86UE6V-S73U3
+M<&]J96[#K2!U:V]NQ(UE;F\*($YA;65;8WE=/4-Y<WEL;'1I861!<D=A=0ID
+M:69F("U.<G5A("UX($-64R`M>"!#5E,@:V1E;F5T=V]R:RTS+C,N,B]K<F9B
+M+VMR9F(O36%K969I;&4N86T@:V1E;F5T=V]R:R]K<F9B+VMR9F(O36%K969I
+M;&4N86T*+2TM(&MD96YE='=O<FLM,RXS+C(O:W)F8B]K<F9B+TUA:V5F:6QE
+M+F%M"3(P,#0M,3(M,3<@,#(Z-#0Z-#`N,#`P,#`P,#`P("LP,3`P"BLK*R!K
+M9&5N971W;W)K+VMR9F(O:W)F8B]-86ME9FEL92YA;0DR,#`T+3$R+3$T(#$Q
+M.C`Q.C(T+C`P,#`P,#`P,"`K,#$P,`I`0"`M,RPW("LS+#<@0$`*($U%5$%3
+M3U520T53(#T@05543PH@"B!N;VEN<W1?3%1,24)205))15,@/2!L:6)K<F9B
+M8V]N9FEG+FQA"BUL:6)K<F9B8V]N9FEG7VQA7U-/55)#15,@/2!C;VYF:6=U
+M<F%T:6]N+F-C(&UA;F%G96EN=FET871I;VYS+G5I(%P**VQI8FMR9F)C;VYF
+M:6=?;&%?4T]54D-%4R`](&-O;F9I9W5R871I;VXN8V,@8V]N9FEG=7)A=&EO
+M;BYS:V5L(&UA;F%G96EN=FET871I;VYS+G5I(%P*("`@("`@("`@("`@("`@
+M("`@("`@("`@("`@('!E<G-O;F%L:6YV:71A=&EO;BYU:2!I;G9I=&4N=6D@
+M:6YV:71A=&EO;BYC8PH@;&EB:W)F8F-O;F9I9U]L85],24)!1$0@/2`N+B]S
+M<G9L;V,O;&EB<W)V;&]C+FQA("0H3$E"7TM$155)*0H@"F1I9F8@+4YR=6$@
+M+7@@0U93("UX($-64R!K9&5N971W;W)K+3,N,RXR+VMR9F(O:W)F8E]H='1P
+M9"]K<F9B7VAT='!D(&MD96YE='=O<FLO:W)F8B]K<F9B7VAT='!D+VMR9F)?
+M:'1T<&0*+2TM(&MD96YE='=O<FLM,RXS+C(O:W)F8B]K<F9B7VAT='!D+VMR
+M9F)?:'1T<&0),C`P-"TQ,BTQ-R`P,CHT-#HT,2XP,#`P,#`P,#`@*S`Q,#`*
+M*RLK(&MD96YE='=O<FLO:W)F8B]K<F9B7VAT='!D+VMR9F)?:'1T<&0),C`P
+M-"TQ,BTQ,R`Q,SHT-SHQ,BXP,#`P,#`P,#`@*S`Q,#`*0$`@+3,U+#<@*S,U
+M+#<@0$`*(`EC;VYT96YT/2(*(#Q(5$U,/CQ(14%$/CQ4251,13XD3$]'3D%-
+M12=S(&1E<VMT;W`\+U1)5$Q%/CPO2$5!1#X*(#Q"3T19/@HM/$%04$Q%5"!#
+M3T1%/79N8W9I97=E<BYC;&%S<R!!4D-(259%/79N8W9I97=E<BYJ87(@5TE$
+M5$@])'=I9'1H($A%24=(5#TD:&5I9VAT/@HK/$%04$Q%5"!#3T1%/59N8U9I
+M97=E<BYC;&%S<R!!4D-(259%/59N8U9I97=E<BYJ87(@5TE$5$@])'=I9'1H
+M($A%24=(5#TD:&5I9VAT/@H@"3QP87)A;2!N86UE/5!/4E0@=F%L=64])'!O
+M<G0^"B`\+T%04$Q%5#X*(#PO0D]$63X\+TA434P^(@ID:69F("U.<G5A("UX
+M($-64R`M>"!#5E,@:V1E;F5T=V]R:RTS+C,N,B]W:69I+VUA:6XN8W!P(&MD
+M96YE='=O<FLO=VEF:2]M86EN+F-P<`HM+2T@:V1E;F5T=V]R:RTS+C,N,B]W
+M:69I+VUA:6XN8W!P"3(P,#0M,3(M,3<@,#(Z-#0Z-#$N,#`P,#`P,#`P("LP
+M,3`P"BLK*R!K9&5N971W;W)K+W=I9FDO;6%I;BYC<'`),C`P-"TQ,BTP-2`R
+M,3HS-CHR,2XP,#`P,#`P,#`@*S`Q,#`*0$`@+30R+#@@*S0R+#<@0$`*('L*
+M("`@2T%B;W5T1&%T82!A8F]U=$1A=&$@*")K=VEF:6UA;F%G97(B+"!),3A.
+M7TY/3U`@*")+5VE&:4UA;F%G97(B*2P@5D524TE/3BP*(`D)"61E<V-R:7!T
+M:6]N+"!+06)O=71$871A.CI,:6-E;G-E7T=03"P*+0D)"2(H8RD@,C`P,2TP
+M-"P@4W1E9F%N(%=I;G1E<B(L(#`L(#`L"BT)"0DB;6%I;$!S=&5F86XM=VEN
+M=&5R+F1E(BD["BL)"0DB*&,I(#(P,#$M,#0L(%-T969A;B!7:6YT97(B*3L*
+M("`@86)O=71$871A+F%D9$%U=&AO<B`H(E-T969A;B!7:6YT97(B+"`P+"`B
+M;6%I;$!S=&5F86XM=VEN=&5R+F1E(BD["B`@($M#;61,:6YE07)G<SHZ:6YI
+M="`H87)G8RP@87)G=BP@)F%B;W5T1&%T82D["B`@($M#;61,:6YE07)G<SHZ
+M861D0VUD3&EN94]P=&EO;G,@*&]P=&EO;G,I.PDO+R!!9&0@;W5R(&]W;B!O
+(<'1I;VYS+@H`
+`
+end
Modified: branches/kde-3.3.2/kdenetwork/debian/patches/02_autotools_update.diff
===================================================================
--- branches/kde-3.3.2/kdenetwork/debian/patches/02_autotools_update.diff 2004-12-17 14:58:29 UTC (rev 328)
+++ branches/kde-3.3.2/kdenetwork/debian/patches/02_autotools_update.diff 2004-12-17 15:02:19 UTC (rev 329)
@@ -1,25 +1,27 @@
-diff -Nrua kdenetwork-3.3.0/admin/compile kdenetwork-patched/admin/compile
---- kdenetwork-3.3.0/admin/compile 2002-09-30 07:18:17.000000000 -0500
-+++ kdenetwork-patched/admin/compile 2004-08-12 21:22:21.000000000 -0500
+--- a/admin/compile
++++ b/admin/compile
@@ -1,8 +1,9 @@
#! /bin/sh
-
# Wrapper for compilers which do not understand `-c -o'.
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-+scriptversion=2003-11-09.00
++scriptversion=2004-10-12.08
+
-+# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
-@@ -24,9 +25,36 @@
+@@ -24,76 +25,118 @@
# 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.
+-
+-prog=$1
+-shift
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
@@ -49,55 +51,68 @@
+ exit 0
+ ;;
+esac
-+
- prog=$1
- shift
-@@ -35,39 +63,39 @@
+ ofile=
cfile=
- args=
- while test $# -gt 0; do
+-args=
+-while test $# -gt 0; do
- case "$1" in
-+ case "$1" in
- -o)
+- -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)
+- *.o | *.obj)
- ;;
-+ ;;
- *)
+- *)
- args="$args -o $ofile"
- ofile=
- ;;
- esac
-+ args="$args -o $ofile"
-+ ofile=
-+ ;;
-+ esac
- ;;
- *.c)
+- ;;
+- *.c)
- cfile=$1
- args="$args $1"
- ;;
-+ cfile=$1
-+ args="$args $1"
-+ ;;
- *)
+- *)
- args="$args $1"
- ;;
- esac
- shift
-+ args="$args $1"
-+ ;;
-+ esac
++eat=
++
++for arg
++do
++ if test -n "$eat"; then
++ eat=
++ else
++ case $1 in
++ -o)
++ # configure might choose to run compile as `compile cc -o foo foo.c'.
++ # So we strip `-o arg' only if arg is an object.
++ eat=1
++ case $2 in
++ *.o | *.obj)
++ ofile=$2
++ ;;
++ *)
++ set x "$@" -o "$2"
++ shift
++ ;;
++ esac
++ ;;
++ *.c)
++ cfile=$1
++ set x "$@" "$1"
++ shift
++ ;;
++ *)
++ set x "$@" "$1"
++ shift
++ ;;
++ esac
++ fi
+ shift
done
@@ -113,35 +128,50 @@
+ # 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
++ exec "$@"
fi
# Name of file we expect compiler to create.
-@@ -79,10 +107,10 @@
+-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
++cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+
+ # Create the lock directory.
+ # Note: use `[/.-]' here to ensure that we don't use the same name
+ # that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
- lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
+-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
++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
++ 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=$?
+-trap "rmdir $lockdir; exit 1" 1 2 15
++trap "rmdir '$lockdir'; exit 1" 1 2 15
+ # Run the compile.
+-"$prog" $args
+-status=$?
++"$@"
++ret=$?
+
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ mv "$cofile" "$ofile"
++elif test -f "${cofile}bj"; then
++ mv "${cofile}bj" "$ofile"
fi
- rmdir $lockdir
- exit $status
+-rmdir $lockdir
+-exit $status
++rmdir "$lockdir"
++exit $ret
+
+# Local Variables:
+# mode: shell-script
@@ -151,20 +181,49 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua kdenetwork-3.3.0/admin/config.guess kdenetwork-patched/admin/config.guess
---- kdenetwork-3.3.0/admin/config.guess 2004-08-02 09:17:40.000000000 -0500
-+++ kdenetwork-patched/admin/config.guess 2004-08-08 14:36:29.000000000 -0500
+--- a/admin/config.guess
++++ b/admin/config.guess
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-timestamp='2004-06-24'
-+timestamp='2004-07-19'
++timestamp='2004-08-13'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-@@ -1081,7 +1081,7 @@
+@@ -203,9 +203,6 @@
+ amiga:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
+- arc:OpenBSD:*:*)
+- echo mipsel-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+ cats:OpenBSD:*:*)
+ echo arm-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+@@ -230,18 +227,12 @@
+ mvmeppc:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+- pmax:OpenBSD:*:*)
+- echo mipsel-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+ sgi:OpenBSD:*:*)
+- echo mipseb-unknown-openbsd${UNAME_RELEASE}
++ echo mips64-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sun3:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+- wgrisc:OpenBSD:*:*)
+- echo mipsel-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+ *:OpenBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+@@ -1081,7 +1072,7 @@
+ exit 0 ;;
M68*:*:R3V[5678]*:*)
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
@@ -172,9 +231,21 @@
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-diff -Nrua kdenetwork-3.3.0/admin/depcomp kdenetwork-patched/admin/depcomp
---- kdenetwork-3.3.0/admin/depcomp 2003-04-16 16:53:18.000000000 -0500
-+++ kdenetwork-patched/admin/depcomp 2004-08-12 21:22:21.000000000 -0500
+@@ -1179,9 +1170,10 @@
+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ exit 0 ;;
+ *:Darwin:*:*)
+- case `uname -p` in
++ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
++ case $UNAME_PROCESSOR in
+ *86) UNAME_PROCESSOR=i686 ;;
+- powerpc) UNAME_PROCESSOR=powerpc ;;
++ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ exit 0 ;;
+--- a/admin/depcomp
++++ b/admin/depcomp
@@ -1,7 +1,9 @@
#! /bin/sh
-
@@ -645,16 +716,15 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua kdenetwork-3.3.0/admin/install-sh kdenetwork-patched/admin/install-sh
---- kdenetwork-3.3.0/admin/install-sh 2003-08-07 04:41:31.000000000 -0500
-+++ kdenetwork-patched/admin/install-sh 2004-08-12 21:22:21.000000000 -0500
+--- a/admin/install-sh
++++ b/admin/install-sh
@@ -1,19 +1,38 @@
#!/bin/sh
-#
# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
+
-+scriptversion=2004-07-05.00
++scriptversion=2004-10-22.00
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
@@ -713,7 +783,7 @@
# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}"
-@@ -41,236 +58,265 @@
+@@ -41,236 +58,266 @@
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
@@ -1087,7 +1157,7 @@
+ fi
+
+ # This sed command emulates the dirname command.
-+ dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
++ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+
+ # Make sure that the destination directory exists.
+
@@ -1100,7 +1170,8 @@
+ oIFS=$IFS
+ # Some sh's can't handle IFS=/ for some reason.
+ IFS='%'
-+ set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++ shift
+ IFS=$oIFS
+
+ pathcomp=
@@ -1134,7 +1205,7 @@
+ rmtmp=$dstdir/_rm.$$_
+
+ # Trap to clean up those temp files at exit.
-+ trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
++ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+ trap '(exit $?); exit' 1 2 13 15
+
+ # Copy the file name to the temp name.
@@ -1196,22 +1267,21 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua kdenetwork-3.3.0/admin/missing kdenetwork-patched/admin/missing
---- kdenetwork-3.3.0/admin/missing 2002-10-26 11:44:28.000000000 -0500
-+++ kdenetwork-patched/admin/missing 2004-08-12 21:22:21.000000000 -0500
+--- a/admin/missing
++++ b/admin/missing
@@ -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.
+
-+scriptversion=2003-09-02.23
++scriptversion=2004-09-07.08
+
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
-@@ -38,12 +42,23 @@
+@@ -38,18 +42,24 @@
configure_ac=configure.in
fi
@@ -1233,9 +1303,15 @@
+ msg="probably too old"
+ fi
;;
- esac
+-esac
+-
+-# If it does not exist, or fails to run (possibly an outdated version),
+-# try to emulate it.
+-case "$1" in
-@@ -74,11 +89,13 @@
+ -h|--h|--he|--hel|--help)
+ echo "\
+@@ -74,11 +84,15 @@
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
@@ -1243,53 +1319,117 @@
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to <bug-automake@gnu.org>."
++ exit 0
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
++ exit 0
;;
-*)
-@@ -94,7 +111,7 @@
+@@ -87,14 +101,44 @@
+ exit 1
+ ;;
+
+- aclocal*)
++esac
++
++# Now exit if we have it, but it failed. Also exit now if we
++# don't have it and --version was passed (most likely to detect
++# the program).
++case "$1" in
++ lex|yacc)
++ # Not GNU programs, they don't have --version.
++ ;;
++
++ tar)
++ if test -n "$run"; then
++ echo 1>&2 "ERROR: \`tar' requires --run"
++ exit 1
++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
++ exit 1
++ fi
++ ;;
++
++ *)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
++ # Could not run --version or --help. This is probably someone
++ # running `$TOOL --version' or `$TOOL --help' to check whether
++ # $TOOL exists and not knowing $TOOL uses missing.
++ exit 1
fi
++ ;;
++esac
++# If it does not exist, or fails to run (possibly an outdated version),
++# try to emulate it.
++case "$1" in
++ aclocal*)
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
+@@ -102,13 +146,8 @@
+ ;;
+ autoconf)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- 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
+@@ -116,13 +155,8 @@
+ ;;
+ autoheader)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- 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
+@@ -140,13 +174,8 @@
+ ;;
+ automake*)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- 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
+@@ -156,16 +185,11 @@
+ ;;
+ autom4te)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- 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
@@ -1301,7 +1441,7 @@
archive site."
file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-@@ -185,7 +202,7 @@
+@@ -185,7 +209,7 @@
bison|yacc)
echo 1>&2 "\
@@ -1310,7 +1450,7 @@
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 @@
+@@ -215,7 +239,7 @@
lex|flex)
echo 1>&2 "\
@@ -1319,26 +1459,49 @@
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
+@@ -237,13 +261,8 @@
+ ;;
+ help2man)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- 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
+@@ -262,13 +281,8 @@
+ ;;
+ makeinfo)
+- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+- # We have makeinfo, but it failed.
+- exit 1
+- 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 @@
+@@ -284,10 +298,6 @@
+ tar)
+ shift
+- if test -n "$run"; then
+- echo 1>&2 "ERROR: \`tar' requires --run"
+- exit 1
+- fi
+
+ # We have already tried tar in the generic part.
+ # Look for gnutar/gtar before invocation to avoid ugly error
+@@ -323,10 +333,10 @@
+
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
@@ -1351,7 +1514,7 @@
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
-@@ -334,3 +351,10 @@
+@@ -334,3 +344,10 @@
esac
exit 0
@@ -1362,9 +1525,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua kdenetwork-3.3.0/admin/mkinstalldirs kdenetwork-patched/admin/mkinstalldirs
---- kdenetwork-3.3.0/admin/mkinstalldirs 2002-10-26 11:53:16.000000000 -0500
-+++ kdenetwork-patched/admin/mkinstalldirs 2004-08-12 21:22:21.000000000 -0500
+--- a/admin/mkinstalldirs
++++ b/admin/mkinstalldirs
@@ -1,20 +1,32 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
@@ -1489,17 +1651,16 @@
+# time-stamp-end: "$"
# End:
-# mkinstalldirs ends here
-diff -Nrua kdenetwork-3.3.0/admin/ylwrap kdenetwork-patched/admin/ylwrap
---- kdenetwork-3.3.0/admin/ylwrap 2001-10-04 19:46:36.000000000 -0500
-+++ kdenetwork-patched/admin/ylwrap 2004-08-12 21:22:21.000000000 -0500
+--- a/admin/ylwrap
++++ b/admin/ylwrap
@@ -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
++scriptversion=2004-09-10.20
+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003
++# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004
+# Free Software Foundation, Inc.
+#
# Written by Tom Tromey <tromey@cygnus.com>.
@@ -1606,18 +1767,19 @@
esac
# FIXME: add hostname here for parallel makes that run commands on
-@@ -79,61 +105,105 @@
+@@ -79,65 +105,118 @@
cd $dirname
-$prog ${1+"$@"} "$input"
+-status=$?
+case $# in
+ 0) $prog "$input" ;;
+ *) $prog "$@" "$input" ;;
+esac
- status=$?
++ret=$?
- if test $status -eq 0; then
+-if test $status -eq 0; then
- set X $pairlist
- shift
- first=yes
@@ -1654,6 +1816,7 @@
- # it is better for it to just mention the .y file with no
- # path.
- sed -e "/^#/ s,$input_rx,," "$from" > "$target" || status=$?
++if test $ret -eq 0; then
+ set X $pairlist
+ shift
+ first=yes
@@ -1730,7 +1893,7 @@
+ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
+
+ sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
-+ -e "s,$FROM,$TARGET," "$from" >"$target" || status=$?
++ -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
+
+ # Check whether header files must be updated.
+ if test $first = no; then
@@ -1748,7 +1911,7 @@
+ # is not specified, we don't want an error when the header
+ # file is "missing".
+ if test $first = yes; then
-+ status=1
++ ret=1
+ fi
+ fi
+ shift
@@ -1757,14 +1920,15 @@
+ done
else
- status=$?
-+ status=$?
++ ret=$?
fi
# Remove the directory.
-@@ -141,3 +211,12 @@
+ cd ..
rm -rf $dirname
- exit $status
+-exit $status
++exit $ret
+
+# Local Variables:
+# mode: shell-script