pkg-kde: commit - rev 71 - in trunk/packages/kdeadmin/debian: . patches
Author: ccheney
Date: 2004-03-21 20:38:45 -0700 (Sun, 21 Mar 2004)
New Revision: 71
Added:
trunk/packages/kdeadmin/debian/compat
Modified:
trunk/packages/kdeadmin/debian/changelog
trunk/packages/kdeadmin/debian/control
trunk/packages/kdeadmin/debian/kcmlinuz.menu
trunk/packages/kdeadmin/debian/kcron.menu
trunk/packages/kdeadmin/debian/kdat.menu
trunk/packages/kdeadmin/debian/kpackage.menu
trunk/packages/kdeadmin/debian/ksysv.menu
trunk/packages/kdeadmin/debian/kuser.menu
trunk/packages/kdeadmin/debian/lilo-config.menu
trunk/packages/kdeadmin/debian/patches/01_kdeadmin_branch.diff.uu
trunk/packages/kdeadmin/debian/patches/02_autotools_update.diff
trunk/packages/kdeadmin/debian/patches/05_pedantic-errors.diff
trunk/packages/kdeadmin/debian/rules
trunk/packages/kdeadmin/debian/secpolicy.menu
Log:
kdeadmin 3.2.1-1 update
Modified: trunk/packages/kdeadmin/debian/changelog
===================================================================
--- trunk/packages/kdeadmin/debian/changelog 2004-03-22 03:00:11 UTC (rev 70)
+++ trunk/packages/kdeadmin/debian/changelog 2004-03-22 03:38:45 UTC (rev 71)
@@ -1,3 +1,9 @@
+kdeadmin (4:3.2.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Christopher L Cheney <ccheney@debian.org> Fri, 5 Mar 2004 18:00:00 -0600
+
kdeadmin (4:3.2.0-0pre1v1) experimental; urgency=low
* New upstream release.
Added: trunk/packages/kdeadmin/debian/compat
===================================================================
--- trunk/packages/kdeadmin/debian/compat 2004-03-22 03:00:11 UTC (rev 70)
+++ trunk/packages/kdeadmin/debian/compat 2004-03-22 03:38:45 UTC (rev 71)
@@ -0,0 +1 @@
+4
Modified: trunk/packages/kdeadmin/debian/control
===================================================================
--- trunk/packages/kdeadmin/debian/control 2004-03-22 03:00:11 UTC (rev 70)
+++ trunk/packages/kdeadmin/debian/control 2004-03-22 03:38:45 UTC (rev 71)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Christopher L Cheney <ccheney@debian.org>
-Build-Depends: automake1.7, debhelper (>> 4.0.18), docbook-to-man, gawk, gettext, kdelibs4-dev, libbz2-dev, libpam0g-dev, lilo [i386], rpm, sharutils, texinfo
+Build-Depends: automake1.8, debhelper (>> 4.2.0), docbook-to-man, gawk, gettext, kdelibs4-dev (>> 4:3.2.1), libbz2-dev, libpam0g-dev, lilo [i386], rpm, sharutils, texinfo
Standards-Version: 3.6.1.0
Package: kdeadmin
@@ -39,6 +39,7 @@
Section: admin
Architecture: any
Depends: ${shlibs:Depends}
+Suggests: khelpcenter
Description: KDE Crontab editor
KDE is a powerful Open Source graphical desktop environment
for Unix workstations. It combines ease of use, contemporary
@@ -53,6 +54,7 @@
Section: admin
Architecture: any
Depends: ${shlibs:Depends}
+Suggests: khelpcenter
Description: KDE tape backup tool
KDE is a powerful Open Source graphical desktop environment
for Unix workstations. It combines ease of use, contemporary
@@ -82,6 +84,7 @@
Architecture: any
Depends: ${shlibs:Depends}
Recommends: rpm
+Suggests: khelpcenter
Description: KDE Software package tool
KDE is a powerful Open Source graphical desktop environment
for Unix workstations. It combines ease of use, contemporary
@@ -98,6 +101,7 @@
Section: admin
Architecture: any
Depends: ${shlibs:Depends}
+Suggests: khelpcenter
Description: KDE SysV-style init configuration editor
KDE is a powerful Open Source graphical desktop environment
for Unix workstations. It combines ease of use, contemporary
@@ -113,6 +117,7 @@
Section: admin
Architecture: any
Depends: ${shlibs:Depends}
+Suggests: khelpcenter
Description: KDE user/group administration tool
KDE is a powerful Open Source graphical desktop environment
for Unix workstations. It combines ease of use, contemporary
Modified: trunk/packages/kdeadmin/debian/kcmlinuz.menu
===================================================================
--- trunk/packages/kdeadmin/debian/kcmlinuz.menu 2004-03-22 03:00:11 UTC (rev 70)
+++ trunk/packages/kdeadmin/debian/kcmlinuz.menu 2004-03-22 03:38:45 UTC (rev 71)
@@ -1,6 +1,6 @@
?package(kcmlinuz):\
- needs=X11\
- section=Apps/System\
+ needs="X11"\
+ section="Apps/System"\
hints="KDE"\
kderemove="y"\
title="kcmlinuz"\
Modified: trunk/packages/kdeadmin/debian/kcron.menu
===================================================================
--- trunk/packages/kdeadmin/debian/kcron.menu 2004-03-22 03:00:11 UTC (rev 70)
+++ trunk/packages/kdeadmin/debian/kcron.menu 2004-03-22 03:38:45 UTC (rev 71)
@@ -1,6 +1,6 @@
?package(kcron):\
- needs=X11\
- section=Apps/System\
+ needs="X11"\
+ section="Apps/System"\
hints="KDE"\
kderemove="y"\
title="KDE Task Scheduler"\
Modified: trunk/packages/kdeadmin/debian/kdat.menu
===================================================================
--- trunk/packages/kdeadmin/debian/kdat.menu 2004-03-22 03:00:11 UTC (rev 70)
+++ trunk/packages/kdeadmin/debian/kdat.menu 2004-03-22 03:38:45 UTC (rev 71)
@@ -1,6 +1,6 @@
?package(kdat):\
- needs=X11\
- section=Apps/System\
+ needs="X11"\
+ section="Apps/System"\
hints="KDE"\
kderemove="y"\
title="KDat"\
Modified: trunk/packages/kdeadmin/debian/kpackage.menu
===================================================================
--- trunk/packages/kdeadmin/debian/kpackage.menu 2004-03-22 03:00:11 UTC (rev 70)
+++ trunk/packages/kdeadmin/debian/kpackage.menu 2004-03-22 03:38:45 UTC (rev 71)
@@ -1,6 +1,6 @@
?package(kpackage):\
- needs=X11\
- section=Apps/System\
+ needs="X11"\
+ section="Apps/System"\
hints="KDE"\
kderemove="y"\
title="KDE Package Manager"\
Modified: trunk/packages/kdeadmin/debian/ksysv.menu
===================================================================
--- trunk/packages/kdeadmin/debian/ksysv.menu 2004-03-22 03:00:11 UTC (rev 70)
+++ trunk/packages/kdeadmin/debian/ksysv.menu 2004-03-22 03:38:45 UTC (rev 71)
@@ -1,6 +1,6 @@
?package(ksysv):\
- needs=X11\
- section=Apps/System\
+ needs="X11"\
+ section="Apps/System"\
hints="KDE"\
kderemove="y"\
title="KDE SysV-Init Editor"\
Modified: trunk/packages/kdeadmin/debian/kuser.menu
===================================================================
--- trunk/packages/kdeadmin/debian/kuser.menu 2004-03-22 03:00:11 UTC (rev 70)
+++ trunk/packages/kdeadmin/debian/kuser.menu 2004-03-22 03:38:45 UTC (rev 71)
@@ -1,6 +1,6 @@
?package(kuser):\
- needs=X11\
- section=Apps/System\
+ needs="X11"\
+ section="Apps/System"\
hints="KDE"\
kderemove="y"\
title="KDE User Manager"\
Modified: trunk/packages/kdeadmin/debian/lilo-config.menu
===================================================================
--- trunk/packages/kdeadmin/debian/lilo-config.menu 2004-03-22 03:00:11 UTC (rev 70)
+++ trunk/packages/kdeadmin/debian/lilo-config.menu 2004-03-22 03:38:45 UTC (rev 71)
@@ -1,6 +1,6 @@
?package(lilo-config):\
- needs=X11\
- section=Apps/System\
+ needs="X11"\
+ section="Apps/System"\
hints="KDE"\
kderemove="y"\
title="lilo-config"\
Modified: trunk/packages/kdeadmin/debian/patches/01_kdeadmin_branch.diff.uu
===================================================================
--- trunk/packages/kdeadmin/debian/patches/01_kdeadmin_branch.diff.uu 2004-03-22 03:00:11 UTC (rev 70)
+++ trunk/packages/kdeadmin/debian/patches/01_kdeadmin_branch.diff.uu 2004-03-22 03:38:45 UTC (rev 71)
@@ -1,296 +1,219 @@
begin 644 01_kdeadmin_branch.diff
-M9&EF9B`M3G)U82!K9&5A9&UI;BTS+C(N,"]A9&UI;B]C=G,N<V@@:V1E861M
-M:6XM8G)A;F-H+V%D;6EN+V-V<RYS:`HM+2T@:V1E861M:6XM,RXR+C`O861M
-M:6XO8W9S+G-H"3(P,#0M,#$M,3<@,#,Z,#DZ,3(N,#`P,#`P,#`P("TP-C`P
-M"BLK*R!K9&5A9&UI;BUB<F%N8V@O861M:6XO8W9S+G-H"3(P,#0M,#(M,3(@
-M,#8Z,C8Z,S4N,#`P,#`P,#`P("TP-C`P"D!`("TS-C`L-B`K,S8P+#$P($!`
-M"B!F:3L@9&]N90H@=&5S="`M9B!C;VYF:6=U<F4N:6XN;6ED("8F(&5C:&\@
-M8V]N9FEG=7)E+FEN+FUI9"`^/B!C;VYF:6=U<F4N9FEL97,*('1E<W0@+68@
-M8V]N9FEG=7)E+FEN+F)O="`F)B!E8VAO(&-O;F9I9W5R92YI;BYB;W0@/CX@
-M8V]N9FEG=7)E+F9I;&5S"BMI9B!T97-T("$@+7,@8V]N9FEG=7)E+F9I;&5S
-M.R!T:&5N"BL@("!E8VAO(")4:&5R92!A<F4@;F\@9FEL97,@=&\@8G5I;&0@
-M82!C;VYF:6=U<F4N(%!L96%S92!C:&5C:R!Y;W5R(&-H96-K;W5T+B(**R`@
-M(&5X:70@,0HK9FD*('T*(`H@8W)E871E7W-U8F1I<G,H*0I`0"`M-3<W+#$P
-M("LU.#$L,3(@0$`*("`@=&5S="`M9B!P;R\D:2!\?"!E8VAO(")D:7-A<'!E
-M87)E9#H@)&DB"B!D;VYE"B!F;W(@:2!I;B!@;',@+3$@<&\O*BYP;W0@,CXO
-M9&5V+VYU;&P@?"!S960@+64@(G,C<&\O(R,B8#L@9&\**R`@('-E9"`M92`G
-M<RQ>(D-O;G1E;G0M5'EP93H@=&5X="]P;&%I;CL@8VAA<G-E=#U#2$%24T54
-M7%QN(B0L(D-O;G1E;G0M5'EP93H@=&5X="]P;&%I;CL@8VAA<G-E=#U55$8M
-M.%Q<;B(L)R!P;R\D:2`^('!O+R1I+FYE=R`F)B!M=B!P;R\D:2YN97<@<&\O
-M)&D*("`@(&US9VUE<F=E("UQ("UO('!O+R1I('!O+R1I('!O+R1I"B`@("!E
-M9W)E<"`M=B`G7B,H6UXZ77PD*2<@<&\O)&D@?"!E9W)E<"`G7BXJ6UX@72LN
-M*B0G('P@9W)E<"`M=B`B7")03U0M0W)E871I;VXB(#X@=&5M<"YP;W0*("`@
-M:68@=&5S="`M9B!P;RYB86-K=7`O)&D@)B8@=&5S="`M;B`B8&1I9F8@=&5M
-M<"YP;W0@<&\N8F%C:W5P+R1I8"([('1H96X*(`EE8VAO(")W:6QL('5P9&%T
-M92`D:2(**R`@("`@("`@<V5D("UE("=S+%XB0V]N=&5N="U4>7!E.B!T97AT
-M+W!L86EN.R!C:&%R<V5T/4-(05)3151<7&XB)"PB0V]N=&5N="U4>7!E.B!T
-M97AT+W!L86EN.R!C:&%R<V5T/5541BTX7%QN(BPG('!O+F)A8VMU<"\D8F%C
-M:W5P7R1I(#X@<&\O)&DN;F5W("8F(&UV('!O+R1I+FYE=R!P;RYB86-K=7`O
-M8F%C:W5P7R1I"B`);7-G;65R9V4@+7$@<&\N8F%C:W5P+V)A8VMU<%\D:2!P
-M;R\D:2`^('1E;7`N<&]T"B`);78@=&5M<"YP;W0@<&\O)&D*("`@96QS90I`
-M0"`M-3DW+#$R("LV,#,L,3(@0$`*(')M("UR9B!P;RYB86-K=7`*('T*(`HM
-M=6YS970@3$-?04Q,"BUU;G-E="!,04Y'"BUU;G-E="!,0U]#5%E010HM=6YS
-M970@3$%.1U5!1T4**W5N<V5T($Q#7T%,3"!\?"`Z"BMU;G-E="!,04Y'('Q\
-M(#H**W5N<V5T($Q#7T-465!%('Q\(#H**W5N<V5T($Q!3D=504=%('Q\(#H*
-M(`HM=6YS970@0T10051("BMU;G-E="!#1%!!5$@@?'P@.@H@861M:6YD:7(]
-M8&5C:&\@(B0P(B!\('-E9"`G<R5;7%PO75M>7%PO75M>7%PO72HD)24G8`H@
-M=&5S="`B>"1A9&UI;F1I<B(@/2`B>"0P(B`F)B!A9&UI;F1I<CTN"B`*9&EF
-M9B`M3G)U82!K9&5A9&UI;BTS+C(N,"]A9&UI;B]L=&UA:6XN<V@@:V1E861M
-M:6XM8G)A;F-H+V%D;6EN+VQT;6%I;BYS:`HM+2T@:V1E861M:6XM,RXR+C`O
-M861M:6XO;'1M86EN+G-H"3(P,#,M,#DM,C0@,#,Z-#0Z,#$N,#`P,#`P,#`P
-M("TP-3`P"BLK*R!K9&5A9&UI;BUB<F%N8V@O861M:6XO;'1M86EN+G-H"3(P
-M,#0M,#(M,3,@,C$Z-#`Z,#0N,#`P,#`P,#`P("TP-C`P"D!`("TU-C(S+#<@
-M*S4V,C,L-R!`0`H@"2`@("`@('1M<&1I<CTB+W1M<"(*(`D@("`@("!T97-T
-M("UN("(D5$U01$E2(B`F)B!T;7!D:7(](B1435!$25(B"B`)("`@("`@=&UP
-M9&ER/2(D=&UP9&ER+VQI8G1O;VPM)"0B"BT)("`@("`@:68@)&UK9&ER("UP
-M("(D=&UP9&ER(B`F)B!C:&UO9"`W,#`@(B1T;7!D:7(B.R!T:&5N(#H**PD@
-M("`@("!I9B`D;6MD:7(@(B1T;7!D:7(B("8F(&-H;6]D(#<P,"`B)'1M<&1I
-M<B([('1H96X@.@H@"2`@("`@(&5L<V4*(`D))&5C:&\@(B1M;V1E;F%M93H@
-M97)R;W(Z(&-A;FYO="!C<F5A=&4@=&5M<&]R87)Y(&1I<F5C=&]R>2!<8"1T
-M;7!D:7(G(B`Q/B8R"B`)"6-O;G1I;G5E"F1I9F8@+4YR=6$@:V1E861M:6XM
-M,RXR+C`O:V-M;&EN=7HO;&EN=7HN9&5S:W1O<"!K9&5A9&UI;BUB<F%N8V@O
-M:V-M;&EN=7HO;&EN=7HN9&5S:W1O<`HM+2T@:V1E861M:6XM,RXR+C`O:V-M
-M;&EN=7HO;&EN=7HN9&5S:W1O<`DR,#`T+3`Q+3$U(#`Q.C,U.C`S+C`P,#`P
-M,#`P,"`M,#8P,`HK*RL@:V1E861M:6XM8G)A;F-H+VMC;6QI;G5Z+VQI;G5Z
-M+F1E<VMT;W`),C`P-"TP,BTQ,2`Q,#HR-CHR,2XP,#`P,#`P,#`@+3`V,#`*
-M0$`@+3$W+#8@*S$W+#<@0$`*($YA;65;:&5=/=>2UZC7HM>9UY\@UYS7F=>@
-MUY77I]>A"B!.86UE6VAI73W@I++@I+_@I*C@I)7@I8W@I+@@X*25X*2PX*6-
-MX*2HX*6'X*2R"B!.86UE6VAU73U,:6YU>"!K97)N96QB9<.A;&S#K73#H7-O
-M:PHK3F%M95MI<UT]3&EN=7@@2VIA<FYI;FX*($YA;65;:F%=/4QI;G5X(.."
-MJ^.#O..#C>.#JPH@3F%M95ML=%T]3&EN=7@@8G)A;F1U;VQY<PH@3F%M95MM
-M;ET]T)O0N-"]TJ_0NM&!(-"FTZG0O`I`0"`M-S$L,3(@*S<R+#$S($!`"B!#
-M;VUM96YT6VAI73W@I++@I+_@I*C@I)7@I8W@I+@@X*25X*2PX*6-X*2HX*6'
-MX*2R(."DE>"EB>"DJ."EC>"DJ^"DO^"DE^"DL."EA^"DMN"DJ"#@I+G@I8?@
-MI*3@I8$@X*25X*6'X*2AX*6`X*2((."DJ^"EC>"DL."DJ."EC>"DG^"DC^"D
-MH^"EC>"DH0H@0V]M;65N=%MH<ET]2T1%('-UQ(UE;&IE('IA('!O9&7%H6%V
-M86YJ92!,:6YU>"!K97)N96QA"B!#;VUM96YT6VAU73U'<F%F:6MU<R!F96S#
-MO&QE=,6Q(&)EPZ%L;,.M=,.S<')O9W)A;2!A($QI;G5X(&ME<FYE;&AE>@HM
-M0V]M;65N=%MI<UT]2T1%('3#@\*S;"!T:6P@8<.#PK`@<W1I;&QA($QI;G5X
-M(&MJ87)N86YN"BM#;VUM96YT6VES73U+1$4@=,.S;"!T:6P@8<.P('-T:6QL
-M82!,:6YU>"!K:F%R;F%N;@H@0V]M;65N=%MI=%T]26YT97)F86-C:6$@9W)A
-M9FEC82!P97(@;&$@8V]N9FEG=7)A>FEO;F4@9&5L(&ME<FYE;"!,:6YU>`H@
-M0V]M;65N=%MJ85T]2T1%XX&N3&EN=7@@:V5R;F5LZ*BMY:Z:XX.5XX.MXX.S
-MXX.(XX*HXX.SXX.)"B!#;VUM96YT6VMO73U+1$7LFJD@ZZ:LZXB%[(JD(.R[
-MI.N$D"#LA*3LH)4@ZX^$ZK6L"B!#;VUM96YT6VQT73U)Q:%O<FENQ)<@3&EN
-M=7@@8G)A;F1U;VQI;R!K;VYF:6?%JW)A=FEM;R!P<F]G<F%M80H@0V]M;65N
-M=%ML=ET]3&EN=7@@:V5R;F7$O&$@:V]N9FEG=7+$D\6A86YA<R!+1$4@9G)O
-M;G1E;F1S"BM#;VUM96YT6VUK73U+1$4@T+?0L"#0F]"XT+W1@]"ZT8$@T+K0
-MM=&`T+W0M="[(-"ZT+[0O=&$T+C0L]&#T8#0L-&&T+C1F-"PT8+0L`H@0V]M
-M;65N=%MM;ET]T)O0N-"]TJ_0NM&!(-&&TZG0O-"XT+G0O2#0FM"4T)4@T8+0
-MOM&%T+C1@-"ST+[0O@H@0V]M;65N=%MM<UT]0F%H86=I86X@9&5P86X@2T1%
-M('5N='5K('!E;GEE;&%R87-A;B!K97)N96P@3&EN=7@*($-O;6UE;G1;;71=
-M/4MO<&5R=&EN82!T86PM2T1%(&?$IV%L;"UK;VYF:6=U<F%Z>FIO;FD@=&%L
-M+6ME<FYE;"!T86PM3&EN=7@*9&EF9B`M3G)U82!K9&5A9&UI;BTS+C(N,"]K
-M8W)O;B]K8W)O;BYD97-K=&]P(&MD96%D;6EN+6)R86YC:"]K8W)O;B]K8W)O
-M;BYD97-K=&]P"BTM+2!K9&5A9&UI;BTS+C(N,"]K8W)O;B]K8W)O;BYD97-K
-M=&]P"3(P,#0M,#$M,34@,#$Z,S4Z,#4N,#`P,#`P,#`P("TP-C`P"BLK*R!K
-M9&5A9&UI;BUB<F%N8V@O:V-R;VXO:V-R;VXN9&5S:W1O<`DR,#`T+3`R+3$Q
-M(#$P.C(V.C(S+C`P,#`P,#`P,"`M,#8P,`I`0"`M,S8L,3(@*S,V+#$S($!`
-M"B!'96YE<FEC3F%M95MH:5T]X*2?X*2^X*2XX*6-X*25(."DMN"EA^"DH>"E
-MC>"DK^"E@N"DLN"DL`H@1V5N97)I8TYA;65;:')=/5IA:V%Z:79A;FIE('IA
-M9&%T86MA"B!'96YE<FEC3F%M95MH=5T]1F5L861A=,.\=&5M97K%D0HM1V5N
-M97)I8TYA;65;:7-=/59E<FME9FYA<W1JPX/"LW)I"BM'96YE<FEC3F%M95MI
-M<UT]5F5R:V5F;F%S=&K#LW)I"B!'96YE<FEC3F%M95MI=%T]3W!E<F%Z:6]N
-M:2!P:6%N:69I8V%T90H@1V5N97)I8TYA;65;:F%=/>."O^."N>."K^."N>."
-ML>."N..#I>.#O..#J>.#O`H@1V5N97)I8TYA;65;:V]=/>R>D>R7A2#LBJ3L
-MO(#LI(3KGZP*($=E;F5R:6-.86UE6VQT73U5Q;YD=6_$C6G%LR!P;&%N=6]T
-M;VIA<PH@1V5N97)I8TYA;65;;'9=/55Z9&5V=6UU(%!LQ(%N;W3$@6IS"BM'
-M96YE<FEC3F%M95MM:UT](-">T+_1@="[T8/0MM&#T++0L-&'"B!'96YE<FEC
-M3F%M95MM;ET]T)#0MM"[T8O0O2#0HM.IT+O3J="RT+O3J="ST8<*($=E;F5R
-M:6-.86UE6VUS73U096YJ861U86P@5'5G87,*($=E;F5R:6-.86UE6VUT73U3
-M:V5D82!T82<@6&]GQ*=O;`ID:69F("U.<G5A(&MD96%D;6EN+3,N,BXP+VMD
-M870O:V1A="YD97-K=&]P(&MD96%D;6EN+6)R86YC:"]K9&%T+VMD870N9&5S
-M:W1O<`HM+2T@:V1E861M:6XM,RXR+C`O:V1A="]K9&%T+F1E<VMT;W`),C`P
-M-"TP,2TQ-2`P,3HS-3HP-RXP,#`P,#`P,#`@+3`V,#`**RLK(&MD96%D;6EN
-M+6)R86YC:"]K9&%T+VMD870N9&5S:W1O<`DR,#`T+3`R+3$Q(#$P.C(V.C(U
-M+C`P,#`P,#`P,"`M,#8P,`I`0"`M,S(L,3$@*S,R+#$S($!`"B!'96YE<FEC
-M3F%M95MH:5T]X*2?X*6'X*2J(."DK."EB."DE>"DA>"DJB#@I(G@I*K@I)7@
-MI+#@I*,*($=E;F5R:6-.86UE6VAR73U!;&%T('IA('-I9W5R;F]S;F4@:V]P
-M:6IE(&YA('1R86-I"B!'96YE<FEC3F%M95MH=5T]4WIA;&%G;W,@;65N=,.I
-M<PHK1V5N97)I8TYA;65;:7-=/5-PP[-L=2!A9G)I='5N87)TP[-L"B!'96YE
-M<FEC3F%M95MI=%T]4')O9W)A;6UA('!E<B!I;"!B86-K=7`@<W4@;F%S=')O
-M"B!'96YE<FEC3F%M95MJ85T]XX.&XX.\XX.7XX.0XX.#XX*OXX*BXX.#XX.7
-MXX.$XX.\XX.K"B!'96YE<FEC3F%M95MK;UT][86,[)VT[92$ZZ&<(.R7K.NR
-MC"#KL)OKBI0@ZX^$ZK6L"B!'96YE<FEC3F%M95ML=%T]2G5O<W1I;FEO(&%R
-M8VAY=F%V:6UO('!R:65M;V[$EPH@1V5N97)I8TYA;65;;'9=/4QE;G1A<R!2
-M97IE<G;$D\6A86YA<R!2Q*MK<PHK1V5N97)I8TYA;65;;6M=/="1T+70NM"P
-MT+\@T+#0N]"PT8+0NM"P"B!'96YE<FEC3F%M95MM;ET]T*'0OM&`T+[0O="W
-MT+[0O2#1A="PT+O1C-&!T+#0O="T(-"ET+#0M-"ST+#0N]"PT+/1APH@1V5N
-M97)I8TYA;65;;7-=/4%L870@1V%N=&D@4V5D:6$*($=E;F5R:6-.86UE6VUT
-M73U'Q*=O9&1A(&?$IV%L(&)A8VMU<"!F=7$@=&%P97,*9&EF9B`M3G)U82!K
-M9&5A9&UI;BTS+C(N,"]K<&%C:V%G92]K<&%C:V%G92YD97-K=&]P(&MD96%D
-M;6EN+6)R86YC:"]K<&%C:V%G92]K<&%C:V%G92YD97-K=&]P"BTM+2!K9&5A
-M9&UI;BTS+C(N,"]K<&%C:V%G92]K<&%C:V%G92YD97-K=&]P"3(P,#0M,#$M
-M,34@,#$Z,S4Z,3,N,#`P,#`P,#`P("TP-C`P"BLK*R!K9&5A9&UI;BUB<F%N
-M8V@O:W!A8VMA9V4O:W!A8VMA9V4N9&5S:W1O<`DR,#`T+3`R+3$Q(#$P.C(V
-M.C(W+C`P,#`P,#`P,"`M,#8P,`I`0"`M-2PW("LU+#8@0$`*($YA;65;96]=
-M/5!A:V'$M6%D;6EN:7-T<FEL;PH@3F%M95MF;UT]2U!A:VMA"B!.86UE6VAI
-M73W@I)7@I8<MX*2JX*6(X*25X*6'X*2<"BU.86UE6VES73U086MK87-T:L.#
-MPK-R:0H@3F%M95MK;UT]2T1%(.J^N.N?K.NON`H@3F%M95ML=ET]2U!A:V]T
-M;F4*($YA;65;;6Y=/=":T)30E2#0D="PT+/1A@I`0"`M,SDL,3(@*S,X+#$S
-M($!`"B!'96YE<FEC3F%M95MH:5T]X*2JX*6(X*25X*6'X*2<(."DJN"EC>"D
-ML."DK."D@N"DI^"DE0H@1V5N97)I8TYA;65;:')=/4%L870@>F$@=7!R879L
-M:F%N:F4@<&%K971I;6$*($=E;F5R:6-.86UE6VAU73U496QE<,.M=,61"BU'
-M96YE<FEC3F%M95MI<UT]4&%K:V%S=&K#@\*S<FD**T=E;F5R:6-.86UE6VES
-M73U086MK87-T:L.S<FD*($=E;F5R:6-.86UE6VET73U'97-T:6]N92!P86-C
-M:&5T=&D*($=E;F5R:6-.86UE6VIA73WC@Y'C@X/C@K'C@[SC@KCC@Y[C@XWC
-M@[SC@KCC@Z/C@[P*($=E;F5R:6-.86UE6VMO73WJOKCKGZSKK[@@ZK2`ZZ:L
-M[)Z0"B!'96YE<FEC3F%M95ML=%T]4&%K973%LR!T=F%R:WEK;,27"B!'96YE
-M<FEC3F%M95ML=ET]4&%K;W3%AG4@365N963%OF5R<PHK1V5N97)I8TYA;65;
-M;6M=/="?T+#0NM"UT8(@T)S0M="]T+#1G]"UT8`*($=E;F5R:6-.86UE6VUN
-M73W0D="PT+/1AB#0E]"^T870N-&&T8/1@]"[T+#0L]&'"B!'96YE<FEC3F%M
-M95MM<UT]4&5N9W5R=7,@4&%K96H*($=E;F5R:6-.86UE6VUT73U-86YA9V5R
-M('1A)R!P86MK971T:0ID:69F("U.<G5A(&MD96%D;6EN+3,N,BXP+VMP86-K
-M86=E+VUI;65T>7!E<R]X+61E8FEA;BUP86-K86=E+F1E<VMT;W`@:V1E861M
-M:6XM8G)A;F-H+VMP86-K86=E+VUI;65T>7!E<R]X+61E8FEA;BUP86-K86=E
-M+F1E<VMT;W`*+2TM(&MD96%D;6EN+3,N,BXP+VMP86-K86=E+VUI;65T>7!E
-M<R]X+61E8FEA;BUP86-K86=E+F1E<VMT;W`),C`P-"TP,2TQ-2`P,3HS-3HQ
-M-2XP,#`P,#`P,#`@+3`V,#`**RLK(&MD96%D;6EN+6)R86YC:"]K<&%C:V%G
-M92]M:6UE='EP97,O>"UD96)I86XM<&%C:V%G92YD97-K=&]P"3(P,#0M,#(M
-M,#<@,#8Z-#`Z,3$N,#`P,#`P,#`P("TP-C`P"D!`("TR-RPW("LR-RPW($!`
-M"B!#;VUM96YT6VAR73U$96)I86X@<&%K970*($-O;6UE;G1;:'5=/41E8FEA
-M;B!C<V]M86<*($-O;6UE;G1;:61=/5!A:V5T($1E8FEA;@HM0V]M;65N=%MI
-M<UT]1&5B:6%N+7!A:VMI"BM#;VUM96YT6VES73U$96)I86X@<&%K:VD*($-O
-M;6UE;G1;:71=/5!A8V-H971T;R!$96)I86X*($-O;6UE;G1;:F%=/41E8FEA
-M;N.#D>.#@^."L>.#O.."N`H@0V]M;65N=%MK;UT]ZXVPZ[F$[)6((.J^N.N?
-MK.NON`ID:69F("U.<G5A(&MD96%D;6EN+3,N,BXP+VMS>7-V+VMS>7-V+F1E
-M<VMT;W`@:V1E861M:6XM8G)A;F-H+VMS>7-V+VMS>7-V+F1E<VMT;W`*+2TM
-M(&MD96%D;6EN+3,N,BXP+VMS>7-V+VMS>7-V+F1E<VMT;W`),C`P-"TP,2TQ
-M-2`P,3HS-3HQ-RXP,#`P,#`P,#`@+3`V,#`**RLK(&MD96%D;6EN+6)R86YC
-M:"]K<WES=B]K<WES=BYD97-K=&]P"3(P,#0M,#(M,3$@,3`Z,C8Z,CDN,#`P
-M,#`P,#`P("TP-C`P"D!`("TR-"PQ,B`K,C0L,3,@0$`*($YA;65;:')=/5-Y
-M<U8@26YI="!5<F7$D6EV8<2-"B!.86UE6VAU73U+4WES5@H@3F%M95MI9%T]
-M161I=&]R(%-Y<U8@:6YI=`HM3F%M95MI<UT]4WES5B!);FET+7-T:L.#PK-R
-M:0HK3F%M95MI<UT]4WES5B!);FET+7-T:L.S<FD*($YA;65;:71=/45D:71O
-M<B!P97(@4WES5BU);FET"BU.86UE6VIA73U3>7-6+4EN:70@XX*HXX.'XX*C
-MXX*_"BM.86UE6VIA73U3>7-T96U6Z+6WY8N5XX*YXX*OXX.JXX.7XX.((.."
-MJ..#A^."H^."OPH@3F%M95MK;UT]4WES5B!);FET(.V.N.RGD>JXL`H@3F%M
-M95ML=%T]4WES5BU);FET(')E9&%K=&]R:75S"B!.86UE6VQV73U3>7-6+4EN
-M:70@4F5D86MT;W)S"BM.86UE6VUK73U3>7-6($EN:70@T8/1@-"UT+31@]"R
-MT+#1APH@3F%M95MM;ET]T*'0N-&!T)(MT)C0O="XT8(@T)?0L-&!T++0L-&`
-MT+O0L-"ST8<*($YA;65;;71=/45D:71U<B!3>7-6+4EN:70*($YA;65;;F)=
-M/5-Y<U8M:6YI="UR961I9V5R:6YG"F1I9F8@+4YR=6$@:V1E861M:6XM,RXR
-M+C`O:W-Y<W8O>"UK<WES=BUL;V<N9&5S:W1O<"!K9&5A9&UI;BUB<F%N8V@O
-M:W-Y<W8O>"UK<WES=BUL;V<N9&5S:W1O<`HM+2T@:V1E861M:6XM,RXR+C`O
-M:W-Y<W8O>"UK<WES=BUL;V<N9&5S:W1O<`DR,#`T+3`Q+3$U(#`Q.C,U.C$Y
-M+C`P,#`P,#`P,"`M,#8P,`HK*RL@:V1E861M:6XM8G)A;F-H+VMS>7-V+W@M
-M:W-Y<W8M;&]G+F1E<VMT;W`),C`P-"TP,BTP-"`P-SHS-SHU-RXP,#`P,#`P
-M,#`@+3`V,#`*0$`@+3(L-B`K,BPW($!`"B!%;F-O9&EN9SU55$8M.`H@0V]M
-M;65N=#U3>7-6+4EN:70@161I=&]R($QO9R!&:6QE"B!#;VUM96YT6V)G73W0
-MH-"UT+30L-"ZT8+0OM&`(-"]T+`@T+C0O="XT8;0N-"PT+O0N-"WT+C1@-"P
-MT8G0N-&"T+4@T+W0N-"RT+`@*%-Y<U8M26YI="D**T-O;6UE;G1;8G-=/5-Y
-M<U8M26YI="!%9&ET;W(@;&]G(&1A=&]T96MA"B!#;VUM96YT6V-A73U&:71X
-M97(@9&4@<F5G:7-T<F4@9&4@;"=E9&ET;W(@:6YI="!3>7-6"B!#;VUM96YT
-M6V-S73U:PZ%Z;F%M;W;#O2!S;W5B;W(@<')O9W)A;74@4WES5BU);FET(&5D
-M:71O<G4*($-O;6UE;G1;8WE=/49F96EL($-O9FYO9&D@1V]L>6=Y9&0@4WES
-M5BU);FET"D!`("TQ-BPW("LQ-RPY($!`"B!#;VUM96YT6V=L73U&:6-H96ER
-M;R!D92!297AI<W1R;R!D;R!%9&ET;W(@9&4@26YC:6-I;R!3>7-6"B!#;VUM
-M96YT6VAI73W@I+C@I+_@I+@MX*2UX*6`+>"DA^"DJ."DO^"DGR#@I+C@I(+@
-MI*K@I+[@I*;@I)4@X*2RX*2^X*27(."DJ^"DON"DA^"DL@H@0V]M;65N=%MH
-M=5T]4WES5BU);FET("AS>F]L9\.A;'1A=,.A<W-Z97)K97-Z=,61*2!N87!L
-MP[-FPZ%J;`HK0V]M;65N=%MI<UT]4WES5BU);FET(')I=&QA86YNPZ%L;`H@
-M0V]M;65N=%MI=%T]1FEL92!D:2!L;V<@9&5L;"=E9&ET;W(@9&D@4WES5BU)
-M;FET"BM#;VUM96YT6VIA73U3>7-T96U6Z+6WY8N5XX*YXX*OXX.JXX.7XX.(
-MXX*HXX.'XX*CXX*_XX&NXX.MXX*PXX.5XX*AXX*DXX.K"B!#;VUM96YT6VYB
-M73U,;V=G9FEL(&9O<B!3>7-6+6EN:70M<F5D:6=E<FEN9PH@0V]M;65N=%MN
-M;%T]3&]G8F5S=&%N9"!V86X@4WES5BU);FET($5D:71O<@H@0V]M;65N=%MN
-M;ET]3&]G9V9I;"!F;W(@4WES5BUI;FET+7)E9&EG97)I;F<*9&EF9B`M3G)U
-M82!K9&5A9&UI;BTS+C(N,"]K<WES=B]X+6MS>7-V+F1E<VMT;W`@:V1E861M
-M:6XM8G)A;F-H+VMS>7-V+W@M:W-Y<W8N9&5S:W1O<`HM+2T@:V1E861M:6XM
-M,RXR+C`O:W-Y<W8O>"UK<WES=BYD97-K=&]P"3(P,#0M,#$M,34@,#$Z,S4Z
-M,C$N,#`P,#`P,#`P("TP-C`P"BLK*R!K9&5A9&UI;BUB<F%N8V@O:W-Y<W8O
-M>"UK<WES=BYD97-K=&]P"3(P,#0M,#(M,#(@,#0Z,#DZ,C4N,#`P,#`P,#`P
-M("TP-C`P"D!`("TR-2PY("LR-2PY($!`"B!#;VUM96YT6VAR73U3<')E;6QJ
-M96YA($EN:70@<&]S=&%V80H@0V]M;65N=%MH=5T]16QM96YT971T($EN:70@
-M8F7#H6QLPZUTPZ%S"B!#;VUM96YT6VED73U+;VYF:6=U<F%S:2!3879E9"!)
-M;FET"BU#;VUM96YT6VES73U6:7-T8<.#PK!A<B!);FET('-T:6QL:6YG87(*
-M*T-O;6UE;G1;:7-=/59I<W1AP[!A<B!);FET('-T:6QL:6YG87(*($-O;6UE
-M;G1;:71=/4-O;F9I9W5R87II;VYE(&1I($EN:70@<V%L=F%T80HM0V]M;65N
-M=%MJ85T]Y+^=Y:V8XX&5XX*,XX&FXX&$XX*+26YI=..!KNBHK>6NF@HK0V]M
-M;65N=%MJ85T]Y+^=Y:V8XX&5XX*,XX&FXX&$XX*+Z+6WY8N5XX*YXX*OXX.J
-MXX.7XX.(XX&NZ*BMY:Z:"B!#;VUM96YT6VMO73U);FET(.R$I.R@E>R=A"#L
-MH(#LGJ7MEHCLBK7KBXCKBZ0*($-O;6UE;G1;;'1=/<2N<F'%H7ET;W,@26YI
-M="!P87)I;FMT>7,*($-O;6UE;G1;;'9=/5-A9VQA8L2!=,2!($EN:70@2V]N
-M9FEG=7+$@6-I:F$*9&EF9B`M3G)U82!K9&5A9&UI;BTS+C(N,"]K=7-E<B]K
-M=7-E<BYD97-K=&]P(&MD96%D;6EN+6)R86YC:"]K=7-E<B]K=7-E<BYD97-K
-M=&]P"BTM+2!K9&5A9&UI;BTS+C(N,"]K=7-E<B]K=7-E<BYD97-K=&]P"3(P
-M,#0M,#$M,34@,#$Z,S4Z,C,N,#`P,#`P,#`P("TP-C`P"BLK*R!K9&5A9&UI
-M;BUB<F%N8V@O:W5S97(O:W5S97(N9&5S:W1O<`DR,#`T+3`R+3$Q(#$P.C(V
-M.C,Q+C`P,#`P,#`P,"`M,#8P,`I`0"`M-2PX("LU+#$P($!`"B!.86UE6V5O
-M73U5>F%N=&]A9&UI;FES=')I;&\*($YA;65;9F]=/4M.P[UT87)I"B!.86UE
-M6VAI73W@I)7@I8<MX*2OX*6"X*2<X*2\X*2P"BM.86UE6VES73U+3F]T86YD
-M:0H@3F%M95MK;UT]2T1%(.R"K.R:J>R>D`H@3F%M95ML=ET]2TQI971O=,2!
-M:G,**TYA;65;;6M=/=":T)K0OM&`T+C1@="]T+C0N@H@3F%M95MM;ET]T)K0
-ME-"5(-"ET8W1@-&-T+/0N]&-T+/1APH@3F%M95MN8ET]2T)R=6ME<@H@3F%M
-M95MP;%T]5<6\>71K;W=N:6-Y"D!`("TS."PQ,2`K-#`L,3,@0$`*($=E;F5R
-M:6-.86UE6VAI73W@I(G@I*K@I*_@I8O@I)?@I)7@I+#@I8W@I*3@I+X@X*2J
-MX*6-X*2PX*2LX*2"X*2GX*25"B!'96YE<FEC3F%M95MH<ET]57!R879I=&5L
-M:B!K;W)I<VYI8VEM80H@1V5N97)I8TYA;65;:'5=/49E;&AA<WINPZ%LP[-K
-M97IE;,61"BM'96YE<FEC3F%M95MI<UT]3F]T86YD87-T:L.S<FD*($=E;F5R
-M:6-.86UE6VET73U'97-T:6]N92!U=&5N=&D*($=E;F5R:6-.86UE6VIA73WC
-M@Z;C@[SC@K;C@[SC@Y[C@XWC@[SC@KCC@Z/C@[P*($=E;F5R:6-.86UE6VMO
-M73WL@JSLFJGLGI`@ZK2`ZZ:L[)Z0"B!'96YE<FEC3F%M95ML=%T]5F%R=&]T
-M;VK%LR!T=F%R:WEK;,27"B!'96YE<FEC3F%M95ML=ET]3&EE=&]TQ(%J=2!-
-M96YE9,6^97)I<PHK1V5N97)I8TYA;65;;6M=/="<T+70O="PT9_0M=&`(-"]
-MT+`@T+K0OM&`T+C1@="]T+C1AM"X"B!'96YE<FEC3F%M95MM;ET]T*71C=&`
-MT8W0L]"[T8W0L]&'(-"7T+[1A="XT8;1@]&#T+O0L-"ST8<*($=E;F5R:6-.
-M86UE6VUS73U096YG=7)U<R!096YG9W5N80H@1V5N97)I8TYA;65;;71=/4UA
-M;F%G97(@=&%L+75S97)S"F1I9F8@+4YR=6$@:V1E861M:6XM,RXR+C`O;&EL
-M;RUC;VYF:6<O:V1E+VQI;&\N9&5S:W1O<"!K9&5A9&UI;BUB<F%N8V@O;&EL
-M;RUC;VYF:6<O:V1E+VQI;&\N9&5S:W1O<`HM+2T@:V1E861M:6XM,RXR+C`O
-M;&EL;RUC;VYF:6<O:V1E+VQI;&\N9&5S:W1O<`DR,#`T+3`Q+3$U(#`Q.C,U
-M.C(U+C`P,#`P,#`P,"`M,#8P,`HK*RL@:V1E861M:6XM8G)A;F-H+VQI;&\M
-M8V]N9FEG+VMD92]L:6QO+F1E<VMT;W`),C`P-"TP,BTQ,2`Q,#HR-CHS,RXP
-M,#`P,#`P,#`@+3`V,#`*0$`@+3,R+#$R("LS,BPQ,R!`0`H@3F%M95MH<ET]
-M57!R879I=&5L:B!P;VMR971A;FIE;2!S=7-T879A("A,24Q/*0H@3F%M95MH
-M=5T]4F5N9'-Z97)I;F3#K73#LR`H3$E,3RD*($YA;65;:61=/4UA;F%J97(@
-M0F]O="`H3$E,3RD*+4YA;65;:7-=/5+#@\*F<VES=&K#@\*S<FD@*$Q)3$\I
-M"BM.86UE6VES73U2PZ9S:7-T:L.S<FD@*$Q)3$\I"B!.86UE6VET73U'97-T
-M;W)E(&%V=FEO("A,24Q/*0H@3F%M95MJ85T]XX.6XX.\XX.(XX.>XX.-XX.\
-MXX*XXX.C("A,24Q/*0H@3F%M95MK;UT]Z[:`[8JX(.JT@.NFK.R>D"`HZZ:L
-MZZ&<*0H@3F%M95ML=%T]5<6^:W)O=F]S('1V87)K>6MLQ)<@*$Q)3$\I"B!.
-M86UE6VQV73U3Q(%K;L23Q:%A;F%S($UE;F5DQ;YE<FES("A,24Q/*0HK3F%M
-M95MM:UT]0F]O="#0O-"UT+W0L-&?T+71@"`H3$E,3RD*($YA;65;;6Y=/="1
-MTJ_2K]&"(-"<T+70O="UT+;0M=&`("C0F]"XT+O0OBD*($YA;65;;7-=/5!E
-M;F=U<G5S($)O;W0@*$Q)3$\I"B!.86UE6VYB73U/<'!S=&%R='-B96AA;F1L
-M97(@*$Q)3$\I"D!`("TX,RPY("LX-"PQ,2!`0`H@0V]M;65N=%MH95T]UZG7
-MF=>@UY77F2#7E->2UY/7J->5UZH@3$E,3R`HUY[7H->4UYP@UY37D->9UZK7
-ME]>5UYP@UZG7G"#7G->9UZ#7E=>GUZ$I"B!#;VUM96YT6VAI73W@I++@I+_@
-MI++@I8L@X*25X*6)X*2HX*6-X*2KX*2_X*27X*2P(."DE>"DL."EA^"D@B`H
-MX*2RX*2_X*2HX*25X*6-X*2X(."DK."E@N"DGR#@I*K@I8W@I+#@I*S@I(+@
-MI*?@I)4I"B!#;VUM96YT6VAU73UA($Q)3$\@8F7#H6QLPZUTPZ%S86D**T-O
-M;6UE;G1;:7-=/5-T:6QL82!,24Q/("A,:6YU>"!RPZ9S:7-T:L.S<F%N;BD*
-M($-O;6UE;G1;:71=/4-O;F9I9W5R82!,24Q/("AI;"!G97-T;W)E(&1E;&PG
-M879V:6\@9&D@3&EN=7@I"B!#;VUM96YT6VIA73U,24Q/*$QI;G5XXX.6XX.\
-MXX.(XX.>XX.-XX.\XX*XXX.C*>.!KNBHK>6NF@H@0V]M;65N=%ML=%T]2V]N
-M9FEGQ:MR=6]T:2!,24Q/("A,:6YU>"!UQ;YK<F]V;W,@='9A<FMY:VS$F2D*
-M*T-O;6UE;G1;;6M=/=">T++0M-"U(-"\T+[0MM"UT8+0M2#0M-"P(-"ST+X@
-MT+K0OM"]T830N-"ST8/1@-"XT8#0L-&"T+4@3$E,3RP@T)O0N-"]T8/0NM&!
-M(&)O;W0@T+S0M="]T+#1G]"UT8#0OM&""B!#;VUM96YT6VUN73W0F]"XT+O0
-MOB`HT)O0N-"]TJ_0NM&!(-&-T870N]*OTJ_0N]&-T+/1AR#0O-"UT+W0M="V
-MT+71@"D@T*+0OM&%T+C1@-&#T8/0N]"PT84*($-O;6UE;G1;;7-=/5-E;&%R
-M87-K86X@3$E,3R`H<&5N9W5R=7,@8F]O="!,:6YU>"D*($-O;6UE;G1;;71=
-M/4EK:V]N9FEG=7)A(&PM3$E,3R`H3&EN=7@@3&]A9&5R*0I`0"`M,3,Q+#<@
-M*S$S-"PW($!`"B!+97EW;W)D<UMH:5T]X*2RX*2_X*2RX*6++"#@I*S@I8+@
-MI)\L(."DK."E@N"DG^"DA>"DJBS@I*S@I8+@I)\@X*2JX*6-X*2PX*2LX*2"
-MX*2GX*25+"#@I++@I+_@I*C@I)7@I8W@I+@L(."DA>"DJ."EC>"DKR!/4RP@
-MX*2/X*2NX*2LX*6`X*2&X*2P+"#@I*K@I8W@I+#@I+[@I+#@I(+@I*T@X*2N
-MX*6'X*2"+"#@I*K@I8W@I+#@I+[@I+#@I(+@I*T*($ME>7=O<F1S6VAU73UL
-M:6QO+&)O;W0L<F5N9'-Z97)I;F3#K73#H7,L<F5N9'-Z97)I;F3#K73#H7,M
-M:V5Z96S%D2Q,:6YU>"QMPZ%S(&]P97+#H6-IP[-S(')E;F1S>F5R96LL34)2
-M+&EN9'5LPZ%S+'-T87)T"B!+97EW;W)D<UMI9%T];&EL;RQB;V]T+&)O;W1U
-M<"QM86YA:F5R(&)O;W0L;&EN=7@L3U,@3&%I;FYY82Q-0E(L<W1A<G1U<"QS
-M=&%R=`HM2V5Y=V]R9'-;:7-=/6QI;&\L8F]O="QB;V]T=7`L8F]O="!M86YA
-M9V5R+&QI;G5X+$]T:&5R($]3+$U"4BQS=&%R='5P+'-T87)T+'+#@\*F<V$*
-M*TME>7=O<F1S6VES73UL:6QO+&)O;W0L8F]O='5P+&)O;W0@;6%N86=E<BQL
-M:6YU>"Q/=&AE<B!/4RQ-0E(L<W1A<G1U<"QS=&%R="QRPZ9S80H@2V5Y=V]R
-M9'-;:71=/6QI;&\L8F]O="QB;V]T(&UA;F%G97(L;&EN=7@L86QT<FD@<VES
-M=&5M:2!O<&5R871I=FDL34)2+&%V=FEO+&=E<W1O<F4@879V:6\*($ME>7=O
-M<F1S6VIA73UL:6QO+..#EN.#O..#B"SC@Y;C@[SC@X@LXX.6XX.\XX.(XX.>
-MXX.-XX.\XX*XXX.C+&QI;G5X+.2[EN.!KD]3+$U"4BSHM;?EBY4LZ9:+Y:>+
-M"B!+97EW;W)D<UMK;UT];&EL;RQB;V]T+&)O;W1U<"QB;V]T(&UA;F%G97(L
-M;&EN=7@L3W1H97(@3U,L34)2+'-T87)T=7`L<W1A<G0LZZ:LZZ&<+.NV@.V*
-MN"SKMH#MC(4LZ[:`[8JX(.JT@.NFK.R>D"SKIJSKB(7LBJ0LZXNDZZ6X($]3
-<+.N+I.NEN"#LFK3LF('LLK3LH)PL[(N<[)Z1"@``
+M9&EF9B`M3G)U82!K9&5A9&UI;BTS+C(N,2]K8VUL:6YU>B]L:6YU>BYD97-K
+M=&]P(&MD96%D;6EN+6)R86YC:"]K8VUL:6YU>B]L:6YU>BYD97-K=&]P"BTM
+M+2!K9&5A9&UI;BTS+C(N,2]K8VUL:6YU>B]L:6YU>BYD97-K=&]P"3(P,#0M
+M,#(M,3$@,3`Z,C8Z,C$N,#`P,#`P,#`P("TP-C`P"BLK*R!K9&5A9&UI;BUB
+M<F%N8V@O:V-M;&EN=7HO;&EN=7HN9&5S:W1O<`DR,#`T+3`R+3(Y(#`X.C0R
+M.C4U+C`P,#`P,#`P,"`M,#8P,`I`0"`M,S0L-B`K,S0L-R!`0`H@3F%M95MS
+M:UT]2V5R;F5L($QI;G5X=0H@3F%M95MS;%T]2F5D<F\@3&EN=7AA"B!.86UE
+M6W-R73W0F]"XT+W1@]"ZT8$@T)K0M=&`T+W0M="["BM.86UE6W-R0$QA=&Y=
+M/4QI;G5K<R!+97)N96P*($YA;65;<W9=/4QI;G5X+6O#I')N86X*($YA;65;
+M=')=/4QI;G5X(,.'96MI<F1EQ)]I"B!.86UE6W5K73W0K]"TT8#0OB!,:6YU
+M>`I`0"`M.30L-B`K.34L-R!`0`H@0V]M;65N=%MS:UT]2T1%(')O>FAR86YI
+M92!P<F4@:V]N9FEG=7+#H6-I=2!K97)N96QU($QI;G5X=0H@0V]M;65N=%MS
+M;%T]5FUE<VYI:R!+1$4@>F$@;W)O9&IE('IA(&YA<W1A=FQJ86YJ92!J961R
+M82!,:6YU>&$*($-O;6UE;G1;<W)=/4M$12#0O]&`T+[0L]&`T+#0O"#0M]"P
+M(-"_T+[0M-"UT8C0L-"RT+#1FM"U(-";T+C0O=&#T+K1@2#0FM"UT8#0O="U
+MT+O0L`HK0V]M;65N=%MS<D!,871N73U+1$4@<')O9W)A;2!Z82!P;V1EQ:%A
+M=F%N:F4@3&EN=6MS($ME<FYE;&$*($-O;6UE;G1;<W9=/4M$12UG<L.D;G-S
+M;FET="!FP[9R(&%N<&%S<VYI;F<@878@3&EN=7@M:\.D<FYA;@H@0V]M;65N
+M=%MT85T]2T1%(."NJN"NE>"O@>"NI."NO^"NE>"OC>"NE>"NON"NE2#@KK+@
+MKK_@KJG@KI7@KXW@KKC@KXT@X*Z5X*^&X*ZPX*^-X*ZIX*ZRX*^-(."NB>"N
+ML^"OC>"NL^"NKN"OB."NM>"O@0H@0V]M;65N=%MT:%T]X+B?X+BCX+F)X+BM
+MX+B9X+B5X+F,X+F`X+BMX+B9X+B4X+F,($M$12#@N*K@N+/@N*O@N*/@N+'@
+MN)K@N)O@N*/@N+'@N)K@N8'@N)7@N8C@N(?@N8#@N(3@N*W@N*/@N8S@N8#@
+MN)G@N*7@N*7@N+3@N)G@N+C@N('@N(O@N8P*9&EF9B`M3G)U82!K9&5A9&UI
+M;BTS+C(N,2]K8W)O;B]K8W)O;BYD97-K=&]P(&MD96%D;6EN+6)R86YC:"]K
+M8W)O;B]K8W)O;BYD97-K=&]P"BTM+2!K9&5A9&UI;BTS+C(N,2]K8W)O;B]K
+M8W)O;BYD97-K=&]P"3(P,#0M,#(M,3$@,3`Z,C8Z,C,N,#`P,#`P,#`P("TP
+M-C`P"BLK*R!K9&5A9&UI;BUB<F%N8V@O:V-R;VXO:V-R;VXN9&5S:W1O<`DR
+M,#`T+3`R+3(Y(#`X.C0R.C4W+C`P,#`P,#`P,"`M,#8P,`I`0"`M-3@L-B`K
+M-3@L-R!`0`H@1V5N97)I8TYA;65;<VM=/5!LPZ%N;W9AQ(T@P[IL;V@*($=E
+M;F5R:6-.86UE6W-L73U287IP;W)E:F5V86QN:6L@;W!R879I;`H@1V5N97)I
+M8TYA;65;<W)=/=">T8#0L]"PT+W0N-"WT+#1@M"^T8`@T+?0L-"TT+#1@M"P
+MT+K0L`HK1V5N97)I8TYA;65;<W)`3&%T;ET]3W)G86YI>F%T;W(@>F%D871A
+M:V$*($=E;F5R:6-.86UE6W-V73U*;V)B<V-H96UA;,.D9V=A<F4*($=E;F5R
+M:6-.86UE6W1A73W@KJK@KJ/@KK\@X*ZNX*^!X*ZQX*^(X*ZJX*^-X*ZJX*Z?
+MX*^!X*ZDX*^-X*ZDX*Z_"B!'96YE<FEC3F%M95MT:%T]X+B5X+BRX+BCX+BR
+MX+B'X+B'X+BRX+B9"F1I9F8@+4YR=6$@:V1E861M:6XM,RXR+C$O:V1A="]K
+M9&%T+F1E<VMT;W`@:V1E861M:6XM8G)A;F-H+VMD870O:V1A="YD97-K=&]P
+M"BTM+2!K9&5A9&UI;BTS+C(N,2]K9&%T+VMD870N9&5S:W1O<`DR,#`T+3`R
+M+3$Q(#$P.C(V.C(U+C`P,#`P,#`P,"`M,#8P,`HK*RL@:V1E861M:6XM8G)A
+M;F-H+VMD870O:V1A="YD97-K=&]P"3(P,#0M,#(M,CD@,#@Z-#(Z-3DN,#`P
+M,#`P,#`P("TP-C`P"D!`("TU-"PV("LU-"PW($!`"B!'96YE<FEC3F%M95MS
+M:UT]6L.A;&]H;W9A;FEE(&YA('##H7-K=0H@1V5N97)I8TYA;65;<VQ=/4]R
+M;V1J92!Z82!T<F'$C6YE(')E>F5R=FYE(&MO<&EJ90H@1V5N97)I8TYA;65;
+M<W)=/="0T+O0L-&"(-"WT+`@T+#1@-&%T+C0LM"XT8#0L-&:T+4@T+W0L"#1
+M@M&`T+#0NM&#"BM'96YE<FEC3F%M95MS<D!,871N73U!;&%T('IA(&%R:&EV
+M:7)A;FIE(&YA('1R86MU"B!'96YE<FEC3F%M95MS=ET]5F5R:W1Y9R!FP[9R
+M(&)A;F1SPZ1K97)H971S:V]P:65R:6YG"B!'96YE<FEC3F%M95MT85T]X*Z?
+MX*^'X*ZJX*^-(."NJN"NO^"NH^"OC>"NHPH@1V5N97)I8TYA;65;=&A=/>"Y
+M@."XA."XH^"XM^"YB."XK>"XA^"XH>"XM^"XK>"Y@."XE^"XF^"XJN"XL^"X
+MH^"XK>"XA^"X@N"YB>"XK>"XH>"XN>"XI0ID:69F("U.<G5A(&MD96%D;6EN
+M+3,N,BXQ+VMF:6QE+7!L=6=I;G,O9&5B+VMF:6QE7V1E8BYD97-K=&]P(&MD
+M96%D;6EN+6)R86YC:"]K9FEL92UP;'5G:6YS+V1E8B]K9FEL95]D96(N9&5S
+M:W1O<`HM+2T@:V1E861M:6XM,RXR+C$O:V9I;&4M<&QU9VEN<R]D96(O:V9I
+M;&5?9&5B+F1E<VMT;W`),C`P-"TP,2TQ-2`P,3HS-3HP.2XP,#`P,#`P,#`@
+M+3`V,#`**RLK(&MD96%D;6EN+6)R86YC:"]K9FEL92UP;'5G:6YS+V1E8B]K
+M9FEL95]D96(N9&5S:W1O<`DR,#`T+3`S+3`U(#`V.C0Y.C,Y+C`P,#`P,#`P
+M,"`M,#8P,`I`0"`M,30L-B`K,30L-R!`0`H@3F%M95MF:5T]1$5"+71I;&%S
+M=&]T"B!.86UE6V9O73U$14(M:&%G=,.X;`H@3F%M95MF<ET]PXET870@1$5"
+M"BM.86UE6V=A73U3=&%I=&ES=&EC($1%0@H@3F%M95MG;%T]17-T873#K7-T
+M:6-A<R!$14(*($YA;65;:&5=/=>AUYC7F->9UZ'7F->9UZ?7JB!$14(*($YA
+M;65;:&E=/>"DH>"E@."DB."DK."E@"#@I+C@I8W@I)_@I8?@I)_@I8W@I+@*
+M0$`@+3,U+#8@*S,V+#<@0$`*($YA;65;<VM=/<6@=&%T:7-T:6MY($1%0@H@
+M3F%M95MS;%T]4W1A=&ES=&EK92!$14(*($YA;65;<W)=/41%0B#0H=&"T+#1
+M@M"XT8'1@M"XT+K0M0HK3F%M95MS<D!,871N73U$14(@4W1A=&ES=&EK90H@
+M3F%M95MS=ET]1$5"+7-T871I<W1I:PH@3F%M95MT85T]X*Z?X*Z_X*ZOX*Z_
+MX*ZJX*Z_(."NJN"O@>"NL^"OC>"NL^"NOR#@KK7@KK_@KK7@KK#@KJ[@KXT*
+M($YA;65;=&A=/>"XJN"XEN"XM."XE>"XM."X@N"XK>"XAR!$14(*9&EF9B`M
+M3G)U82!K9&5A9&UI;BTS+C(N,2]K9FEL92UP;'5G:6YS+W)P;2]K9FEL95]R
+M<&TN9&5S:W1O<"!K9&5A9&UI;BUB<F%N8V@O:V9I;&4M<&QU9VEN<R]R<&TO
+M:V9I;&5?<G!M+F1E<VMT;W`*+2TM(&MD96%D;6EN+3,N,BXQ+VMF:6QE+7!L
+M=6=I;G,O<G!M+VMF:6QE7W)P;2YD97-K=&]P"3(P,#0M,#$M,34@,#$Z,S4Z
+M,3$N,#`P,#`P,#`P("TP-C`P"BLK*R!K9&5A9&UI;BUB<F%N8V@O:V9I;&4M
+M<&QU9VEN<R]R<&TO:V9I;&5?<G!M+F1E<VMT;W`),C`P-"TP,RTP-2`P-CHT
+M.3HT,BXP,#`P,#`P,#`@+3`V,#`*0$`@+3$T+#8@*S$T+#<@0$`*($YA;65;
+M9FE=/5)032UT:6QA<W1O=`H@3F%M95MF;UT]4E!-+6AA9W3#N&P*($YA;65;
+M9G)=/<.)=&%T(%)030HK3F%M95MG85T]4W1A:71I<W1I8R!24$T*($YA;65;
+M9VQ=/45S=&%TPZUS=&EC87,@4E!-"B!.86UE6VAE73W7H=>8UYC7F=>AUYC7
+MF=>GUZH@4E!-"B!.86UE6VAI73W@I(;@I+#@I*K@I8#@I(_@I*X@X*2XX*6-
+MX*2?X*6'X*2?X*6-X*2X"D!`("TS-RPV("LS."PW($!`"B!.86UE6W-K73W%
+MH'1A=&ES=&EK>2!24$T*($YA;65;<VQ=/5-T871I<W1I:V4@4E!-"B!.86UE
+M6W-R73U24$T@T*'1@M"PT8+0N-&!T8+0N-"ZT+4**TYA;65;<W)`3&%T;ET]
+M4E!-(%-T871I<W1I:V4*($YA;65;<W9=/5)032US=&%T:7-T:6L*($YA;65;
+M=&%=/>"NAN"NL."OC>"NJN"NO^"NK^"NKN"OC2#@KJK@KX'@KK/@KXW@KK/@
+MKK\@X*ZUX*Z_X*ZUX*ZPX*ZNX*^-"B!.86UE6W1H73W@N*K@N);@N+3@N)7@
+MN+3@N(+@N*W@N(<@4E!-"F1I9F8@+4YR=6$@:V1E861M:6XM,RXR+C$O:W!A
+M8VMA9V4O:W!A8VMA9V4N9&5S:W1O<"!K9&5A9&UI;BUB<F%N8V@O:W!A8VMA
+M9V4O:W!A8VMA9V4N9&5S:W1O<`HM+2T@:V1E861M:6XM,RXR+C$O:W!A8VMA
+M9V4O:W!A8VMA9V4N9&5S:W1O<`DR,#`T+3`R+3$Q(#$P.C(V.C(W+C`P,#`P
+M,#`P,"`M,#8P,`HK*RL@:V1E861M:6XM8G)A;F-H+VMP86-K86=E+VMP86-K
+M86=E+F1E<VMT;W`),C`P-"TP,RTP-2`P-CHT.3HT-"XP,#`P,#`P,#`@+3`V
+M,#`*0$`@+3,S+#<@*S,S+#@@0$`*($=E;F5R:6-.86UE6V9I73U/:&IE;&UA
+M<&%K971T:65N(&AA;&QI;G1A"B!'96YE<FEC3F%M95MF;UT]4&%K:V%H86YD
+M9F%R87)I"B!'96YE<FEC3F%M95MF<ET]1V5S=&EO;FYA:7)E(&1E('!A<75E
+M=&%G97,*+4=E;F5R:6-.86UE6V=L73U897-T;W(@9&4@4&%Q=65N=&5S"BM'
+M96YE<FEC3F%M95MG85T]0F%I;FES=&5O:7(@4&%CPZ%I<W3#K0HK1V5N97)I
+M8TYA;65;9VQ=/5AE<W1O<B!D92!087%U971E<PH@1V5N97)I8TYA;65;:&5=
+M/=>>UZ#7E-><(->7UY'7F=><UY77J@H@1V5N97)I8TYA;65;:&E=/>"DJN"E
+MB."DE>"EA^"DG"#@I*K@I8W@I+#@I*S@I(+@I*?@I)4*($=E;F5R:6-.86UE
+M6VAR73U!;&%T('IA('5P<F%V;&IA;FIE('!A:V5T:6UA"D!`("TV,"PV("LV
+M,2PW($!`"B!'96YE<FEC3F%M95MS:UT]4W!RPZ%V8V$@8F%LPZUK;W8*($=E
+M;F5R:6-.86UE6W-L73U5<')A=FQJ86QN:6L@<&%K971O=@H@1V5N97)I8TYA
+M;65;<W)=/="<T+70O="PT9_0M=&`(-"_T+#0NM"UT8+0L`HK1V5N97)I8TYA
+M;65;<W)`3&%T;ET]365N863%OF5R('!A:V5T80H@1V5N97)I8TYA;65;<W9=
+M/5!A:V5T:&%N=&5R87)E"B!'96YE<FEC3F%M95MT85T]X*ZDX*^*X*Z5X*^!
+MX*ZJX*^-X*ZJX*^!(."NKN"OA^"NLN"NON"NL^"NL."OC0H@1V5N97)I8TYA
+M;65;=&A=/>"Y@."XA."XH^"XM^"YB."XK>"XA^"XH>"XM^"XK>"XB."XL>"X
+ME."X@>"XLN"XH^"Y@>"XGN"YA^"XA."Y@."X@>"XB`ID:69F("U.<G5A(&MD
+M96%D;6EN+3,N,BXQ+VMP86-K86=E+VUI;65T>7!E<R]X+61E8FEA;BUP86-K
+M86=E+F1E<VMT;W`@:V1E861M:6XM8G)A;F-H+VMP86-K86=E+VUI;65T>7!E
+M<R]X+61E8FEA;BUP86-K86=E+F1E<VMT;W`*+2TM(&MD96%D;6EN+3,N,BXQ
+M+VMP86-K86=E+VUI;65T>7!E<R]X+61E8FEA;BUP86-K86=E+F1E<VMT;W`)
+M,C`P-"TP,BTP-R`P-CHT,#HQ,2XP,#`P,#`P,#`@+3`V,#`**RLK(&MD96%D
+M;6EN+6)R86YC:"]K<&%C:V%G92]M:6UE='EP97,O>"UD96)I86XM<&%C:V%G
+M92YD97-K=&]P"3(P,#0M,#,M,#4@,#8Z-#DZ-#8N,#`P,#`P,#`P("TP-C`P
+M"D!`("TR,2PV("LR,2PW($!`"B!#;VUM96YT6V9I73U$96)I86XM<&%K971T
+M:0H@0V]M;65N=%MF;UT]1&5B:6%N+7!A:VMA"B!#;VUM96YT6V9R73U087%U
+M971A9V4@1&5B:6%N"BM#;VUM96YT6V=A73U086/#H6ES=&4@1&5B:6%N"B!#
+M;VUM96YT6V=L73U087%U971E($1E8FEA;@H@0V]M;65N=%MH95T]UY?7D=>9
+MUYS7JB!$96)I86X*($-O;6UE;G1;:&E=/>"DH>"EA^"DK."DO^"DK^"DJ"#@
+MI*K@I8C@I)7@I8?@I)P*0$`@+30Y+#8@*S4P+#<@0$`*($-O;6UE;G1;<VM=
+M/41E8FEA;F]V<VO#O2!B86S#K6L*($-O;6UE;G1;<VQ=/5!A:V5T($1E8FEA
+M;@H@0V]M;65N=%MS<ET]T)_1@-"^T+/1@-"PT+S1@="ZT+@@T+_0L-"ZT+71
+M@B#0M]"P($1E8FEA;@HK0V]M;65N=%MS<D!,871N73U0<F]G<F%M<VMI('!A
+M:V5T('IA($1E8FEA;@H@0V]M;65N=%MS=ET]1&5B:6%N+7!A:V5T"B!#;VUM
+M96YT6W1A73W@KI_@KX;@KJK@KK_@KJ_@KJG@KXT@X*ZDX*^*X*Z5X*^!X*ZJ
+MX*^-X*ZJX*^!"B!#;VUM96YT6W1H73W@N8'@N)[@N8?@N(3@N8#@N('@N(C@
+MN8#@N)3@N8#@N)K@N+7@N*+@N)D*9&EF9B`M3G)U82!K9&5A9&UI;BTS+C(N
+M,2]K<WES=B]K<WES=BYD97-K=&]P(&MD96%D;6EN+6)R86YC:"]K<WES=B]K
+M<WES=BYD97-K=&]P"BTM+2!K9&5A9&UI;BTS+C(N,2]K<WES=B]K<WES=BYD
+M97-K=&]P"3(P,#0M,#(M,3$@,3`Z,C8Z,CDN,#`P,#`P,#`P("TP-C`P"BLK
+M*R!K9&5A9&UI;BUB<F%N8V@O:W-Y<W8O:W-Y<W8N9&5S:W1O<`DR,#`T+3`R
+M+3(Y(#`X.C0S.C`Y+C`P,#`P,#`P,"`M,#8P,`I`0"`M-#0L-B`K-#0L-R!`
+M0`H@3F%M95MS:UT]4WES5BU);FET(&5D:71O<@H@3F%M95MS;%T]57)E:F5V
+M86QN:6L@>F'$C65T;FEH(&YA<W1A=FET978@4WES5@H@3F%M95MS<ET]T*/1
+M@-"UT9+0N-"RT+#1AR!3>7-6+6EN:70MT+`**TYA;65;<W)`3&%T;ET]57)E
+MQ)%I=F'$C2!3>7-6+6EN:70M80H@3F%M95MS=ET]4WES=BUS=&%R=&5D:71O
+M<@H@3F%M95MT85T]X*Z:X*Z_X*ZXX*^-(."NM>"NORW@KH?@KJG@KXW@KI_@
+MKXT@X*ZDX*Z_X*ZPX*Z_X*ZDX*^-X*ZDX*^!X*ZJX*ZUX*ZPX*^-"B!.86UE
+M6W1H73W@N8'@N('@N8G@N83@N(+@N('@N++@N*/@N8#@N*/@N+3@N8C@N*'@
+MN*/@N+#@N)K@N)K@N8'@N)K@N)H@4WES5@ID:69F("U.<G5A(&MD96%D;6EN
+M+3,N,BXQ+VMS>7-V+W@M:W-Y<W8M;&]G+F1E<VMT;W`@:V1E861M:6XM8G)A
+M;F-H+VMS>7-V+W@M:W-Y<W8M;&]G+F1E<VMT;W`*+2TM(&MD96%D;6EN+3,N
+M,BXQ+VMS>7-V+W@M:W-Y<W8M;&]G+F1E<VMT;W`),C`P-"TP,BTP-"`P-SHS
+M-SHU-RXP,#`P,#`P,#`@+3`V,#`**RLK(&MD96%D;6EN+6)R86YC:"]K<WES
+M=B]X+6MS>7-V+6QO9RYD97-K=&]P"3(P,#0M,#(M,CD@,#@Z-#,Z,3$N,#`P
+M,#`P,#`P("TP-C`P"D!`("TS,"PV("LS,"PW($!`"B!#;VUM96YT6W-K73U3
+MP[IB;W(@>L.A>FYA;74@4WES5BU);FET(&5D:71O<F$*($-O;6UE;G1;<VQ=
+M/41A=&]T96MA('H@9&YE=FYI:V]M(%-Y<U8M26YI=`H@0V]M;65N=%MS<ET]
+MT)30O="UT++0O="XT+H@T8/1@-"UT9+0N-"RT+#1A]"P(%-Y<U8M:6YI="W0
+ML`HK0V]M;65N=%MS<D!,871N73U$;F5V;FEK('5R9<21:79AQ(UA(%-Y<U8M
+M:6YI="UA"B!#;VUM96YT6W-V73U%9&ET;W(@9L.V<B!3>7-V+4EN:70M;&]G
+M9V9I;&5R"B!#;VUM96YT6W1A73W@KIK@KK_@KKC@KXW@KK7@KK\MX*Z'X*ZI
+MX*^-X*Z?X*^-(."NI."NO^"NL."NO^"NI."OC>"NI."O@>"NJN"NM>"NL."O
+MC2#@KJK@KJ3@KK_@KK7@KX'@KI7@KXW@KI7@KXO@KJK@KXW@KJK@KX@*($-O
+M;6UE;G1;=')=/5-Y<U8M26[$L70@1,.\>F5N;&5Y:6-I($?#O&YLP[QK($1O
+M<WEA<\2Q"F1I9F8@+4YR=6$@:V1E861M:6XM,RXR+C$O:W-Y<W8O>"UK<WES
+M=BYD97-K=&]P(&MD96%D;6EN+6)R86YC:"]K<WES=B]X+6MS>7-V+F1E<VMT
+M;W`*+2TM(&MD96%D;6EN+3,N,BXQ+VMS>7-V+W@M:W-Y<W8N9&5S:W1O<`DR
+M,#`T+3`R+3`R(#`T.C`Y.C(U+C`P,#`P,#`P,"`M,#8P,`HK*RL@:V1E861M
+M:6XM8G)A;F-H+VMS>7-V+W@M:W-Y<W8N9&5S:W1O<`DR,#`T+3`R+3(Y(#`X
+M.C0S.C$S+C`P,#`P,#`P,"`M,#8P,`I`0"`M-#<L-B`K-#<L-R!`0`H@0V]M
+M;65N=%MS:UT]56QOQ;YE;L.A(&MO;F9I9W5RPZ%C:6$@:6YI=`H@0V]M;65N
+M=%MS;%T]4VAR86YJ96YA('5V;V1N82!S97-T879A"B!#;VUM96YT6W-R73W0
+MH="PT8?1@]"RT+#0O="P(-"_T+[1A]"UT8+0O="P(-"_T+[0M-"UT8C0L-"R
+MT+#1FM"P"BM#;VUM96YT6W-R0$QA=&Y=/5-AQ(UU=F%N82!P;\2-971N82!P
+M;V1EQ:%A=F%N:F$*($-O;6UE;G1;<W9=/5-P87)A9"!S=&%R=&EN<W3#I&QL
+M;FEN9PH@0V]M;65N=%MT85T]X*Z)X*ZSX*^-X*ZSX*^&(."NE>"NON"NE>"O
+MC>"NE>"NJN"OC>"NJN"NG^"OC>"NGR#@KHG@KK/@KXW@KK/@KJ[@KXC@KK7@
+MKX$*($-O;6UE;G1;=&A=/>"XFN"XL>"XF>"XE^"XMN"X@>"XA."YB."XLN"X
+MF^"XH^"XL>"XFN"Y@>"XE>"YB."XA^"X@N"XK>"XA^"X@>"XLN"XH^"Y@."X
+MH^"XM."YB."XH>"XH^"XL."XFN"XF@ID:69F("U.<G5A(&MD96%D;6EN+3,N
+M,BXQ+VMU<V5R+VMU<V5R+F1E<VMT;W`@:V1E861M:6XM8G)A;F-H+VMU<V5R
+M+VMU<V5R+F1E<VMT;W`*+2TM(&MD96%D;6EN+3,N,BXQ+VMU<V5R+VMU<V5R
+M+F1E<VMT;W`),C`P-"TP,BTQ,2`Q,#HR-CHS,2XP,#`P,#`P,#`@+3`V,#`*
+M*RLK(&MD96%D;6EN+6)R86YC:"]K=7-E<B]K=7-E<BYD97-K=&]P"3(P,#0M
+M,#,M,#4@,#8Z-#DZ-#@N,#`P,#`P,#`P("TP-C`P"D!`("TS-2PV("LS-2PW
+M($!`"B!'96YE<FEC3F%M95MF:5T]2\.D>71TPZ1J:65N:&%L;&EN=&$*($=E
+M;F5R:6-.86UE6V9O73U.P[UT87)A:&%N9&9A<F%R:0H@1V5N97)I8TYA;65;
+M9G)=/4=E<W1I;VYN86ER92!D)W5T:6QI<V%T975R<PHK1V5N97)I8TYA;65;
+M9V%=/4)A:6YI<W1E;VER(,.:<\.A:61E;W)A"B!'96YE<FEC3F%M95MG;%T]
+M6&5S=&]R(&1E(%5S=6%R:6]S"B!'96YE<FEC3F%M95MH95T]UY[7H->4UYP@
+MUY[7J=>JUY[7J=>9UYT*($=E;F5R:6-.86UE6VAI73W@I(G@I*K@I*_@I8O@
+MI)?@I)7@I+#@I8W@I*3@I+X@X*2JX*6-X*2PX*2LX*2"X*2GX*25"D!`("TV
+M,BPV("LV,RPW($!`"B!'96YE<FEC3F%M95MS:UT]4W!RPZ%V8V$@<&]UQ;[#
+MK79A=&7$OF]V"B!'96YE<FEC3F%M95MS;%T]57!R879L:F%L;FEK('5P;W)A
+M8FYI:V]V"B!'96YE<FEC3F%M95MS<ET]T)S0M="]T+#1G]"UT8`@T+K0OM&`
+MT+C1@="]T+C0NM"P"BM'96YE<FEC3F%M95MS<D!,871N73U-96YA9,6^97(@
+M:V]R:7-N:6MA"B!'96YE<FEC3F%M95MS=ET]06YVPZ1N9&%R:&%N=&5R87)E
+M"B!'96YE<FEC3F%M95MT85T]X*ZJX*ZOX*ZIX*^`X*Z?X*^-X*Z?X*Z^X*ZS
+MX*ZPX*^-(."NKN"OA^"NLN"NON"NL^"NL."OC0H@1V5N97)I8TYA;65;=&A=
+M/>"Y@."XA."XH^"XM^"YB."XK>"XA^"XH>"XM^"XK>"XB."XL>"XE."X@>"X
+MLN"XH^"XFN"XL>"XC>"XBN"XM>"XG."XN>"YB>"Y@^"XBN"YB0ID:69F("U.
+M<G5A(&MD96%D;6EN+3,N,BXQ+VQI;&\M8V]N9FEG+VMD92]L:6QO+F1E<VMT
+M;W`@:V1E861M:6XM8G)A;F-H+VQI;&\M8V]N9FEG+VMD92]L:6QO+F1E<VMT
+M;W`*+2TM(&MD96%D;6EN+3,N,BXQ+VQI;&\M8V]N9FEG+VMD92]L:6QO+F1E
+M<VMT;W`),C`P-"TP,BTQ,2`Q,#HR-CHS,RXP,#`P,#`P,#`@+3`V,#`**RLK
+M(&MD96%D;6EN+6)R86YC:"]L:6QO+6-O;F9I9R]K9&4O;&EL;RYD97-K=&]P
+M"3(P,#0M,#(M,CD@,#@Z-#,Z,3<N,#`P,#`P,#`P("TP-C`P"D!`("TU,RPV
+M("LU,RPW($!`"B!.86UE6W-K73U3<'+#H79C82!B;V]T;W9A;FEA("A,24Q/
+M*0H@3F%M95MS;%T]57!R879L:F%L;FEK('IA9V]N82`H3$E,3RD*($YA;65;
+M<W)=/="1T8/1@B#0O-"UT+W0L-&?T+71@"`H3$E,3RD**TYA;65;<W)`3&%T
+M;ET]0G5T(&UE;F%DQ;YE<B`H3$E,3RD*($YA;65;<W9=/5-T87)T:&%N=&5R
+M87)E("A,:6QO*0H@3F%M95MT85T]X*Z'X*ZOX*Z5X*^-X*Z5(."NKN"OA^"N
+MLN"NON"NL^"NL."OC2A,24Q/*0H@3F%M95MT:%T]X+B(X+BQX+B4X+B!X+BR
+MX+BCX+B!X+BRX+BCX+B:X+BYX+B5("A,24Q/*0I`0"`M,3`T+#8@*S$P-2PW
+M($!`"B!#;VUM96YT6W-K73U.87-T879E;FEE($Q)3$\@*'-P<L.A=F-A(&)O
+M;W1O=F%N:6$@<')E($QI;G5X*0H@0V]M;65N=%MS;%T]3F%S=&%V:71V92!,
+M24Q/("AZ86=O;G-K:2!U<')A=FQJ86QN:6L@>F$@3&EN=7@I"B!#;VUM96YT
+M6W-R73W0G]"^T+30M=&!T+C1@M"U($Q)3$\@*-";T+C0O=&#T+K1@2#0L=&#
+MT8(@T+S0M="]T+#1G]"UT8`I"BM#;VUM96YT6W-R0$QA=&Y=/5!O9&5S:71E
+M($Q)3$\@*$QI;G5K<R!B=70@;65N863%OF5R*0H@0V]M;65N=%MS=ET]06YP
+M87-S82!,:6QO("AS=&%R=&AA;G1E<F%R92!FP[9R($QI;G5X*0H@0V]M;65N
+M=%MT85T]X*Z)X*ZSX*^-X*ZSX*ZNX*^(($Q)3$\HX*ZRX*Z_X*ZIX*Z5X*^-
+MX*ZXX*^-(."NA^"NK^"NE>"OC>"NE2#@KJ[@KX?@KK+@KK[@KK/@KK#@KXTI
+C"B!#;VUM96YT6W1R73U,24Q/)WEU(%EA<,2Q;&%N9,2Q<@H`
`
end
Modified: trunk/packages/kdeadmin/debian/patches/02_autotools_update.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/02_autotools_update.diff 2004-03-22 03:00:11 UTC (rev 70)
+++ trunk/packages/kdeadmin/debian/patches/02_autotools_update.diff 2004-03-22 03:38:45 UTC (rev 71)
@@ -1,23 +1,158 @@
-diff -Nrua kdeadmin-3.1.95/admin/compile kdeadmin-patched/admin/compile
---- kdeadmin-3.1.95/admin/compile 2002-09-30 07:18:17.000000000 -0500
-+++ kdeadmin-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 kdeadmin-3.2.1/admin/compile kdeadmin-patched/admin/compile
+--- kdeadmin-3.2.1/admin/compile 2002-09-30 07:18:17.000000000 -0500
++++ kdeadmin-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 <vektor@dumbterm.net>.
-+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 <tromey@cygnus.com>.
+ #
+ # 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 kdeadmin-3.1.95/admin/config.guess kdeadmin-patched/admin/config.guess
---- kdeadmin-3.1.95/admin/config.guess 2002-10-26 11:44:28.000000000 -0500
+ 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 kdeadmin-3.2.1/admin/config.guess kdeadmin-patched/admin/config.guess
+--- kdeadmin-3.2.1/admin/config.guess 2002-10-26 11:44:28.000000000 -0500
+++ kdeadmin-patched/admin/config.guess 2004-01-08 21:12:01.000000000 -0600
@@ -1,9 +1,9 @@
#! /bin/sh
@@ -555,8 +690,8 @@
# Apollos put the system type in the environment.
-diff -Nrua kdeadmin-3.1.95/admin/config.sub kdeadmin-patched/admin/config.sub
---- kdeadmin-3.1.95/admin/config.sub 2002-10-26 11:44:28.000000000 -0500
+diff -Nrua kdeadmin-3.2.1/admin/config.sub kdeadmin-patched/admin/config.sub
+--- kdeadmin-3.2.1/admin/config.sub 2002-10-26 11:44:28.000000000 -0500
+++ kdeadmin-patched/admin/config.sub 2004-01-08 21:12:01.000000000 -0600
@@ -1,9 +1,9 @@
#! /bin/sh
@@ -936,19 +1071,58 @@
-vxsim* | -vxworks* | -windiss*)
vendor=wrs
;;
-diff -Nrua kdeadmin-3.1.95/admin/depcomp kdeadmin-patched/admin/depcomp
---- kdeadmin-3.1.95/admin/depcomp 2003-04-16 16:53:18.000000000 -0500
-+++ kdeadmin-patched/admin/depcomp 2003-12-15 22:48:04.000000000 -0600
-@@ -1,7 +1,7 @@
+diff -Nrua kdeadmin-3.2.1/admin/depcomp kdeadmin-patched/admin/depcomp
+--- kdeadmin-3.2.1/admin/depcomp 2003-04-16 16:53:18.000000000 -0500
++++ kdeadmin-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 <oliva@dcc.unicamp.br>.
+
++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 kdeadmin-3.1.95/admin/install-sh kdeadmin-patched/admin/install-sh
---- kdeadmin-3.1.95/admin/install-sh 2003-08-07 04:41:31.000000000 -0500
-+++ kdeadmin-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 kdeadmin-3.2.1/admin/install-sh kdeadmin-patched/admin/install-sh
+--- kdeadmin-3.2.1/admin/install-sh 2003-08-07 04:41:31.000000000 -0500
++++ kdeadmin-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 $@.
++ 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@/@%@g' -e 's@^%@/@'`
+-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@/@%@g' -e 's@^%@/@'`
++ 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 kdeadmin-3.1.95/admin/missing kdeadmin-patched/admin/missing
---- kdeadmin-3.1.95/admin/missing 2002-10-26 11:44:28.000000000 -0500
-+++ kdeadmin-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 kdeadmin-3.2.1/admin/missing kdeadmin-patched/admin/missing
+--- kdeadmin-3.2.1/admin/missing 2002-10-26 11:44:28.000000000 -0500
++++ kdeadmin-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 <pinard@iro.umontreal.ca>, 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 kdeadmin-3.1.95/admin/ylwrap kdeadmin-patched/admin/ylwrap
---- kdeadmin-3.1.95/admin/ylwrap 2001-10-04 19:46:36.000000000 -0500
-+++ kdeadmin-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 kdeadmin-3.2.1/admin/mkinstalldirs kdeadmin-patched/admin/mkinstalldirs
+--- kdeadmin-3.2.1/admin/mkinstalldirs 2002-10-26 11:53:16.000000000 -0500
++++ kdeadmin-patched/admin/mkinstalldirs 2004-01-14 19:49:36.000000000 -0600
+@@ -1,20 +1,32 @@
#! /bin/sh
+ # mkinstalldirs --- make directory hierarchy
+-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
++
++scriptversion=2003-11-08.23
++
++# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
+ # 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 kdeadmin-3.2.1/admin/ylwrap kdeadmin-patched/admin/ylwrap
+--- kdeadmin-3.2.1/admin/ylwrap 2001-10-04 19:46:36.000000000 -0500
++++ kdeadmin-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 <tromey@cygnus.com>.
#
# 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/kdeadmin/debian/patches/05_pedantic-errors.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/05_pedantic-errors.diff 2004-03-22 03:00:11 UTC (rev 70)
+++ trunk/packages/kdeadmin/debian/patches/05_pedantic-errors.diff 2004-03-22 03:38:45 UTC (rev 71)
@@ -1,6 +1,6 @@
-diff -Nrua kdelibs-3.1.95/admin/acinclude.m4.in kdelibs-patched/admin/acinclude.m4.in
---- kdelibs-3.1.95/admin/acinclude.m4.in 2004-01-11 07:07:06.000000000 -0600
-+++ kdelibs-patched/admin/acinclude.m4.in 2004-01-19 23:24:14.000000000 -0600
+diff -Nrua kdeadmin-3.2.1/admin/acinclude.m4.in kdeadmin-patched/admin/acinclude.m4.in
+--- kdeadmin-3.2.1/admin/acinclude.m4.in 2004-02-23 15:30:44.000000000 -0600
++++ kdeadmin-patched/admin/acinclude.m4.in 2004-03-02 00:25:48.000000000 -0600
@@ -2108,9 +2108,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
Modified: trunk/packages/kdeadmin/debian/rules
===================================================================
--- trunk/packages/kdeadmin/debian/rules 2004-03-22 03:00:11 UTC (rev 70)
+++ trunk/packages/kdeadmin/debian/rules 2004-03-22 03:38:45 UTC (rev 71)
@@ -9,9 +9,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
# This has to be exported to make some magic below work.
export DH_OPTIONS
@@ -75,7 +72,7 @@
# run configure with build tree $(objdir)
cd $(objdir) && \
- ../configure $(configkde) \
+ ../configure $(configkde) --enable-final \
--without-rpm --with-pam=kde --with-shadow --with-nis \
--with-private-groups
@@ -165,7 +162,7 @@
cd $(objdir) && \
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- dh_install -s --list-missing
+ dh_install -s
install-indep:
dh_testdir
@@ -179,7 +176,7 @@
#cd $(objdir) && \
$(MAKE) install-apidox DESTDIR=$(CURDIR)/debian/tmp
- dh_install -i --list-missing
+ dh_install -i
# Must not depend on anything. This is to be called by
# binary-arch/binary-indep
Modified: trunk/packages/kdeadmin/debian/secpolicy.menu
===================================================================
--- trunk/packages/kdeadmin/debian/secpolicy.menu 2004-03-22 03:00:11 UTC (rev 70)
+++ trunk/packages/kdeadmin/debian/secpolicy.menu 2004-03-22 03:38:45 UTC (rev 71)
@@ -1,6 +1,6 @@
?package(secpolicy):\
- needs=X11\
- section=Apps/System\
+ needs="X11"\
+ section="Apps/System"\
hints="KDE"\
kderemove="y"\
title="KDE PAM Security Policy Editor"\
Reply to: