pkg-kde: commit - rev 94 - in trunk/packages/arts/debian: . patches
Author: ccheney
Date: 2004-04-05 20:15:34 -0600 (Mon, 05 Apr 2004)
New Revision: 94
Modified:
trunk/packages/arts/debian/changelog
trunk/packages/arts/debian/control
trunk/packages/arts/debian/patches/01_arts_branch.diff.uu
trunk/packages/arts/debian/patches/02_autotools_update.diff
Log:
arts 1.2.2-1 update
Modified: trunk/packages/arts/debian/changelog
===================================================================
--- trunk/packages/arts/debian/changelog 2004-04-05 23:17:58 UTC (rev 93)
+++ trunk/packages/arts/debian/changelog 2004-04-06 02:15:34 UTC (rev 94)
@@ -1,3 +1,10 @@
+arts (1.2.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Removed libarts1-dev Depends: xlibs-static-pic. (Closes: #240188)
+
+ -- Christopher L Cheney <ccheney@debian.org> Mon, 5 Apr 2004 17:00:00 -0500
+
arts (1.2.1-2) unstable; urgency=high
* Added libartsc0-dev Depends: libglib2.0-dev. (Closes: #236242)
Modified: trunk/packages/arts/debian/control
===================================================================
--- trunk/packages/arts/debian/control 2004-04-05 23:17:58 UTC (rev 93)
+++ trunk/packages/arts/debian/control 2004-04-06 02:15:34 UTC (rev 94)
@@ -1,10 +1,10 @@
Source: arts
-Build-Depends: automake1.8, debhelper (>> 4.2.0), docbook-to-man, gawk, gettext, libasound2-dev, libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libmad0-dev, libqt3-mt-dev, libvorbis-dev, sharutils, texinfo, xlibs-static-pic (>= 4.3.0-3)
-Build-Conflicts: libmas-dev
Section: libs
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Christopher L Cheney <ccheney@debian.org>
+Build-Depends: automake1.8, debhelper (>> 4.2.0), docbook-to-man, gawk, gettext, libasound2-dev, libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libmad0-dev, libqt3-mt-dev, libvorbis-dev, sharutils, texinfo, xlibs-static-pic (>= 4.3.0-3)
+Build-Conflicts: libmas-dev
Standards-Version: 3.6.1.0
Package: arts
@@ -42,7 +42,7 @@
Package: libarts1-dev
Architecture: any
Section: libdevel
-Depends: libarts1 (= ${Source-Version}), libartsc0-dev, libasound2-dev, libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libmad0-dev, libogg-dev, libqt3-mt-dev, libvorbis-dev, xlibs-static-pic (>= 4.3.0-3)
+Depends: libarts1 (= ${Source-Version}), libartsc0-dev, libasound2-dev, libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libmad0-dev, libogg-dev, libqt3-mt-dev, libvorbis-dev
Conflicts: kdelibs3 (<< 4:3.0.0), libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0), libarts-dev (<< 4:3.0.0), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0), libkmid-dev (<< 4:3.0.0)
Replaces: kdelibs3 (<< 4:3.0.0), libarts (<< 4:3.0.0), libarts-alsa (<< 4:3.0.0), libarts-dev (<< 4:3.0.0), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0), libkmid-dev (<< 4:3.0.0)
Description: aRts Sound system (development files)
Modified: trunk/packages/arts/debian/patches/01_arts_branch.diff.uu
===================================================================
--- trunk/packages/arts/debian/patches/01_arts_branch.diff.uu 2004-04-05 23:17:58 UTC (rev 93)
+++ trunk/packages/arts/debian/patches/01_arts_branch.diff.uu 2004-04-06 02:15:34 UTC (rev 94)
@@ -1,89 +1,16 @@
begin 644 01_arts_branch.diff
-M9&EF9B`M3G)U82!A<G1S+3$N,BXQ+V%D;6EN+V%M7V5D:70@87)T<RUB<F%N
-M8V@O861M:6XO86U?961I=`HM+2T@87)T<RTQ+C(N,2]A9&UI;B]A;5]E9&ET
-M"3(P,#,M,3`M,CD@,38Z-#4Z-3`N,#`P,#`P,#`P("TP-C`P"BLK*R!A<G1S
-M+6)R86YC:"]A9&UI;B]A;5]E9&ET"3(P,#0M,#,M,C$@,#<Z-34Z,#0N,#`P
-M,#`P,#`P("TP-C`P"D!`("TR-CDL-R`K,C8Y+#<@0$`*(`ET86=?0TQ/4U52
-M12@I.PH@"71A9U].34-(14-+*"D["B`)=&%G7U5)1DE,15,H*3L@("`@("`@
-M("`@("`@(",@4V]R=',@;W5T('5I(')U;&5S"BT)=&%G7TM#1D=&24Q%4R@I
-M.R`@("`@("`@("`@(",@4V]U<G0@;W5T(&MC9F<@<G5L97,**PET86=?2T-&
-M1T9)3$53*"D[("`@("`@("`@("`@(R!3;W)T<R!O=70@:V-F9R!R=6QE<PH@
-M("`@("`@("!T86=?345405-/55)#15,@*"D[("`@("`@("`@(R!3;W)T<R!O
-M=70@=&AE(&UO8R!R=6QE<PH@("`@("`@("!I9B`H)'-O=7)C97-?8VAA;F=E
-M9'LD<')O9W)A;7TI('L*("`@("`@("`@("`@(&UY("1L;V]K=7`@/2`D<')O
-M9W)A;2`N("=?4T]54D-%4UQS*CU;(%QT72HH+BHI)SL*0$`@+3@Y,BPW("LX
-M.3(L-R!`0`H@("`@("`@("`@("`@("`@("`@("!S=6)S=&ET=71E3&EN92@D
-M;&]O:W5P+"`B)'MK9&5I;FET?5]L85],24)!1$0@/2!L:6)K9&5I;FET7R1[
-M:V1E:6YI='TN;&$B*3L*("`@("`@("`@("`@("`@("`@("`@87!P96YD3&EN
-M97,H(FQI8FMD96EN:71?)'MK9&5I;FET?5]L85],24)!1$0@/2`D;&EB861D
-M7&XB*3L*("`@("`@("`@("`@("`@("!]"BT@("`@("`@("`@("`@("`@87!P
-M96YD3&EN97,H(FQI8FMD96EN:71?)'MK9&5I;FET?5]L85],1$9,04=3(#T@
-M+6%V;VED+79E<G-I;VX@7"0H86QL7VQI8G)A<FEE<RE<;B(I.PHK("`@("`@
-M("`@("`@("`@(&%P<&5N9$QI;F5S*")L:6)K9&5I;FET7R1[:V1E:6YI='U?
-M;&%?3$1&3$%'4R`]("UN;RUU;F1E9FEN960@+6%V;VED+79E<G-I;VX@7"0H
-M86QL7VQI8G)A<FEE<RE<;B(I.PH@"B`@("`@("`@("`@("`@("`@(R!A9&0@
-M;&EB<F%R>2!D97!E;F1E;F-I97,*("`@("`@("`@("`@("`@("`D;&]O:W5P
-M(#T@)&MD96EN:70@+B`G7VQA7T1%4$5.1$5.0TE%4UQS*CU;(%QT72HH+BHI
-M)SL*0$`@+3$Q-#<L-B`K,3$T-RPY($!`"B`@("`@<')I;G0@4U1$3U54(")!
-M551/34%+12!P<F]C97-S:6YG(#PD,3Y<;B(@("`@("`@(&EF("@D=F5R8F]S
-M92D["B`*("`@("!M>2`D;F5W3&EN92`]("0Q+B)<;EQT8V0@7"0H=&]P7W-R
-M8V1I<BD@)B8@<&5R;"`D=&AI<U!R;V<@)'!R:6YT;F%M92(["BL**R`@("`C
-M(&%U=&]M86ME(#$N."YX(&%D9',@86YO=&AE<B!A=71O;6%K92!C86QL+B`J
-M<VEG:"H**R`@("`D;F5W3&EN92`]?B!S+SLH6UPP,S1<<UTK8V1<<RM<)%PH
-M<W)C9&ER7"E<<RLF)EM<,#,T7'-=*UPD7"A!551/34%+15PI+BHI6UPP,S1<
-M<UTK7"9<)EM<,#,T7'-=*V5X:71;7#`S-%QS72LP.RA;7#`S-%QS72ME>&ET
-M7',K,2DO.R!<,#,T("@@)#$@*2!\?"!E>&ET(#$[(&5C:&\@7"<@8V0@7"0H
-M=&]P7W-R8V1I<BD@)B8@<&5R;"`D=&AI<U!R;V<@7"<[(&-D(%PD*'1O<%]S
-M<F-D:7(I("8F('!E<FP@)'1H:7-0<F]G("8F(&5X:70@,#L@)#(O.PH@("`@
-M('-U8G-T:71U=&5,:6YE("@D;&]O:W5P+"`D;F5W3&EN92D["B`@("`@)&%U
-M=&]M:T-A;&P@/2`D,3L*(`I`0"`M,3,V,"PW("LQ,S8S+#@@0$`*("`@("`@
-M("`@("`@("`@("!M>2`D9&5P7VQI;F5S(#T@(B1S;W5R8V4N)&-X>'-U9F9I
-M>#H@)'-O=7)C961I<B1S;W5R8V4N=6D@)'-O=7)C92YH("1S;W5R8V4N;6]C
-M7&XB.PH@("`@("`@("`@("`@("`@("1D97!?;&EN97,@+CT@(EQT<FT@+68@
-M)'-O=7)C92XD8WAX<W5F9FEX7&XB.PH@("`@("`@("`@("`@("`@(&EF("@A
-M)&MD96]P='-[(G%T;VYL>2)]*2!["BT@("`@("`@("`@("`@("`@("`@("1D
-M97!?;&EN97,@+CT@(EQT96-H;R`G(VEN8VQU9&4@/&ML;V-A;&4N:#XG(#X@
-M)'-O=7)C92XD8WAX<W5F9FEX7&XB.PHK("`@("`@("`@("`@("`@("`@("`D
-M9&5P7VQI;F5S("X](")<=&5C:&\@)R-I;F-L=61E(#QK9&EA;&]G+F@^)R`^
-M("1S;W5R8V4N)&-X>'-U9F9I>%QN(CL**R`@("`@("`@("`@("`@("`@("`@
-M)&1E<%]L:6YE<R`N/2`B7'1E8VAO("<C:6YC;'5D92`\:VQO8V%L92YH/B<@
-M/CX@)'-O=7)C92XD8WAX<W5F9FEX7&XB.PH@("`@("`@("`@("`@("`@("`@
-M("!M>2`H)&UA;F=L961?<V]U<F-E*2`]("1S;W5R8V4["B`@("`@("`@("`@
-M("`@("`@("`@("1M86YG;&5D7W-O=7)C92`]?B!S+UM>02U:82UZ,"TY72]?
-M+V<[("`C(&=E="!R:60@;V8@9V%R8F%G90H@("`@("`@("`@("`@("`@("`@
-M("`D9&5P7VQI;F5S("X](")<=%PD*%5)0RD@+71R(%PD>U5)0U]44GT@+6D@
-M)'-O=7)C92YH("1S;W5R8V5D:7(D<V]U<F-E+G5I(#X@)'-O=7)C92XD8WAX
-M<W5F9FEX+G1E;7`@.R!R970]7"1<)#\[(%Q<7&XB.PI`0"`M,30R-2PQ,"`K
-M,30R.2PQ-"!`0`H@("`@("`@("`@("`@("`@("1K8V9G(#T@(B1P<F]G<F%M
-M+FMC9F<B.PH@("`@("`@("`@("`@("`@(&9I;F1+8V9G1FEL92@B)'-O=7)C
-M92YK8V9G8R(I.PH@"BL@("`@("`@("`@("`@("`@;7D@)&9I>'-U9F9I>"`]
-M("(B.PHK("`@("`@("`@("`@("`@("1F:7AS=69F:7@@/2`B96QS92!M=B`D
-M<V]U<F-E+F-P<"`D<V]U<F-E+B1C>'AS=69F:7@@.R`B(`HK("`@("`@("`@
-M("`@("`@("`@("!U;FQE<W,@(F-P<"(@97$@)&-X>'-U9F9I>#L**PH@("`@
-M("`@("`@("`@("`@(&UY("1D97!?;&EN97,@/2`B)'-O=7)C92XD8WAX<W5F
-M9FEX.B`D<V]U<F-E+FA<;B(["B`@("`@("`@("`@("`@("`@)&1E<%]L:6YE
-M<R`N/2`B)'-O=7)C92YH.B`D<V]U<F-E9&ER)&MC9F<@)'-O=7)C961I<B1S
-M;W5R8V4N:V-F9V,@7"0H2T-&1U]$15!%3D1%3D-)15,I7&XB.PH@("`@("`@
-M("`@("`@("`@("1D97!?;&EN97,@+CT@(EQT7"0H2T-/3D9)1U]#3TU024Q%
-M4BD@)'-O=7)C961I<B1K8V9G("1S;W5R8V5D:7(D<V]U<F-E+FMC9F=C.R!R
-M970]7"1<)#\[(%Q<7&XB.PHM"0DD9&5P7VQI;F5S("X](")<=&EF('1E<W0@
-M7")<)%PD<F5T7"(@(3T@,#L@=&AE;B!R;2`M9B`D<V]U<F-E+F@@.R!E>&ET
-M(%PD7"1R970@.R!F:5QN7&XB.PHK"0DD9&5P7VQI;F5S("X](")<=&EF('1E
-M<W0@7")<)%PD<F5T7"(@(3T@,#L@=&AE;B!R;2`M9B`D<V]U<F-E+F@@.R!E
-M>&ET(%PD7"1R970@.R`D9FEX<W5F9FEX(&9I7&Y<;B(["B`*("`@("`@("`@
-M("`@("`@("`D<G5L95]A9&1S>R(D<V]U<F-E+B1C>'AS=69F:7@B?2`]("1D
-M97!?;&EN97,["B`*0$`@+3(S-#(L-R`K,C,U,"PW($!`"B`@("`@)$UA:V5F
-M:6QE1&%T82`]?B!S+UPP,S0O7%Q<;B]G.R`@("`C(%)E<W1O<F4@8V]N=&EN
-M=6%T:6]N(&QI;F5S"B`@("`@(R!!<'!E;F0@;W5R("1P<F]G260@;&EN92P@
-M7V)E;&]W7R!T:&4@(F=E;F5R871E9"!B>2!A=71O;6%K92(@;&EN90H@("`@
-M(",@8F5C875S92!A=71O;6%K92TQ+C8@<F5L:65S(&]N('1H92!F:7)S="!L
-M:6YE('1O(&)E(&AI<R!O=VXN"BT@("`@;7D@)'!R;V=)9$QI;F4@/2`B7",@
-M)'!R;V=)9"`M("(@+B`G)%)E=FES:6]N.B`Q+C0P-B`D("<N(EQN(CL**R`@
-M("!M>2`D<')O9TED3&EN92`](")<(R`D<')O9TED("T@(B`N("<D4F5V:7-I
-M;VXZ(#$N-#`V+C@N,2`D("<N(EQN(CL*("`@("!I9B`H("$H("1-86ME9FEL
-M941A=&$@/7X@<R]>*"XJ9V5N97)A=&5D("XJ8GD@875T;VUA:V4N*EQN*2\D
-M,21P<F]G261,:6YE+R`I("D@>PH@("`@("`@("!W87)N(")A=71O;6%K92!L
-M:6YE(&YO="!F;W5N9"!I;B`D;6%K969I;&5<;B(["B`)(R!&86QL8F%C:SH@
-+9FER<W0@;&EN90H`
+M9&EF9B`M3G)U82!A<G1S+3$N,BXR+V%R=',N;'-M(&%R=',M8G)A;F-H+V%R
+M=',N;'-M"BTM+2!A<G1S+3$N,BXR+V%R=',N;'-M"3$Y-CDM,3(M,S$@,3@Z
+M,#`Z,#`N,#`P,#`P,#`P("TP-C`P"BLK*R!A<G1S+6)R86YC:"]A<G1S+FQS
+M;0DR,#`T+3`T+3`U(#`R.C`Y.C$U+C`P,#`P,#`P,"`M,#4P,`I`0"`M,"PP
+M("LQ+#$Q($!`"BM"96=I;C0**U1I=&QE.B`@("`@("`@("!A<G1S"BM697)S
+M:6]N.B`@("`@("`@,2XR+C(**T5N=&5R960M9&%T93H@("`R,#`T+3`T+3$T
+M"BM$97-C<FEP=&EO;CH@("`@4V]U;F1S97)V97(@9F]R('1H92!+($1E<VMT
+M;W`@16YV:7)O;FUE;G0@*$M$12D**TME>7=O<F1S.B`@("`@("!+1$4@6#$Q
+M(&1E<VMT;W`@470@"BM!=71H;W(Z("`@("`@("`@:'1T<#HO+V)U9W,N:V1E
+M+F]R9R\@*$M$12!"=6=T<F%C:VEN9R!3>7-T96TI"BM0<FEM87)Y+7-I=&4Z
+M("`@:'1T<#HO+W=W=RYK9&4N;W)G+V1O=VYL;V%D+PHK4&QA=&9O<FUS.B`@
+M("`@(%5N:7@L(%%T"BM#;W!Y:6YG+7!O;&EC>3H@3$=03"P@07)T:7-T:6,*
+%*T5N9`H`
`
end
Modified: trunk/packages/arts/debian/patches/02_autotools_update.diff
===================================================================
--- trunk/packages/arts/debian/patches/02_autotools_update.diff 2004-04-05 23:17:58 UTC (rev 93)
+++ trunk/packages/arts/debian/patches/02_autotools_update.diff 2004-04-06 02:15:34 UTC (rev 94)
@@ -1,6 +1,6 @@
-diff -Nrua arts-1.2.1/admin/compile arts-patched/admin/compile
---- arts-1.2.1/admin/compile 2002-09-30 07:18:17.000000000 -0500
-+++ arts-patched/admin/compile 2004-01-14 19:49:36.000000000 -0600
+diff -Nrua arts-1.2.2/admin/compile arts-patched/admin/compile
+--- arts-1.2.2/admin/compile 2002-09-30 07:18:17.000000000 -0500
++++ arts-patched/admin/compile 2004-03-15 21:16:18.000000000 -0600
@@ -1,8 +1,9 @@
#! /bin/sh
-
@@ -151,8 +151,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua arts-1.2.1/admin/config.guess arts-patched/admin/config.guess
---- arts-1.2.1/admin/config.guess 2002-10-26 11:44:28.000000000 -0500
+diff -Nrua arts-1.2.2/admin/config.guess arts-patched/admin/config.guess
+--- arts-1.2.2/admin/config.guess 2002-10-26 11:44:28.000000000 -0500
+++ arts-patched/admin/config.guess 2004-01-08 21:12:01.000000000 -0600
@@ -1,9 +1,9 @@
#! /bin/sh
@@ -690,8 +690,8 @@
# Apollos put the system type in the environment.
-diff -Nrua arts-1.2.1/admin/config.sub arts-patched/admin/config.sub
---- arts-1.2.1/admin/config.sub 2002-10-26 11:44:28.000000000 -0500
+diff -Nrua arts-1.2.2/admin/config.sub arts-patched/admin/config.sub
+--- arts-1.2.2/admin/config.sub 2002-10-26 11:44:28.000000000 -0500
+++ arts-patched/admin/config.sub 2004-01-08 21:12:01.000000000 -0600
@@ -1,9 +1,9 @@
#! /bin/sh
@@ -1071,9 +1071,9 @@
-vxsim* | -vxworks* | -windiss*)
vendor=wrs
;;
-diff -Nrua arts-1.2.1/admin/depcomp arts-patched/admin/depcomp
---- arts-1.2.1/admin/depcomp 2003-04-16 16:53:18.000000000 -0500
-+++ arts-patched/admin/depcomp 2004-01-14 19:49:36.000000000 -0600
+diff -Nrua arts-1.2.2/admin/depcomp arts-patched/admin/depcomp
+--- arts-1.2.2/admin/depcomp 2003-04-16 16:53:18.000000000 -0500
++++ arts-patched/admin/depcomp 2004-03-15 21:16:18.000000000 -0600
@@ -1,7 +1,9 @@
#! /bin/sh
-
@@ -1529,16 +1529,16 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua arts-1.2.1/admin/install-sh arts-patched/admin/install-sh
---- arts-1.2.1/admin/install-sh 2003-08-07 04:41:31.000000000 -0500
-+++ arts-patched/admin/install-sh 2004-01-14 19:49:36.000000000 -0600
+diff -Nrua arts-1.2.2/admin/install-sh arts-patched/admin/install-sh
+--- arts-1.2.2/admin/install-sh 2003-08-07 04:41:31.000000000 -0500
++++ arts-patched/admin/install-sh 2004-03-15 21:16:18.000000000 -0600
@@ -1,19 +1,38 @@
#!/bin/sh
-#
# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
+
-+scriptversion=2004-01-12.10
++scriptversion=2004-02-15.20
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
@@ -1597,7 +1597,7 @@
# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}"
-@@ -41,236 +58,253 @@
+@@ -41,236 +58,259 @@
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
@@ -1894,7 +1894,7 @@
+ # Skip lots of stat calls in the usual case.
+ if test ! -d "$dstdir"; then
+ defaultIFS='
-+ '
++ '
+ IFS="${IFS-$defaultIFS}"
+
+ oIFS=$IFS
@@ -1908,7 +1908,13 @@
+ while test $# -ne 0 ; do
+ pathcomp=$pathcomp$1
+ shift
-+ test -d "$pathcomp" || $mkdirprog "$pathcomp"
++ if test ! -d "$pathcomp"; then
++ $mkdirprog "$pathcomp" || lasterr=$?
++ # mkdir can fail with a `File exist' error in case several
++ # install-sh are creating the directory concurrently. This
++ # is OK.
++ test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; }
++ fi
+ pathcomp=$pathcomp/
+ done
+ fi
@@ -1964,8 +1970,8 @@
+ $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
++ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
++ (exit 1); exit
+ }
+ else
+ :
@@ -2070,9 +2076,9 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua arts-1.2.1/admin/missing arts-patched/admin/missing
---- arts-1.2.1/admin/missing 2002-10-26 11:44:28.000000000 -0500
-+++ arts-patched/admin/missing 2004-01-14 19:49:36.000000000 -0600
+diff -Nrua arts-1.2.2/admin/missing arts-patched/admin/missing
+--- arts-1.2.2/admin/missing 2002-10-26 11:44:28.000000000 -0500
++++ arts-patched/admin/missing 2004-03-15 21:16:18.000000000 -0600
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
@@ -2236,15 +2242,15 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua arts-1.2.1/admin/mkinstalldirs arts-patched/admin/mkinstalldirs
---- arts-1.2.1/admin/mkinstalldirs 2002-10-26 11:53:16.000000000 -0500
-+++ arts-patched/admin/mkinstalldirs 2004-01-14 19:49:36.000000000 -0600
+diff -Nrua arts-1.2.2/admin/mkinstalldirs arts-patched/admin/mkinstalldirs
+--- arts-1.2.2/admin/mkinstalldirs 2002-10-26 11:53:16.000000000 -0500
++++ arts-patched/admin/mkinstalldirs 2004-03-15 21:16:18.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
++scriptversion=2004-02-15.20
+
+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
@@ -2287,8 +2293,20 @@
--) # stop option processing
shift
break
-@@ -55,12 +71,25 @@
- if mkdir -p -- . 2>/dev/null; then
+@@ -50,17 +66,37 @@
+ 0) exit 0 ;;
+ esac
+
++# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
++# mkdir -p a/c at the same time, both will detect that a is missing,
++# one will create a, then the other will try to create a and die with
++# a "File exists" error. This is a problem when calling mkinstalldirs
++# from a parallel make. We use --version in the probe to restrict
++# ourselves to GNU mkdir, which is thread-safe.
+ case $dirmode in
+ '')
+- if mkdir -p -- . 2>/dev/null; then
++ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
+ else
@@ -2297,23 +2315,25 @@
+ # directories to create, and then abort because `.' already
+ # exists.
+ test -d ./-p && rmdir ./-p
-+ test -d ./-- && rmdir ./--
++ test -d ./--version && rmdir ./--version
fi
;;
*)
- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+- if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
++ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
++ test ! -d ./--version; 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";
++ for d in ./-m ./-p ./--version "./$dirmode";
+ do
+ test -d $d && rmdir $d
+ done
fi
;;
esac
-@@ -84,17 +113,17 @@
+@@ -84,17 +120,17 @@
mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then
@@ -2339,7 +2359,7 @@
fi
fi
-@@ -107,5 +136,8 @@
+@@ -107,5 +143,8 @@
# Local Variables:
# mode: shell-script
# sh-indentation: 2
@@ -2349,9 +2369,9 @@
+# time-stamp-end: "$"
# End:
-# mkinstalldirs ends here
-diff -Nrua arts-1.2.1/admin/ylwrap arts-patched/admin/ylwrap
---- arts-1.2.1/admin/ylwrap 2001-10-04 19:46:36.000000000 -0500
-+++ arts-patched/admin/ylwrap 2004-01-14 19:49:36.000000000 -0600
+diff -Nrua arts-1.2.2/admin/ylwrap arts-patched/admin/ylwrap
+--- arts-1.2.2/admin/ylwrap 2001-10-04 19:46:36.000000000 -0500
++++ arts-patched/admin/ylwrap 2004-03-15 21:16:18.000000000 -0600
@@ -1,6 +1,11 @@
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
Reply to: