Version in base suite: 2.10.35lenny3 Version in overlay suite: (not present) Base version: devscripts_2.10.35lenny3 Target version: devscripts_2.10.35lenny6 Base file: /org/ftp.debian.org/ftp/pool/main/d/devscripts/devscripts_2.10.35lenny3.dsc Target file: /org/ftp.debian.org/queue/p-u-new/devscripts_2.10.35lenny6.dsc debian/changelog | 28 +++++ po4a/po/devscripts.pot | 246 ++++++++++++++++++++++++------------------------ po4a/po/fr.po | 251 +++++++++++++++++++++++++------------------------ scripts/bts.pl | 2 scripts/debchange.1 | 2 scripts/debchange.pl | 27 ++++- scripts/rc-alert.pl | 2 scripts/uscan.1 | 8 + scripts/uscan.pl | 241 +++++++++++++++++++++++++++++++++++++++++++++-- 9 files changed, 550 insertions(+), 257 deletions(-) diff -Nru devscripts-2.10.35lenny3/debian/changelog devscripts-2.10.35lenny6/debian/changelog --- devscripts-2.10.35lenny3/debian/changelog 2009-02-11 07:52:05.000000000 +0000 +++ devscripts-2.10.35lenny6/debian/changelog 2009-05-25 22:12:10.000000000 +0000 @@ -1,3 +1,31 @@ +devscripts (2.10.35lenny6) stable-security; urgency=low + + * uscan: Make download scripts using uupdate work correctly again. + (Accidentally broken in lenny5). + + -- Adam D. Barratt Mon, 25 May 2009 23:10:53 +0100 + +devscripts (2.10.35lenny5) stable-security; urgency=low + + * uscan: Modify the handling of mangle rules in watch files to apply the + rules without executing them as Perl code. + + -- Adam D. Barratt Tue, 24 Mar 2009 19:16:05 +0000 + +devscripts (2.10.35lenny4) stable; urgency=low + + * bts: Recognise the "squeeze" and "squeeze-ignore" tags. + * debchange: + + Modify --bpo to produce a changelog suitable for uploading to + lenny-backports rather than etch-backports by default. If the + latest changelog entry is for an etch backport, a new etch-backports + stanza will be produced instead. + + Correctly increment backport version numbers. + * rc-alert: Modify the description of the "I" flag to refer to the + squeeze-ignore tag rather than etch-ignore. + + -- Adam D. Barratt Fri, 06 Mar 2009 18:38:49 +0000 + devscripts (2.10.35lenny3) testing; urgency=low * debchange: Recognise lenny-backports and lenny-volatile as valid Debian diff -Nru devscripts-2.10.35lenny3/po4a/po/devscripts.pot devscripts-2.10.35lenny6/po4a/po/devscripts.pot --- devscripts-2.10.35lenny3/po4a/po/devscripts.pot 2008-12-12 18:26:23.000000000 +0000 +++ devscripts-2.10.35lenny6/po4a/po/devscripts.pot 2009-03-24 19:20:57.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2008-07-15 19:19+0100\n" +"POT-Creation-Date: 2009-03-24 19:20+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -69,7 +69,7 @@ msgstr "" # type: SH -#: ../scripts/annotate-output.1:11 ../scripts/uscan.1:313 +#: ../scripts/annotate-output.1:11 ../scripts/uscan.1:319 #, no-wrap msgid "EXAMPLE" msgstr "" @@ -165,7 +165,7 @@ msgstr "" # type: SH -#: ../scripts/annotate-output.1:55 ../scripts/archpath.1:54 ../scripts/build-rdeps.pl:251 ../scripts/checkbashisms.1:62 ../scripts/cowpoke.1:150 ../scripts/cvs-debc.1:64 ../scripts/cvs-debi.1:68 ../scripts/cvs-debrelease.1:69 ../scripts/cvs-debuild.1:59 ../scripts/dcmd.1:40 ../scripts/dd-list.1:93 ../scripts/debc.1:120 ../scripts/debchange.1:417 ../scripts/debcheckout.pl:111 ../scripts/debclean.1:111 ../scripts/debcommit.pl:714 ../scripts/debdiff.1:187 ../scripts/debi.1:120 ../scripts/debpkg.1:23 ../scripts/debrelease.1:137 ../scripts/deb-reversion.dbk:292 ../scripts/debrsign.1:71 ../scripts/debsign.1:130 ../scripts/debuild.1:421 ../scripts/desktop2menu.pl:52 ../scripts/dget.pl:622 ../scripts/diff2patches.1:40 ../scripts/dpkg-genbuilddeps.1:36 ../scripts/dscverify.1:53 ../scripts/getbuildlog.1:34 ../scripts/grep-excuses.1:39 ../scripts/licensecheck.pl:116 ../scripts/list-unreleased.1:21 ../scripts/manpage-alert.1:20 ../scripts/mass-bug.pl:512 ../scripts/mergechanges.1:18 ../scripts/mk-build-deps.pl:54 ../scripts/nmudiff.1:97 ../scripts/plotchangelog.1:126 ../scripts/pts-subscribe.1:51 ../scripts/rc-alert.1:83 ../scripts/rmadison.pl:295 ../scripts/svnpath.pl:97 ../scripts/transition-check.pl:81 ../scripts/uscan.1:521 ../scripts/uupdate.1:167 ../scripts/whodepends.1:19 ../scripts/who-uploads.1:71 ../scripts/wnpp-alert.1:31 ../scripts/wnpp-check.1:33 ../scripts/devscripts.conf.5:58 +#: ../scripts/annotate-output.1:55 ../scripts/archpath.1:54 ../scripts/build-rdeps.pl:251 ../scripts/checkbashisms.1:62 ../scripts/cowpoke.1:150 ../scripts/cvs-debc.1:64 ../scripts/cvs-debi.1:68 ../scripts/cvs-debrelease.1:69 ../scripts/cvs-debuild.1:59 ../scripts/dcmd.1:40 ../scripts/dd-list.1:93 ../scripts/debc.1:120 ../scripts/debchange.1:417 ../scripts/debcheckout.pl:111 ../scripts/debclean.1:111 ../scripts/debcommit.pl:714 ../scripts/debdiff.1:187 ../scripts/debi.1:120 ../scripts/debpkg.1:23 ../scripts/debrelease.1:137 ../scripts/deb-reversion.dbk:292 ../scripts/debrsign.1:71 ../scripts/debsign.1:130 ../scripts/debuild.1:421 ../scripts/desktop2menu.pl:52 ../scripts/dget.pl:622 ../scripts/diff2patches.1:40 ../scripts/dpkg-genbuilddeps.1:36 ../scripts/dscverify.1:53 ../scripts/getbuildlog.1:34 ../scripts/grep-excuses.1:39 ../scripts/licensecheck.pl:116 ../scripts/list-unreleased.1:21 ../scripts/manpage-alert.1:20 ../scripts/mass-bug.pl:512 ../scripts/mergechanges.1:18 ../scripts/mk-build-deps.pl:54 ../scripts/nmudiff.1:97 ../scripts/plotchangelog.1:126 ../scripts/pts-subscribe.1:51 ../scripts/rc-alert.1:83 ../scripts/rmadison.pl:295 ../scripts/svnpath.pl:97 ../scripts/transition-check.pl:81 ../scripts/uscan.1:527 ../scripts/uupdate.1:167 ../scripts/whodepends.1:19 ../scripts/who-uploads.1:71 ../scripts/wnpp-alert.1:31 ../scripts/wnpp-check.1:33 ../scripts/devscripts.conf.5:58 #, no-wrap msgid "AUTHOR" msgstr "" @@ -396,7 +396,7 @@ msgstr "" # type: SH -#: ../scripts/bts.pl:214 ../scripts/build-rdeps.pl:30 ../scripts/chdist.pl:34 ../scripts/checkbashisms.1:23 ../scripts/cvs-debc.1:24 ../scripts/cvs-debi.1:28 ../scripts/cvs-debrelease.1:21 ../scripts/cvs-debuild.1:32 ../scripts/dd-list.1:58 ../scripts/debc.1:64 ../scripts/debchange.1:146 ../scripts/debcheckout.pl:64 ../scripts/debclean.1:60 ../scripts/debcommit.pl:19 ../scripts/debdiff.1:50 ../scripts/debi.1:65 ../scripts/debrelease.1:56 ../scripts/deb-reversion.dbk:128 ../scripts/debrsign.1:30 ../scripts/debsign.1:39 ../scripts/debuild.1:217 ../scripts/dget.pl:523 ../scripts/diff2patches.1:13 ../scripts/dpkg-depcheck.1:15 ../scripts/dscverify.1:17 ../scripts/getbuildlog.1:17 ../scripts/grep-excuses.1:13 ../scripts/licensecheck.pl:43 ../scripts/list-unreleased.1:12 ../scripts/manpage-alert.1:14 ../scripts/mass-bug.pl:60 ../scripts/mk-build-deps.pl:40 ../scripts/nmudiff.1:21 ../scripts/plotchangelog.1:43 ../scripts/pts-subscribe.1:13 ../scripts/rc-alert.1:17 ../scripts/rmadison.pl:196 ../scripts/tagpending.pl:95 ../scripts/transition-check.pl:42 ../scripts/uscan.1:328 ../scripts/uupdate.1:50 ../scripts/whodepends.1:10 ../scripts/who-uploads.1:15 ../scripts/wnpp-alert.1:17 ../scripts/wnpp-check.1:16 +#: ../scripts/bts.pl:214 ../scripts/build-rdeps.pl:30 ../scripts/chdist.pl:34 ../scripts/checkbashisms.1:23 ../scripts/cvs-debc.1:24 ../scripts/cvs-debi.1:28 ../scripts/cvs-debrelease.1:21 ../scripts/cvs-debuild.1:32 ../scripts/dd-list.1:58 ../scripts/debc.1:64 ../scripts/debchange.1:146 ../scripts/debcheckout.pl:64 ../scripts/debclean.1:60 ../scripts/debcommit.pl:19 ../scripts/debdiff.1:50 ../scripts/debi.1:65 ../scripts/debrelease.1:56 ../scripts/deb-reversion.dbk:128 ../scripts/debrsign.1:30 ../scripts/debsign.1:39 ../scripts/debuild.1:217 ../scripts/dget.pl:523 ../scripts/diff2patches.1:13 ../scripts/dpkg-depcheck.1:15 ../scripts/dscverify.1:17 ../scripts/getbuildlog.1:17 ../scripts/grep-excuses.1:13 ../scripts/licensecheck.pl:43 ../scripts/list-unreleased.1:12 ../scripts/manpage-alert.1:14 ../scripts/mass-bug.pl:60 ../scripts/mk-build-deps.pl:40 ../scripts/nmudiff.1:21 ../scripts/plotchangelog.1:43 ../scripts/pts-subscribe.1:13 ../scripts/rc-alert.1:17 ../scripts/rmadison.pl:196 ../scripts/tagpending.pl:95 ../scripts/transition-check.pl:42 ../scripts/uscan.1:334 ../scripts/uupdate.1:50 ../scripts/whodepends.1:10 ../scripts/who-uploads.1:15 ../scripts/wnpp-alert.1:17 ../scripts/wnpp-check.1:16 #, no-wrap msgid "OPTIONS" msgstr "" @@ -741,7 +741,7 @@ msgstr "" # type: Plain text -#: ../scripts/bts.pl:374 ../scripts/cvs-debrelease.1:61 ../scripts/debc.1:89 ../scripts/debchange.1:330 ../scripts/debclean.1:81 ../scripts/debdiff.1:130 ../scripts/debi.1:90 ../scripts/debrelease.1:99 ../scripts/debsign.1:93 ../scripts/debuild.1:223 ../scripts/dpkg-depcheck.1:96 ../scripts/dscverify.1:28 ../scripts/grep-excuses.1:18 ../scripts/mass-bug.pl:110 ../scripts/nmudiff.1:63 ../scripts/uscan.1:431 ../scripts/uupdate.1:80 ../scripts/who-uploads.1:44 +#: ../scripts/bts.pl:374 ../scripts/cvs-debrelease.1:61 ../scripts/debc.1:89 ../scripts/debchange.1:330 ../scripts/debclean.1:81 ../scripts/debdiff.1:130 ../scripts/debi.1:90 ../scripts/debrelease.1:99 ../scripts/debsign.1:93 ../scripts/debuild.1:223 ../scripts/dpkg-depcheck.1:96 ../scripts/dscverify.1:28 ../scripts/grep-excuses.1:18 ../scripts/mass-bug.pl:110 ../scripts/nmudiff.1:63 ../scripts/uscan.1:437 ../scripts/uupdate.1:80 ../scripts/who-uploads.1:44 msgid "" "Do not read any configuration files. This can only be used as the first " "option given on the command-line." @@ -1767,7 +1767,7 @@ msgstr "" # type: SH -#: ../scripts/bts.pl:3397 ../scripts/debc.1:92 ../scripts/debchange.1:341 ../scripts/debclean.1:90 ../scripts/debcommit.pl:97 ../scripts/debdiff.1:142 ../scripts/debi.1:93 ../scripts/debrelease.1:105 ../scripts/debrsign.1:57 ../scripts/debsign.1:99 ../scripts/debuild.1:288 ../scripts/dget.pl:586 ../scripts/dpkg-depcheck.1:102 ../scripts/dscverify.1:38 ../scripts/grep-excuses.1:27 ../scripts/licensecheck.pl:83 ../scripts/mass-bug.pl:128 ../scripts/nmudiff.1:69 ../scripts/plotchangelog.1:106 ../scripts/pts-subscribe.1:37 ../scripts/rmadison.pl:259 ../scripts/uscan.1:437 ../scripts/uupdate.1:86 ../scripts/who-uploads.1:50 +#: ../scripts/bts.pl:3397 ../scripts/debc.1:92 ../scripts/debchange.1:341 ../scripts/debclean.1:90 ../scripts/debcommit.pl:97 ../scripts/debdiff.1:142 ../scripts/debi.1:93 ../scripts/debrelease.1:105 ../scripts/debrsign.1:57 ../scripts/debsign.1:99 ../scripts/debuild.1:288 ../scripts/dget.pl:586 ../scripts/dpkg-depcheck.1:102 ../scripts/dscverify.1:38 ../scripts/grep-excuses.1:27 ../scripts/licensecheck.pl:83 ../scripts/mass-bug.pl:128 ../scripts/nmudiff.1:69 ../scripts/plotchangelog.1:106 ../scripts/pts-subscribe.1:37 ../scripts/rmadison.pl:259 ../scripts/uscan.1:443 ../scripts/uupdate.1:86 ../scripts/who-uploads.1:50 #, no-wrap msgid "CONFIGURATION VARIABLES" msgstr "" @@ -1949,7 +1949,7 @@ msgstr "" # type: SH -#: ../scripts/bts.pl:3490 ../scripts/checkbashisms.1:60 ../scripts/cowpoke.1:145 ../scripts/cvs-debc.1:58 ../scripts/cvs-debi.1:62 ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53 ../scripts/dcmd.1:37 ../scripts/debc.1:115 ../scripts/debchange.1:410 ../scripts/debcheckout.pl:105 ../scripts/debclean.1:107 ../scripts/debcommit.pl:718 ../scripts/debdiff.1:180 ../scripts/debi.1:116 ../scripts/debrelease.1:132 ../scripts/deb-reversion.dbk:247 ../scripts/debrsign.1:66 ../scripts/debsign.1:118 ../scripts/debuild.1:408 ../scripts/dget.pl:630 ../scripts/diff2patches.1:37 ../scripts/dpkg-depcheck.1:118 ../scripts/dpkg-genbuilddeps.1:30 ../scripts/dscverify.1:49 ../scripts/grep-excuses.1:37 ../scripts/list-unreleased.1:19 ../scripts/nmudiff.1:92 ../scripts/plotchangelog.1:124 ../scripts/pts-subscribe.1:46 ../scripts/rc-alert.1:81 ../scripts/rmadison.pl:291 ../scripts/tagpending.pl:150 ../scripts/uscan.1:515 ../scripts/uupdate.1:160 ../scripts/wnpp-alert.1:29 ../scripts/wnpp-check.1:23 ../scripts/devscripts.conf.5:54 +#: ../scripts/bts.pl:3490 ../scripts/checkbashisms.1:60 ../scripts/cowpoke.1:145 ../scripts/cvs-debc.1:58 ../scripts/cvs-debi.1:62 ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53 ../scripts/dcmd.1:37 ../scripts/debc.1:115 ../scripts/debchange.1:410 ../scripts/debcheckout.pl:105 ../scripts/debclean.1:107 ../scripts/debcommit.pl:718 ../scripts/debdiff.1:180 ../scripts/debi.1:116 ../scripts/debrelease.1:132 ../scripts/deb-reversion.dbk:247 ../scripts/debrsign.1:66 ../scripts/debsign.1:118 ../scripts/debuild.1:408 ../scripts/dget.pl:630 ../scripts/diff2patches.1:37 ../scripts/dpkg-depcheck.1:118 ../scripts/dpkg-genbuilddeps.1:30 ../scripts/dscverify.1:49 ../scripts/grep-excuses.1:37 ../scripts/list-unreleased.1:19 ../scripts/nmudiff.1:92 ../scripts/plotchangelog.1:124 ../scripts/pts-subscribe.1:46 ../scripts/rc-alert.1:81 ../scripts/rmadison.pl:291 ../scripts/tagpending.pl:150 ../scripts/uscan.1:521 ../scripts/uupdate.1:160 ../scripts/wnpp-alert.1:29 ../scripts/wnpp-check.1:23 ../scripts/devscripts.conf.5:54 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -2048,7 +2048,7 @@ msgstr "" # type: TP -#: ../scripts/build-rdeps.pl:50 ../scripts/debclean.1:84 ../scripts/grep-excuses.1:21 ../scripts/nmudiff.1:63 ../scripts/plotchangelog.1:92 ../scripts/uscan.1:431 +#: ../scripts/build-rdeps.pl:50 ../scripts/debclean.1:84 ../scripts/grep-excuses.1:21 ../scripts/nmudiff.1:63 ../scripts/plotchangelog.1:92 ../scripts/uscan.1:437 #, no-wrap msgid "B<--help>" msgstr "" @@ -2059,7 +2059,7 @@ msgstr "" # type: TP -#: ../scripts/build-rdeps.pl:54 ../scripts/debchange.1:338 ../scripts/debclean.1:87 ../scripts/debrelease.1:102 ../scripts/debsign.1:96 ../scripts/diff2patches.1:21 ../scripts/dscverify.1:35 ../scripts/grep-excuses.1:24 ../scripts/nmudiff.1:66 ../scripts/plotchangelog.1:95 ../scripts/pts-subscribe.1:26 ../scripts/rmadison.pl:246 ../scripts/uscan.1:434 ../scripts/uupdate.1:83 ../scripts/who-uploads.1:47 +#: ../scripts/build-rdeps.pl:54 ../scripts/debchange.1:338 ../scripts/debclean.1:87 ../scripts/debrelease.1:102 ../scripts/debsign.1:96 ../scripts/diff2patches.1:21 ../scripts/dscverify.1:35 ../scripts/grep-excuses.1:24 ../scripts/nmudiff.1:66 ../scripts/plotchangelog.1:95 ../scripts/pts-subscribe.1:26 ../scripts/rmadison.pl:246 ../scripts/uscan.1:440 ../scripts/uupdate.1:83 ../scripts/who-uploads.1:47 #, no-wrap msgid "B<--version>" msgstr "" @@ -2143,7 +2143,7 @@ msgstr "" # type: Plain text -#: ../scripts/chdist.pl:52 ../scripts/deb-reversion.dbk:239 ../scripts/mass-bug.pl:119 ../scripts/uscan.1:437 +#: ../scripts/chdist.pl:52 ../scripts/deb-reversion.dbk:239 ../scripts/mass-bug.pl:119 ../scripts/uscan.1:443 msgid "Display version information." msgstr "" @@ -2371,7 +2371,7 @@ msgstr "" # type: TP -#: ../scripts/checkbashisms.1:53 ../scripts/transition-check.pl:66 ../scripts/uscan.1:486 ../scripts/wnpp-check.1:29 +#: ../scripts/checkbashisms.1:53 ../scripts/transition-check.pl:66 ../scripts/uscan.1:492 ../scripts/wnpp-check.1:29 #, no-wrap msgid "1" msgstr "" @@ -2974,7 +2974,7 @@ msgstr "" # type: TP -#: ../scripts/cvs-debrelease.1:57 ../scripts/debc.1:85 ../scripts/debchange.1:326 ../scripts/debclean.1:77 ../scripts/debdiff.1:126 ../scripts/debi.1:86 ../scripts/debrelease.1:95 ../scripts/debsign.1:89 ../scripts/dpkg-depcheck.1:92 ../scripts/dscverify.1:24 ../scripts/grep-excuses.1:14 ../scripts/nmudiff.1:59 ../scripts/rmadison.pl:250 ../scripts/uscan.1:427 ../scripts/uupdate.1:76 ../scripts/who-uploads.1:40 +#: ../scripts/cvs-debrelease.1:57 ../scripts/debc.1:85 ../scripts/debchange.1:326 ../scripts/debclean.1:77 ../scripts/debdiff.1:126 ../scripts/debi.1:86 ../scripts/debrelease.1:95 ../scripts/debsign.1:89 ../scripts/dpkg-depcheck.1:92 ../scripts/dscverify.1:24 ../scripts/grep-excuses.1:14 ../scripts/nmudiff.1:59 ../scripts/rmadison.pl:250 ../scripts/uscan.1:433 ../scripts/uupdate.1:76 ../scripts/who-uploads.1:40 #, no-wrap msgid "B<--no-conf>, B<--noconf>" msgstr "" @@ -3436,7 +3436,7 @@ msgstr "" # type: SH -#: ../scripts/debc.1:28 ../scripts/debchange.1:106 ../scripts/debclean.1:24 ../scripts/debi.1:29 ../scripts/debrelease.1:20 ../scripts/debuild.1:49 ../scripts/uscan.1:271 +#: ../scripts/debc.1:28 ../scripts/debchange.1:106 ../scripts/debclean.1:24 ../scripts/debi.1:29 ../scripts/debrelease.1:20 ../scripts/debuild.1:49 ../scripts/uscan.1:277 #, no-wrap msgid "Directory name checking" msgstr "" @@ -3456,23 +3456,23 @@ msgstr "" # type: Plain text -#: ../scripts/debc.1:41 ../scripts/debchange.1:119 ../scripts/debclean.1:37 ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:63 ../scripts/uscan.1:288 +#: ../scripts/debc.1:41 ../scripts/debchange.1:119 ../scripts/debclean.1:37 ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:63 ../scripts/uscan.1:294 msgid "DEVSCRIPTS_CHECK_DIRNAME_LEVEL can take the following values:" msgstr "" # type: TP -#: ../scripts/debc.1:41 ../scripts/debchange.1:119 ../scripts/debclean.1:37 ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:63 ../scripts/uscan.1:288 +#: ../scripts/debc.1:41 ../scripts/debchange.1:119 ../scripts/debclean.1:37 ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:63 ../scripts/uscan.1:294 #, no-wrap msgid "B<0>" msgstr "" # type: Plain text -#: ../scripts/debc.1:44 ../scripts/debchange.1:122 ../scripts/debclean.1:40 ../scripts/debi.1:45 ../scripts/debrelease.1:36 ../scripts/debuild.1:66 ../scripts/uscan.1:291 +#: ../scripts/debc.1:44 ../scripts/debchange.1:122 ../scripts/debclean.1:40 ../scripts/debi.1:45 ../scripts/debrelease.1:36 ../scripts/debuild.1:66 ../scripts/uscan.1:297 msgid "Never check the directory name." msgstr "" # type: TP -#: ../scripts/debc.1:44 ../scripts/debchange.1:122 ../scripts/debclean.1:40 ../scripts/debi.1:45 ../scripts/debrelease.1:36 ../scripts/debuild.1:66 ../scripts/uscan.1:291 +#: ../scripts/debc.1:44 ../scripts/debchange.1:122 ../scripts/debclean.1:40 ../scripts/debi.1:45 ../scripts/debrelease.1:36 ../scripts/debuild.1:66 ../scripts/uscan.1:297 #, no-wrap msgid "B<1>" msgstr "" @@ -3485,18 +3485,18 @@ msgstr "" # type: TP -#: ../scripts/debc.1:48 ../scripts/debchange.1:126 ../scripts/debclean.1:44 ../scripts/debi.1:49 ../scripts/debrelease.1:40 ../scripts/debuild.1:70 ../scripts/uscan.1:297 +#: ../scripts/debc.1:48 ../scripts/debchange.1:126 ../scripts/debclean.1:44 ../scripts/debi.1:49 ../scripts/debrelease.1:40 ../scripts/debuild.1:70 ../scripts/uscan.1:303 #, no-wrap msgid "B<2>" msgstr "" # type: Plain text -#: ../scripts/debc.1:51 ../scripts/debchange.1:129 ../scripts/debclean.1:47 ../scripts/debi.1:52 ../scripts/debrelease.1:43 ../scripts/debuild.1:73 ../scripts/uscan.1:300 +#: ../scripts/debc.1:51 ../scripts/debchange.1:129 ../scripts/debclean.1:47 ../scripts/debi.1:52 ../scripts/debrelease.1:43 ../scripts/debuild.1:73 ../scripts/uscan.1:306 msgid "Always check the directory name." msgstr "" # type: Plain text -#: ../scripts/debc.1:64 ../scripts/debchange.1:142 ../scripts/debclean.1:60 ../scripts/debi.1:65 ../scripts/debrelease.1:56 ../scripts/debuild.1:86 ../scripts/uscan.1:313 +#: ../scripts/debc.1:64 ../scripts/debchange.1:142 ../scripts/debclean.1:60 ../scripts/debi.1:65 ../scripts/debrelease.1:56 ../scripts/debuild.1:86 ../scripts/uscan.1:319 msgid "" "The directory name is checked by testing whether the current directory name " "(as determined by B(1)) matches the regex given by the configuration " @@ -3526,20 +3526,20 @@ msgstr "" # type: TP -#: ../scripts/debc.1:77 ../scripts/debchange.1:318 ../scripts/debclean.1:69 ../scripts/debi.1:78 ../scripts/debrelease.1:87 ../scripts/debuild.1:274 ../scripts/uscan.1:416 +#: ../scripts/debc.1:77 ../scripts/debchange.1:318 ../scripts/debclean.1:69 ../scripts/debi.1:78 ../scripts/debrelease.1:87 ../scripts/debuild.1:274 ../scripts/uscan.1:422 #, no-wrap msgid "B<--check-dirname-level> I" msgstr "" # type: Plain text -#: ../scripts/debc.1:81 ../scripts/debc.1:85 ../scripts/debchange.1:322 ../scripts/debchange.1:326 ../scripts/debclean.1:73 ../scripts/debclean.1:77 ../scripts/debi.1:82 ../scripts/debi.1:86 ../scripts/debrelease.1:91 ../scripts/debrelease.1:95 ../scripts/debuild.1:278 ../scripts/debuild.1:282 ../scripts/uscan.1:420 ../scripts/uscan.1:424 +#: ../scripts/debc.1:81 ../scripts/debc.1:85 ../scripts/debchange.1:322 ../scripts/debchange.1:326 ../scripts/debclean.1:73 ../scripts/debclean.1:77 ../scripts/debi.1:82 ../scripts/debi.1:86 ../scripts/debrelease.1:91 ../scripts/debrelease.1:95 ../scripts/debuild.1:278 ../scripts/debuild.1:282 ../scripts/uscan.1:426 ../scripts/uscan.1:430 msgid "" "See the above section \"Directory name checking\" for an explanation of this " "option." msgstr "" # type: TP -#: ../scripts/debc.1:81 ../scripts/debchange.1:322 ../scripts/debclean.1:73 ../scripts/debi.1:82 ../scripts/debrelease.1:91 ../scripts/debuild.1:278 ../scripts/uscan.1:420 +#: ../scripts/debc.1:81 ../scripts/debchange.1:322 ../scripts/debclean.1:73 ../scripts/debi.1:82 ../scripts/debrelease.1:91 ../scripts/debuild.1:278 ../scripts/uscan.1:426 #, no-wrap msgid "B<--check-dirname-regex> I" msgstr "" @@ -3872,7 +3872,7 @@ msgstr "" # type: TP -#: ../scripts/debchange.1:193 ../scripts/uscan.1:382 +#: ../scripts/debchange.1:193 ../scripts/uscan.1:388 #, no-wrap msgid "B<--package> I" msgstr "" @@ -3951,8 +3951,8 @@ # type: Plain text #: ../scripts/debchange.1:223 msgid "" -"Increment the Debian release number for a upload to etch-backports, and add " -"a backport upload changelog comment." +"Increment the Debian release number for an upload to lenny-backports, and " +"add a backport upload changelog comment." msgstr "" # type: TP @@ -9122,7 +9122,7 @@ msgstr "" # type: TP -#: ../scripts/plotchangelog.1:78 ../scripts/uscan.1:407 +#: ../scripts/plotchangelog.1:78 ../scripts/uscan.1:413 #, no-wrap msgid "B<--verbose>" msgstr "" @@ -10090,7 +10090,7 @@ msgstr "" # type: SH -#: ../scripts/transition-check.pl:54 ../scripts/uscan.1:478 ../scripts/wnpp-check.1:25 +#: ../scripts/transition-check.pl:54 ../scripts/uscan.1:484 ../scripts/wnpp-check.1:25 #, no-wrap msgid "EXIT STATUS" msgstr "" @@ -10103,7 +10103,7 @@ msgstr "" # type: TP -#: ../scripts/transition-check.pl:61 ../scripts/uscan.1:482 ../scripts/wnpp-check.1:26 +#: ../scripts/transition-check.pl:61 ../scripts/uscan.1:488 ../scripts/wnpp-check.1:26 #, no-wrap msgid "0" msgstr "" @@ -10518,22 +10518,23 @@ msgstr "" # type: Plain text -#: ../scripts/uscan.1:237 +#: ../scripts/uscan.1:238 msgid "" "This is used to mangle the upstream version number as matched by the " "ftp://... or http:// rules as follows. First, the I string is split " "into multiple rules at every `;'. Then the upstream version number is " -"mangled by executing the Perl command:" +"mangled by applying I to the version, in a similar way to executing " +"the Perl command:" msgstr "" # type: Plain text -#: ../scripts/uscan.1:239 +#: ../scripts/uscan.1:240 #, no-wrap msgid " $version =~ I;\n" msgstr "" # type: Plain text -#: ../scripts/uscan.1:244 +#: ../scripts/uscan.1:245 msgid "" "for each rule. Thus, suitable rules might be `s/^/0./' to prepend `0.' to " "the version number and `s/_/./' to change underscores into periods. Note " @@ -10541,14 +10542,23 @@ "problem." msgstr "" +# type: Plain text +#: ../scripts/uscan.1:250 +msgid "" +"I may only use the 's', 'tr' and 'y' operations. When the 's' " +"operation is used, only the 'g', 'i' and 'x' flags are available and I " +"may not contain any expressions which have the potential to execute code " +"(i.e. the (?{}) and (??{}) constructs are not supported)." +msgstr "" + # type: TP -#: ../scripts/uscan.1:244 +#: ../scripts/uscan.1:250 #, no-wrap msgid "BI" msgstr "" # type: Plain text -#: ../scripts/uscan.1:252 +#: ../scripts/uscan.1:258 msgid "" "This is used to mangle the Debian version number of the currently installed " "package in the same way as the B option. Thus, a suitable " @@ -10558,13 +10568,13 @@ msgstr "" # type: TP -#: ../scripts/uscan.1:252 +#: ../scripts/uscan.1:258 #, no-wrap msgid "BI" msgstr "" # type: Plain text -#: ../scripts/uscan.1:257 +#: ../scripts/uscan.1:263 msgid "" "This is a syntactic shorthand for " "BIB<,dversionmangle=>IB<, applying the same " @@ -10572,13 +10582,13 @@ msgstr "" # type: TP -#: ../scripts/uscan.1:257 +#: ../scripts/uscan.1:263 #, no-wrap msgid "BI" msgstr "" # type: Plain text -#: ../scripts/uscan.1:263 +#: ../scripts/uscan.1:269 msgid "" "This is used to mangle the filename with which the downloaded file will be " "saved, and is parsed in the same way as the B option. " @@ -10586,13 +10596,13 @@ msgstr "" # type: TP -#: ../scripts/uscan.1:263 +#: ../scripts/uscan.1:269 #, no-wrap msgid "BI" msgstr "" # type: Plain text -#: ../scripts/uscan.1:271 +#: ../scripts/uscan.1:277 msgid "" "This is used to mangle the URL to be used for the download. The URL is " "first computed based on the homepage downloaded and the pattern matched, " @@ -10602,7 +10612,7 @@ msgstr "" # type: Plain text -#: ../scripts/uscan.1:286 +#: ../scripts/uscan.1:292 msgid "" "Similarly to several other scripts in the B package, B " "explores the requested directory trees looking for I and " @@ -10619,7 +10629,7 @@ msgstr "" # type: Plain text -#: ../scripts/uscan.1:297 +#: ../scripts/uscan.1:303 msgid "" "Only check the directory name if we have had to change directory in our " "search for I, that is, the directory containing " @@ -10628,12 +10638,12 @@ msgstr "" # type: Plain text -#: ../scripts/uscan.1:315 +#: ../scripts/uscan.1:321 msgid "This script will perform a fully automatic upstream update." msgstr "" # type: Plain text -#: ../scripts/uscan.1:323 +#: ../scripts/uscan.1:329 #, no-wrap msgid "" "#!/bin/sh -e\n" @@ -10645,7 +10655,7 @@ msgstr "" # type: Plain text -#: ../scripts/uscan.1:328 +#: ../scripts/uscan.1:334 msgid "" "Note that we don't call B or B automatically, as the " "maintainer should perform sanity checks on the software before uploading it " @@ -10653,105 +10663,105 @@ msgstr "" # type: TP -#: ../scripts/uscan.1:329 +#: ../scripts/uscan.1:335 #, no-wrap msgid "B<--report, --no-download>" msgstr "" # type: Plain text -#: ../scripts/uscan.1:332 +#: ../scripts/uscan.1:338 msgid "Only report about available newer versions but do not download anything." msgstr "" # type: TP -#: ../scripts/uscan.1:332 +#: ../scripts/uscan.1:338 #, no-wrap msgid "B<--report-status>" msgstr "" # type: Plain text -#: ../scripts/uscan.1:336 +#: ../scripts/uscan.1:342 msgid "" "Report on the status of all packages, even those which are up-to-date, but " "do not download anything." msgstr "" # type: TP -#: ../scripts/uscan.1:336 +#: ../scripts/uscan.1:342 #, no-wrap msgid "B<--download>" msgstr "" # type: Plain text -#: ../scripts/uscan.1:339 +#: ../scripts/uscan.1:345 msgid "Report and download. (This is the default behaviour.)" msgstr "" # type: TP -#: ../scripts/uscan.1:339 +#: ../scripts/uscan.1:345 #, no-wrap msgid "B<--destdir>" msgstr "" # type: Plain text -#: ../scripts/uscan.1:342 +#: ../scripts/uscan.1:348 msgid "Path of directory to which to download." msgstr "" # type: TP -#: ../scripts/uscan.1:342 +#: ../scripts/uscan.1:348 #, no-wrap msgid "B<--force-download>" msgstr "" # type: Plain text -#: ../scripts/uscan.1:345 +#: ../scripts/uscan.1:351 msgid "" "Download upstream even if up to date (will not overwrite local files, " "however)" msgstr "" # type: TP -#: ../scripts/uscan.1:345 +#: ../scripts/uscan.1:351 #, no-wrap msgid "B<--pasv>" msgstr "" # type: Plain text -#: ../scripts/uscan.1:348 +#: ../scripts/uscan.1:354 msgid "Force PASV mode for FTP connections." msgstr "" # type: TP -#: ../scripts/uscan.1:348 +#: ../scripts/uscan.1:354 #, no-wrap msgid "B<--no-pasv>" msgstr "" # type: Plain text -#: ../scripts/uscan.1:351 +#: ../scripts/uscan.1:357 msgid "Do not use PASV mode for FTP connections." msgstr "" # type: TP -#: ../scripts/uscan.1:351 +#: ../scripts/uscan.1:357 #, no-wrap msgid "B<--timeout> I" msgstr "" # type: Plain text -#: ../scripts/uscan.1:354 +#: ../scripts/uscan.1:360 msgid "Set timeout to N seconds (default 20 seconds)." msgstr "" # type: TP -#: ../scripts/uscan.1:354 +#: ../scripts/uscan.1:360 #, no-wrap msgid "B<--symlink>" msgstr "" # type: Plain text -#: ../scripts/uscan.1:360 +#: ../scripts/uscan.1:366 msgid "" "Make orig.tar.gz symlinks to any downloaded files if their extensions are " "I<.tar.gz> or I<.tgz>, and similarly for to orig.tar.bz2 for the suffixes " @@ -10759,13 +10769,13 @@ msgstr "" # type: TP -#: ../scripts/uscan.1:360 +#: ../scripts/uscan.1:366 #, no-wrap msgid "B<--rename>" msgstr "" # type: Plain text -#: ../scripts/uscan.1:365 +#: ../scripts/uscan.1:371 msgid "" "Instead of symlinking, rename the downloaded files to their Debian " "orig.tar.gz names if their extensions are I<.tar.gz> or I<.tgz>, and " @@ -10773,13 +10783,13 @@ msgstr "" # type: TP -#: ../scripts/uscan.1:365 +#: ../scripts/uscan.1:371 #, no-wrap msgid "B<--repack>" msgstr "" # type: Plain text -#: ../scripts/uscan.1:373 +#: ../scripts/uscan.1:379 msgid "" "After having downloaded a bzip tar or zip archive, repack it to a gzip tar " "archive, which is still currently required as a member of a Debian source " @@ -10790,40 +10800,40 @@ msgstr "" # type: TP -#: ../scripts/uscan.1:373 ../scripts/uupdate.1:72 +#: ../scripts/uscan.1:379 ../scripts/uupdate.1:72 #, no-wrap msgid "B<--no-symlink>" msgstr "" # type: Plain text -#: ../scripts/uscan.1:376 +#: ../scripts/uscan.1:382 msgid "Don't make these symlinks and don't rename the files." msgstr "" # type: TP -#: ../scripts/uscan.1:376 +#: ../scripts/uscan.1:382 #, no-wrap msgid "B<--dehs>" msgstr "" # type: Plain text -#: ../scripts/uscan.1:379 +#: ../scripts/uscan.1:385 msgid "Use an XML format for output, as required by the DEHS system." msgstr "" # type: TP -#: ../scripts/uscan.1:379 +#: ../scripts/uscan.1:385 #, no-wrap msgid "B<--no-dehs>" msgstr "" # type: Plain text -#: ../scripts/uscan.1:382 +#: ../scripts/uscan.1:388 msgid "Use the traditional uscan output format. (This is the default behaviour.)" msgstr "" # type: Plain text -#: ../scripts/uscan.1:391 +#: ../scripts/uscan.1:397 msgid "" "Specify the name of the package to check for rather than examining " "I; this requires the B<--upstream-version> (unless a " @@ -10834,13 +10844,13 @@ msgstr "" # type: TP -#: ../scripts/uscan.1:391 +#: ../scripts/uscan.1:397 #, no-wrap msgid "B<--upstream-version> I" msgstr "" # type: Plain text -#: ../scripts/uscan.1:396 +#: ../scripts/uscan.1:402 msgid "" "Specify the current upstream version rather than examine the watchfile or " "changelog to determine it. This is ignored if a directory scan is being " @@ -10848,13 +10858,13 @@ msgstr "" # type: TP -#: ../scripts/uscan.1:396 +#: ../scripts/uscan.1:402 #, no-wrap msgid "B<--watchfile> I" msgstr "" # type: Plain text -#: ../scripts/uscan.1:403 +#: ../scripts/uscan.1:409 msgid "" "Specify the watchfile rather than perform a directory scan to determine it. " "If this option is used without B<--package>, then B must be called " @@ -10863,63 +10873,63 @@ msgstr "" # type: TP -#: ../scripts/uscan.1:403 +#: ../scripts/uscan.1:409 #, no-wrap msgid "B<--download-version> I" msgstr "" # type: Plain text -#: ../scripts/uscan.1:407 +#: ../scripts/uscan.1:413 msgid "" "Specify the version which the upstream release must match in order to be " "considered, rather than using the release with the highest version." msgstr "" # type: Plain text -#: ../scripts/uscan.1:410 +#: ../scripts/uscan.1:416 msgid "Give verbose output." msgstr "" # type: TP -#: ../scripts/uscan.1:410 +#: ../scripts/uscan.1:416 #, no-wrap msgid "B<--no-verbose>" msgstr "" # type: Plain text -#: ../scripts/uscan.1:413 +#: ../scripts/uscan.1:419 msgid "Don't give verbose output. (This is the default behaviour.)" msgstr "" # type: TP -#: ../scripts/uscan.1:413 +#: ../scripts/uscan.1:419 #, no-wrap msgid "B<--debug>" msgstr "" # type: Plain text -#: ../scripts/uscan.1:416 +#: ../scripts/uscan.1:422 msgid "Dump the downloaded web pages to stdout for debugging your watch file." msgstr "" # type: TP -#: ../scripts/uscan.1:424 +#: ../scripts/uscan.1:430 #, no-wrap msgid "B<--user-agent>, B<--useragent>" msgstr "" # type: Plain text -#: ../scripts/uscan.1:427 +#: ../scripts/uscan.1:433 msgid "Override the default user agent header." msgstr "" # type: Plain text -#: ../scripts/uscan.1:434 +#: ../scripts/uscan.1:440 msgid "Give brief usage information." msgstr "" # type: Plain text -#: ../scripts/uscan.1:444 +#: ../scripts/uscan.1:450 msgid "" "The two configuration files I and I<~/.devscripts> are " "sourced by a shell in that order to set configuration variables. These may " @@ -10930,26 +10940,26 @@ msgstr "" # type: TP -#: ../scripts/uscan.1:444 +#: ../scripts/uscan.1:450 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: ../scripts/uscan.1:449 +#: ../scripts/uscan.1:455 msgid "" "If this is set to I, then newer upstream files will not be downloaded; " "this is equivalent to the B<--report> or B<--no-download> options." msgstr "" # type: TP -#: ../scripts/uscan.1:449 +#: ../scripts/uscan.1:455 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: ../scripts/uscan.1:455 +#: ../scripts/uscan.1:461 msgid "" "If this is set to I or I, this will force FTP connections to use " "PASV mode or not to, respectively. If this is set to I, then " @@ -10958,13 +10968,13 @@ msgstr "" # type: TP -#: ../scripts/uscan.1:455 +#: ../scripts/uscan.1:461 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: ../scripts/uscan.1:462 +#: ../scripts/uscan.1:468 msgid "" "If this is set to I, then a pkg_version.orig.tar.{gz|bz2} symlink will " "not be made (equivalent to the B<--no-symlink> option). If it is set to " @@ -10974,59 +10984,59 @@ msgstr "" # type: TP -#: ../scripts/uscan.1:462 +#: ../scripts/uscan.1:468 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: ../scripts/uscan.1:466 +#: ../scripts/uscan.1:472 msgid "" "If this is set to I, then DEHS-style output will be used. This is " "equivalent to the B<--dehs> option." msgstr "" # type: TP -#: ../scripts/uscan.1:466 +#: ../scripts/uscan.1:472 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: ../scripts/uscan.1:470 +#: ../scripts/uscan.1:476 msgid "" "If this is set to I, then verbose output will be given. This is " "equivalent to the B<--verbose> option." msgstr "" # type: TP -#: ../scripts/uscan.1:470 +#: ../scripts/uscan.1:476 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: ../scripts/uscan.1:474 +#: ../scripts/uscan.1:480 msgid "" "If set, the specified user agent string will be used in place of the " "default. This is equivalent to the B<--user-agent> option." msgstr "" # type: TP -#: ../scripts/uscan.1:474 +#: ../scripts/uscan.1:480 #, no-wrap msgid "B" msgstr "" # type: Plain text -#: ../scripts/uscan.1:478 +#: ../scripts/uscan.1:484 msgid "" "If set, the downloaded files will be placed in this directory. This is " "equivalent to the B<--destdir> option." msgstr "" # type: Plain text -#: ../scripts/uscan.1:482 +#: ../scripts/uscan.1:488 msgid "" "The exit status gives some indication of whether a newer version was found " "or not; one is advised to read the output to determine exactly what happened " @@ -11034,25 +11044,25 @@ msgstr "" # type: Plain text -#: ../scripts/uscan.1:486 +#: ../scripts/uscan.1:492 msgid "" "Either B<--help> or B<--version> was used, or for some watchfile which was " "examined, a newer upstream version was located." msgstr "" # type: Plain text -#: ../scripts/uscan.1:490 +#: ../scripts/uscan.1:496 msgid "No newer upstream versions were located for any of the watchfiles examined." msgstr "" # type: SH -#: ../scripts/uscan.1:490 +#: ../scripts/uscan.1:496 #, no-wrap msgid "HISTORY AND UPGRADING" msgstr "" # type: Plain text -#: ../scripts/uscan.1:494 +#: ../scripts/uscan.1:500 msgid "" "This section briefly describes the backwards-incompatible watchfile features " "which have been added in each watchfile version, and the first version of " @@ -11060,13 +11070,13 @@ msgstr "" # type: TP -#: ../scripts/uscan.1:494 +#: ../scripts/uscan.1:500 #, no-wrap msgid "I" msgstr "" # type: Plain text -#: ../scripts/uscan.1:499 +#: ../scripts/uscan.1:505 msgid "" "The watchfile syntax was significantly different in those days. Don't use " "it. If you are upgrading from a pre-version 2 watchfile, you are advised to " @@ -11074,26 +11084,26 @@ msgstr "" # type: TP -#: ../scripts/uscan.1:499 +#: ../scripts/uscan.1:505 #, no-wrap msgid "I" msgstr "" # type: Plain text -#: ../scripts/uscan.1:503 +#: ../scripts/uscan.1:509 msgid "" "devscripts version 2.6.90: The first incarnation of the current style of " "watchfiles." msgstr "" # type: TP -#: ../scripts/uscan.1:503 +#: ../scripts/uscan.1:509 #, no-wrap msgid "I" msgstr "" # type: Plain text -#: ../scripts/uscan.1:509 +#: ../scripts/uscan.1:515 msgid "" "devscripts version 2.8.12: Introduced the following: correct handling of " "regex special characters in the path part, directory/path pattern matching, " @@ -11102,7 +11112,7 @@ msgstr "" # type: Plain text -#: ../scripts/uscan.1:515 +#: ../scripts/uscan.1:521 msgid "" "If you are upgrading from version 2, the key incompatibility is if you have " "multiple groups in the pattern part; whereas only the first one would be " @@ -11112,12 +11122,12 @@ msgstr "" # type: Plain text -#: ../scripts/uscan.1:521 +#: ../scripts/uscan.1:527 msgid "B(1), B(1), B(1) and B(5)." msgstr "" # type: Plain text -#: ../scripts/uscan.1:526 +#: ../scripts/uscan.1:532 msgid "" "The original version of B was written by Christoph Lameter " "Eclameter@debian.orgE. Significant improvements, changes and " diff -Nru devscripts-2.10.35lenny3/po4a/po/fr.po devscripts-2.10.35lenny6/po4a/po/fr.po --- devscripts-2.10.35lenny3/po4a/po/fr.po 2008-07-15 21:46:53.000000000 +0000 +++ devscripts-2.10.35lenny6/po4a/po/fr.po 2009-03-24 19:20:58.000000000 +0000 @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: devscripts\n" -"POT-Creation-Date: 2008-07-15 19:19+0100\n" +"POT-Creation-Date: 2009-03-24 19:20+0000\n" "PO-Revision-Date: 2008-07-15 23:07+0200\n" "Last-Translator: Nicolas François \n" "Language-Team: French \n" @@ -175,7 +175,7 @@ "(« stdout ») et un E pour la sortie d'erreur (« stderr »)." # type: SH -#: ../scripts/annotate-output.1:11 ../scripts/uscan.1:313 +#: ../scripts/annotate-output.1:11 ../scripts/uscan.1:319 #, no-wrap msgid "EXAMPLE" msgstr "EXEMPLE" @@ -320,7 +320,7 @@ #: ../scripts/plotchangelog.1:126 ../scripts/pts-subscribe.1:51 #: ../scripts/rc-alert.1:83 ../scripts/rmadison.pl:295 #: ../scripts/svnpath.pl:97 ../scripts/transition-check.pl:81 -#: ../scripts/uscan.1:521 ../scripts/uupdate.1:167 ../scripts/whodepends.1:19 +#: ../scripts/uscan.1:527 ../scripts/uupdate.1:167 ../scripts/whodepends.1:19 #: ../scripts/who-uploads.1:71 ../scripts/wnpp-alert.1:31 #: ../scripts/wnpp-check.1:33 ../scripts/devscripts.conf.5:58 #, no-wrap @@ -643,7 +643,7 @@ #: ../scripts/nmudiff.1:21 ../scripts/plotchangelog.1:43 #: ../scripts/pts-subscribe.1:13 ../scripts/rc-alert.1:17 #: ../scripts/rmadison.pl:196 ../scripts/tagpending.pl:95 -#: ../scripts/transition-check.pl:42 ../scripts/uscan.1:328 +#: ../scripts/transition-check.pl:42 ../scripts/uscan.1:334 #: ../scripts/uupdate.1:50 ../scripts/whodepends.1:10 #: ../scripts/who-uploads.1:15 ../scripts/wnpp-alert.1:17 #: ../scripts/wnpp-check.1:16 @@ -1082,7 +1082,7 @@ #: ../scripts/debsign.1:93 ../scripts/debuild.1:223 #: ../scripts/dpkg-depcheck.1:96 ../scripts/dscverify.1:28 #: ../scripts/grep-excuses.1:18 ../scripts/mass-bug.pl:110 -#: ../scripts/nmudiff.1:63 ../scripts/uscan.1:431 ../scripts/uupdate.1:80 +#: ../scripts/nmudiff.1:63 ../scripts/uscan.1:437 ../scripts/uupdate.1:80 #: ../scripts/who-uploads.1:44 msgid "" "Do not read any configuration files. This can only be used as the first " @@ -2351,7 +2351,7 @@ #: ../scripts/licensecheck.pl:83 ../scripts/mass-bug.pl:128 #: ../scripts/nmudiff.1:69 ../scripts/plotchangelog.1:106 #: ../scripts/pts-subscribe.1:37 ../scripts/rmadison.pl:259 -#: ../scripts/uscan.1:437 ../scripts/uupdate.1:86 ../scripts/who-uploads.1:50 +#: ../scripts/uscan.1:443 ../scripts/uupdate.1:86 ../scripts/who-uploads.1:50 #, no-wrap msgid "CONFIGURATION VARIABLES" msgstr "VARIABLES DE CONFIGURATION" @@ -2594,7 +2594,7 @@ #: ../scripts/list-unreleased.1:19 ../scripts/nmudiff.1:92 #: ../scripts/plotchangelog.1:124 ../scripts/pts-subscribe.1:46 #: ../scripts/rc-alert.1:81 ../scripts/rmadison.pl:291 -#: ../scripts/tagpending.pl:150 ../scripts/uscan.1:515 +#: ../scripts/tagpending.pl:150 ../scripts/uscan.1:521 #: ../scripts/uupdate.1:160 ../scripts/wnpp-alert.1:29 #: ../scripts/wnpp-check.1:23 ../scripts/devscripts.conf.5:54 #, no-wrap @@ -2714,7 +2714,7 @@ # type: TP #: ../scripts/build-rdeps.pl:50 ../scripts/debclean.1:84 #: ../scripts/grep-excuses.1:21 ../scripts/nmudiff.1:63 -#: ../scripts/plotchangelog.1:92 ../scripts/uscan.1:431 +#: ../scripts/plotchangelog.1:92 ../scripts/uscan.1:437 #, no-wrap msgid "B<--help>" msgstr "B<--help>" @@ -2731,7 +2731,7 @@ #: ../scripts/dscverify.1:35 ../scripts/grep-excuses.1:24 #: ../scripts/nmudiff.1:66 ../scripts/plotchangelog.1:95 #: ../scripts/pts-subscribe.1:26 ../scripts/rmadison.pl:246 -#: ../scripts/uscan.1:434 ../scripts/uupdate.1:83 ../scripts/who-uploads.1:47 +#: ../scripts/uscan.1:440 ../scripts/uupdate.1:83 ../scripts/who-uploads.1:47 #, no-wrap msgid "B<--version>" msgstr "B<--version>" @@ -2827,7 +2827,7 @@ # type: Plain text #: ../scripts/chdist.pl:52 ../scripts/deb-reversion.dbk:239 -#: ../scripts/mass-bug.pl:119 ../scripts/uscan.1:437 +#: ../scripts/mass-bug.pl:119 ../scripts/uscan.1:443 msgid "Display version information." msgstr "Afficher les informations sur la version." @@ -3119,7 +3119,7 @@ # type: TP #: ../scripts/checkbashisms.1:53 ../scripts/transition-check.pl:66 -#: ../scripts/uscan.1:486 ../scripts/wnpp-check.1:29 +#: ../scripts/uscan.1:492 ../scripts/wnpp-check.1:29 #, no-wrap msgid "1" msgstr "1" @@ -3828,7 +3828,7 @@ #: ../scripts/debdiff.1:126 ../scripts/debi.1:86 ../scripts/debrelease.1:95 #: ../scripts/debsign.1:89 ../scripts/dpkg-depcheck.1:92 #: ../scripts/dscverify.1:24 ../scripts/grep-excuses.1:14 -#: ../scripts/nmudiff.1:59 ../scripts/rmadison.pl:250 ../scripts/uscan.1:427 +#: ../scripts/nmudiff.1:59 ../scripts/rmadison.pl:250 ../scripts/uscan.1:433 #: ../scripts/uupdate.1:76 ../scripts/who-uploads.1:40 #, no-wrap msgid "B<--no-conf>, B<--noconf>" @@ -4403,7 +4403,7 @@ # type: SH #: ../scripts/debc.1:28 ../scripts/debchange.1:106 ../scripts/debclean.1:24 #: ../scripts/debi.1:29 ../scripts/debrelease.1:20 ../scripts/debuild.1:49 -#: ../scripts/uscan.1:271 +#: ../scripts/uscan.1:277 #, no-wrap msgid "Directory name checking" msgstr "Vérification du nom du répertoire" @@ -4435,14 +4435,14 @@ # type: Plain text #: ../scripts/debc.1:41 ../scripts/debchange.1:119 ../scripts/debclean.1:37 #: ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:63 -#: ../scripts/uscan.1:288 +#: ../scripts/uscan.1:294 msgid "DEVSCRIPTS_CHECK_DIRNAME_LEVEL can take the following values:" msgstr "DEVSCRIPTS_CHECK_DIRNAME_LEVEL peut prendre les valeurs suivantes :" # type: TP #: ../scripts/debc.1:41 ../scripts/debchange.1:119 ../scripts/debclean.1:37 #: ../scripts/debi.1:42 ../scripts/debrelease.1:33 ../scripts/debuild.1:63 -#: ../scripts/uscan.1:288 +#: ../scripts/uscan.1:294 #, no-wrap msgid "B<0>" msgstr "B<0>" @@ -4450,14 +4450,14 @@ # type: Plain text #: ../scripts/debc.1:44 ../scripts/debchange.1:122 ../scripts/debclean.1:40 #: ../scripts/debi.1:45 ../scripts/debrelease.1:36 ../scripts/debuild.1:66 -#: ../scripts/uscan.1:291 +#: ../scripts/uscan.1:297 msgid "Never check the directory name." msgstr "Ne vérifie jamais le nom du répertoire." # type: TP #: ../scripts/debc.1:44 ../scripts/debchange.1:122 ../scripts/debclean.1:40 #: ../scripts/debi.1:45 ../scripts/debrelease.1:36 ../scripts/debuild.1:66 -#: ../scripts/uscan.1:291 +#: ../scripts/uscan.1:297 #, no-wrap msgid "B<1>" msgstr "B<1>" @@ -4475,7 +4475,7 @@ # type: TP #: ../scripts/debc.1:48 ../scripts/debchange.1:126 ../scripts/debclean.1:44 #: ../scripts/debi.1:49 ../scripts/debrelease.1:40 ../scripts/debuild.1:70 -#: ../scripts/uscan.1:297 +#: ../scripts/uscan.1:303 #, no-wrap msgid "B<2>" msgstr "B<2>" @@ -4483,14 +4483,14 @@ # type: Plain text #: ../scripts/debc.1:51 ../scripts/debchange.1:129 ../scripts/debclean.1:47 #: ../scripts/debi.1:52 ../scripts/debrelease.1:43 ../scripts/debuild.1:73 -#: ../scripts/uscan.1:300 +#: ../scripts/uscan.1:306 msgid "Always check the directory name." msgstr "Vérifie toujours le nom du répertoire." # type: Plain text #: ../scripts/debc.1:64 ../scripts/debchange.1:142 ../scripts/debclean.1:60 #: ../scripts/debi.1:65 ../scripts/debrelease.1:56 ../scripts/debuild.1:86 -#: ../scripts/uscan.1:313 +#: ../scripts/uscan.1:319 msgid "" "The directory name is checked by testing whether the current directory name " "(as determined by B(1)) matches the regex given by the configuration " @@ -4535,7 +4535,7 @@ # type: TP #: ../scripts/debc.1:77 ../scripts/debchange.1:318 ../scripts/debclean.1:69 #: ../scripts/debi.1:78 ../scripts/debrelease.1:87 ../scripts/debuild.1:274 -#: ../scripts/uscan.1:416 +#: ../scripts/uscan.1:422 #, no-wrap msgid "B<--check-dirname-level> I" msgstr "B<--check-dirname-level> I" @@ -4545,8 +4545,8 @@ #: ../scripts/debchange.1:326 ../scripts/debclean.1:73 #: ../scripts/debclean.1:77 ../scripts/debi.1:82 ../scripts/debi.1:86 #: ../scripts/debrelease.1:91 ../scripts/debrelease.1:95 -#: ../scripts/debuild.1:278 ../scripts/debuild.1:282 ../scripts/uscan.1:420 -#: ../scripts/uscan.1:424 +#: ../scripts/debuild.1:278 ../scripts/debuild.1:282 ../scripts/uscan.1:426 +#: ../scripts/uscan.1:430 msgid "" "See the above section \"Directory name checking\" for an explanation of this " "option." @@ -4557,7 +4557,7 @@ # type: TP #: ../scripts/debc.1:81 ../scripts/debchange.1:322 ../scripts/debclean.1:73 #: ../scripts/debi.1:82 ../scripts/debrelease.1:91 ../scripts/debuild.1:278 -#: ../scripts/uscan.1:420 +#: ../scripts/uscan.1:426 #, no-wrap msgid "B<--check-dirname-regex> I" msgstr "B<--check-dirname-regex> I" @@ -5057,7 +5057,7 @@ "description de modifications." # type: TP -#: ../scripts/debchange.1:193 ../scripts/uscan.1:382 +#: ../scripts/debchange.1:193 ../scripts/uscan.1:388 #, no-wrap msgid "B<--package> I" msgstr "B<--package> I" @@ -5156,11 +5156,11 @@ # type: Plain text #: ../scripts/debchange.1:223 msgid "" -"Increment the Debian release number for a upload to etch-backports, and add " -"a backport upload changelog comment." +"Increment the Debian release number for an upload to lenny-backports, and " +"add a backport upload changelog comment." msgstr "" "Incrémente le numéro de publication de Debian pour un envoi d'un " -"rétroportage pour Etch, et ajoute un commentaire pour l'envoi du " +"rétroportage pour Lenny, et ajoute un commentaire pour l'envoi du " "rétroportage dans le changelog." # type: TP @@ -11705,7 +11705,7 @@ "plus important." # type: TP -#: ../scripts/plotchangelog.1:78 ../scripts/uscan.1:407 +#: ../scripts/plotchangelog.1:78 ../scripts/uscan.1:413 #, no-wrap msgid "B<--verbose>" msgstr "B<--verbose>" @@ -12851,7 +12851,7 @@ "paquets à vérifier." # type: SH -#: ../scripts/transition-check.pl:54 ../scripts/uscan.1:478 +#: ../scripts/transition-check.pl:54 ../scripts/uscan.1:484 #: ../scripts/wnpp-check.1:25 #, no-wrap msgid "EXIT STATUS" @@ -12867,7 +12867,7 @@ "transition." # type: TP -#: ../scripts/transition-check.pl:61 ../scripts/uscan.1:482 +#: ../scripts/transition-check.pl:61 ../scripts/uscan.1:488 #: ../scripts/wnpp-check.1:26 #, no-wrap msgid "0" @@ -13469,12 +13469,14 @@ msgstr "BI" # type: Plain text -#: ../scripts/uscan.1:237 +#: ../scripts/uscan.1:238 +#, fuzzy msgid "" "This is used to mangle the upstream version number as matched by the " "ftp://... or http:// rules as follows. First, the I string is split " "into multiple rules at every `;'. Then the upstream version number is " -"mangled by executing the Perl command:" +"mangled by applying I to the version, in a similar way to executing " +"the Perl command:" msgstr "" "Ceci permet de modifier le numéro de version amont qui correspond à une " "règle ftp://... ou http://... de la façon suivante. Dans un premier temps, " @@ -13483,13 +13485,13 @@ "commande Perl suivante :" # type: Plain text -#: ../scripts/uscan.1:239 +#: ../scripts/uscan.1:240 #, no-wrap msgid " $version =~ I;\n" msgstr " $version =~ I;\n" # type: Plain text -#: ../scripts/uscan.1:244 +#: ../scripts/uscan.1:245 msgid "" "for each rule. Thus, suitable rules might be `s/^/0./' to prepend `0.' to " "the version number and `s/_/./' to change underscores into periods. Note " @@ -13501,14 +13503,23 @@ "Notez que la chaîne de caractères I ne doit pas contenir de virgule ; " "ceci ne devrait pas être un problème." +# type: Plain text +#: ../scripts/uscan.1:250 +msgid "" +"I may only use the 's', 'tr' and 'y' operations. When the 's' " +"operation is used, only the 'g', 'i' and 'x' flags are available and I " +"may not contain any expressions which have the potential to execute code (i." +"e. the (?{}) and (??{}) constructs are not supported)." +msgstr "" + # type: TP -#: ../scripts/uscan.1:244 +#: ../scripts/uscan.1:250 #, no-wrap msgid "BI" msgstr "BI" # type: Plain text -#: ../scripts/uscan.1:252 +#: ../scripts/uscan.1:258 msgid "" "This is used to mangle the Debian version number of the currently installed " "package in the same way as the B option. Thus, a suitable " @@ -13524,13 +13535,13 @@ "doit pas contenir de virgule ; ceci ne devrait pas être un problème." # type: TP -#: ../scripts/uscan.1:252 +#: ../scripts/uscan.1:258 #, no-wrap msgid "BI" msgstr "BI" # type: Plain text -#: ../scripts/uscan.1:257 +#: ../scripts/uscan.1:263 msgid "" "This is a syntactic shorthand for BIB<," "dversionmangle=>IB<, applying the same rules to both the upstream and " @@ -13541,13 +13552,13 @@ "numéros de version Debian et amont." # type: TP -#: ../scripts/uscan.1:257 +#: ../scripts/uscan.1:263 #, no-wrap msgid "BI" msgstr "BI" # type: Plain text -#: ../scripts/uscan.1:263 +#: ../scripts/uscan.1:269 msgid "" "This is used to mangle the filename with which the downloaded file will be " "saved, and is parsed in the same way as the B option. " @@ -13559,13 +13570,13 @@ "section ci-dessus." # type: TP -#: ../scripts/uscan.1:263 +#: ../scripts/uscan.1:269 #, no-wrap msgid "BI" msgstr "BI" # type: Plain text -#: ../scripts/uscan.1:271 +#: ../scripts/uscan.1:277 msgid "" "This is used to mangle the URL to be used for the download. The URL is " "first computed based on the homepage downloaded and the pattern matched, " @@ -13582,7 +13593,7 @@ # NOTE: "and in order to promote efficiency" ? # type: Plain text -#: ../scripts/uscan.1:286 +#: ../scripts/uscan.1:292 msgid "" "Similarly to several other scripts in the B package, B " "explores the requested directory trees looking for I and " @@ -13611,7 +13622,7 @@ "dirname-regex>." # type: Plain text -#: ../scripts/uscan.1:297 +#: ../scripts/uscan.1:303 msgid "" "Only check the directory name if we have had to change directory in our " "search for I, that is, the directory containing I or B automatically, as the " "maintainer should perform sanity checks on the software before uploading it " @@ -13659,13 +13670,13 @@ "de l'envoyer à l'archive Debian." # type: TP -#: ../scripts/uscan.1:329 +#: ../scripts/uscan.1:335 #, no-wrap msgid "B<--report, --no-download>" msgstr "B<--report>, B<--no-download>" # type: Plain text -#: ../scripts/uscan.1:332 +#: ../scripts/uscan.1:338 msgid "" "Only report about available newer versions but do not download anything." msgstr "" @@ -13673,13 +13684,13 @@ "télécharge rien." # type: TP -#: ../scripts/uscan.1:332 +#: ../scripts/uscan.1:338 #, no-wrap msgid "B<--report-status>" msgstr "B<--report-status>" # type: Plain text -#: ../scripts/uscan.1:336 +#: ../scripts/uscan.1:342 msgid "" "Report on the status of all packages, even those which are up-to-date, but " "do not download anything." @@ -13688,36 +13699,36 @@ "télécharge rien du tout." # type: TP -#: ../scripts/uscan.1:336 +#: ../scripts/uscan.1:342 #, no-wrap msgid "B<--download>" msgstr "B<--download>" # type: Plain text -#: ../scripts/uscan.1:339 +#: ../scripts/uscan.1:345 msgid "Report and download. (This is the default behaviour.)" msgstr "" "Fournit un rapport puis télécharge. (C'est le comportement par défaut.)" # type: TP -#: ../scripts/uscan.1:339 +#: ../scripts/uscan.1:345 #, no-wrap msgid "B<--destdir>" msgstr "B<--destdir>" # type: Plain text -#: ../scripts/uscan.1:342 +#: ../scripts/uscan.1:348 msgid "Path of directory to which to download." msgstr "Chemin du répertoire dans lequel placer les fichiers téléchargés." # type: TP -#: ../scripts/uscan.1:342 +#: ../scripts/uscan.1:348 #, no-wrap msgid "B<--force-download>" msgstr "B<--force-download>" # type: Plain text -#: ../scripts/uscan.1:345 +#: ../scripts/uscan.1:351 msgid "" "Download upstream even if up to date (will not overwrite local files, " "however)" @@ -13726,46 +13737,46 @@ "fichiers locaux ne sont pas écrasés)." # type: TP -#: ../scripts/uscan.1:345 +#: ../scripts/uscan.1:351 #, no-wrap msgid "B<--pasv>" msgstr "B<--pasv>" # type: Plain text -#: ../scripts/uscan.1:348 +#: ../scripts/uscan.1:354 msgid "Force PASV mode for FTP connections." msgstr "Force le mode passif (« PASV ») pour les connexions FTP." # type: TP -#: ../scripts/uscan.1:348 +#: ../scripts/uscan.1:354 #, no-wrap msgid "B<--no-pasv>" msgstr "B<--no-pasv>" # type: Plain text -#: ../scripts/uscan.1:351 +#: ../scripts/uscan.1:357 msgid "Do not use PASV mode for FTP connections." msgstr "N'utilise pas le mode passif pour les connexions FTP." # type: TP -#: ../scripts/uscan.1:351 +#: ../scripts/uscan.1:357 #, no-wrap msgid "B<--timeout> I" msgstr "B<--timeout> I" # type: Plain text -#: ../scripts/uscan.1:354 +#: ../scripts/uscan.1:360 msgid "Set timeout to N seconds (default 20 seconds)." msgstr "Défini le temps d'attente à N secondes (20 secondes par défaut)." # type: TP -#: ../scripts/uscan.1:354 +#: ../scripts/uscan.1:360 #, no-wrap msgid "B<--symlink>" msgstr "B<--symlink>" # type: Plain text -#: ../scripts/uscan.1:360 +#: ../scripts/uscan.1:366 msgid "" "Make orig.tar.gz symlinks to any downloaded files if their extensions are I<." "tar.gz> or I<.tgz>, and similarly for to orig.tar.bz2 for the suffixes I<." @@ -13777,13 +13788,13 @@ "par défaut.)" # type: TP -#: ../scripts/uscan.1:360 +#: ../scripts/uscan.1:366 #, no-wrap msgid "B<--rename>" msgstr "B<--rename>" # type: Plain text -#: ../scripts/uscan.1:365 +#: ../scripts/uscan.1:371 msgid "" "Instead of symlinking, rename the downloaded files to their Debian orig.tar." "gz names if their extensions are I<.tar.gz> or I<.tgz>, and similarly for " @@ -13794,13 +13805,13 @@ "tgz> et de manière semblable pour les fichiers d'extension tar.bz2." # type: TP -#: ../scripts/uscan.1:365 +#: ../scripts/uscan.1:371 #, no-wrap msgid "B<--repack>" msgstr "B<--repack>" # type: Plain text -#: ../scripts/uscan.1:373 +#: ../scripts/uscan.1:379 msgid "" "After having downloaded a bzip tar or zip archive, repack it to a gzip tar " "archive, which is still currently required as a member of a Debian source " @@ -13818,35 +13829,35 @@ "archives .zip." # type: TP -#: ../scripts/uscan.1:373 ../scripts/uupdate.1:72 +#: ../scripts/uscan.1:379 ../scripts/uupdate.1:72 #, no-wrap msgid "B<--no-symlink>" msgstr "B<--no-symlink>" # type: Plain text -#: ../scripts/uscan.1:376 +#: ../scripts/uscan.1:382 msgid "Don't make these symlinks and don't rename the files." msgstr "Ne crée pas ces liens symboliques et ne renomme pas les fichiers." # type: TP -#: ../scripts/uscan.1:376 +#: ../scripts/uscan.1:382 #, no-wrap msgid "B<--dehs>" msgstr "B<--dehs>" # type: Plain text -#: ../scripts/uscan.1:379 +#: ../scripts/uscan.1:385 msgid "Use an XML format for output, as required by the DEHS system." msgstr "Utilise le format XML pour la sortie, requis par le système DEHS." # type: TP -#: ../scripts/uscan.1:379 +#: ../scripts/uscan.1:385 #, no-wrap msgid "B<--no-dehs>" msgstr "B<--no-dehs>" # type: Plain text -#: ../scripts/uscan.1:382 +#: ../scripts/uscan.1:388 msgid "" "Use the traditional uscan output format. (This is the default behaviour.)" msgstr "" @@ -13854,7 +13865,7 @@ "par défaut.)" # type: Plain text -#: ../scripts/uscan.1:391 +#: ../scripts/uscan.1:397 msgid "" "Specify the name of the package to check for rather than examining I; this requires the B<--upstream-version> (unless a version is " @@ -13871,13 +13882,13 @@ "dehs>)." # type: TP -#: ../scripts/uscan.1:391 +#: ../scripts/uscan.1:397 #, no-wrap msgid "B<--upstream-version> I" msgstr "B<--upstream-version> I" # type: Plain text -#: ../scripts/uscan.1:396 +#: ../scripts/uscan.1:402 msgid "" "Specify the current upstream version rather than examine the watchfile or " "changelog to determine it. This is ignored if a directory scan is being " @@ -13889,13 +13900,13 @@ "watchfile est trouvé." # type: TP -#: ../scripts/uscan.1:396 +#: ../scripts/uscan.1:402 #, no-wrap msgid "B<--watchfile> I" msgstr "B<--watchfile> I" # type: Plain text -#: ../scripts/uscan.1:403 +#: ../scripts/uscan.1:409 msgid "" "Specify the watchfile rather than perform a directory scan to determine it. " "If this option is used without B<--package>, then B must be called " @@ -13909,13 +13920,13 @@ "l'arborescence)." # type: TP -#: ../scripts/uscan.1:403 +#: ../scripts/uscan.1:409 #, no-wrap msgid "B<--download-version> I" msgstr "B<--download-version> I" # type: Plain text -#: ../scripts/uscan.1:407 +#: ../scripts/uscan.1:413 msgid "" "Specify the version which the upstream release must match in order to be " "considered, rather than using the release with the highest version." @@ -13924,53 +13935,53 @@ "numéro de version le plus important." # type: Plain text -#: ../scripts/uscan.1:410 +#: ../scripts/uscan.1:416 msgid "Give verbose output." msgstr "Donne une sortie bavarde." # type: TP -#: ../scripts/uscan.1:410 +#: ../scripts/uscan.1:416 #, no-wrap msgid "B<--no-verbose>" msgstr "B<--no-verbose>" # type: Plain text -#: ../scripts/uscan.1:413 +#: ../scripts/uscan.1:419 msgid "Don't give verbose output. (This is the default behaviour.)" msgstr "Ne donne pas de sortie bavarde. (C'est le comportement par défaut.)" # type: TP -#: ../scripts/uscan.1:413 +#: ../scripts/uscan.1:419 #, no-wrap msgid "B<--debug>" msgstr "B<--debug>" # type: Plain text -#: ../scripts/uscan.1:416 +#: ../scripts/uscan.1:422 msgid "Dump the downloaded web pages to stdout for debugging your watch file." msgstr "" "Affiche les pages web téléchargées sur la sortie standard afin de déboguer " "votre fichier « watch »." # type: TP -#: ../scripts/uscan.1:424 +#: ../scripts/uscan.1:430 #, no-wrap msgid "B<--user-agent>, B<--useragent>" msgstr "B<--user-agent>, B<--useragent>" # type: Plain text -#: ../scripts/uscan.1:427 +#: ../scripts/uscan.1:433 msgid "Override the default user agent header." msgstr "Utiliser un champ « user agent » différent de celui par défaut." # type: Plain text -#: ../scripts/uscan.1:434 +#: ../scripts/uscan.1:440 msgid "Give brief usage information." msgstr "Affiche un bref message d'aide." # NOTE: presque identique à un autre ? # type: Plain text -#: ../scripts/uscan.1:444 +#: ../scripts/uscan.1:450 msgid "" "The two configuration files I and I<~/.devscripts> are " "sourced by a shell in that order to set configuration variables. These may " @@ -13989,13 +14000,13 @@ "actuellement identifiées sont :" # type: TP -#: ../scripts/uscan.1:444 +#: ../scripts/uscan.1:450 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../scripts/uscan.1:449 +#: ../scripts/uscan.1:455 msgid "" "If this is set to I, then newer upstream files will not be downloaded; " "this is equivalent to the B<--report> or B<--no-download> options." @@ -14005,13 +14016,13 @@ "download>." # type: TP -#: ../scripts/uscan.1:449 +#: ../scripts/uscan.1:455 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../scripts/uscan.1:455 +#: ../scripts/uscan.1:461 msgid "" "If this is set to I or I, this will force FTP connections to use " "PASV mode or not to, respectively. If this is set to I, then Net::" @@ -14024,13 +14035,13 @@ "principalement sur la variable d'environnement FTP_PASSIVE)." # type: TP -#: ../scripts/uscan.1:455 +#: ../scripts/uscan.1:461 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../scripts/uscan.1:462 +#: ../scripts/uscan.1:468 msgid "" "If this is set to I, then a pkg_version.orig.tar.{gz|bz2} symlink will " "not be made (equivalent to the B<--no-symlink> option). If it is set to " @@ -14044,13 +14055,13 @@ "rename>)." # type: TP -#: ../scripts/uscan.1:462 +#: ../scripts/uscan.1:468 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../scripts/uscan.1:466 +#: ../scripts/uscan.1:472 msgid "" "If this is set to I, then DEHS-style output will be used. This is " "equivalent to the B<--dehs> option." @@ -14059,13 +14070,13 @@ "l'option B<--dehs> était utilisée." # type: TP -#: ../scripts/uscan.1:466 +#: ../scripts/uscan.1:472 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../scripts/uscan.1:470 +#: ../scripts/uscan.1:476 msgid "" "If this is set to I, then verbose output will be given. This is " "equivalent to the B<--verbose> option." @@ -14074,13 +14085,13 @@ "l'option B<--verbose> était utilisée." # type: TP -#: ../scripts/uscan.1:470 +#: ../scripts/uscan.1:476 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../scripts/uscan.1:474 +#: ../scripts/uscan.1:480 msgid "" "If set, the specified user agent string will be used in place of the " "default. This is equivalent to the B<--user-agent> option." @@ -14090,13 +14101,13 @@ "équivalent à l'option B<--user-agent>." # type: TP -#: ../scripts/uscan.1:474 +#: ../scripts/uscan.1:480 #, no-wrap msgid "B" msgstr "B" # type: Plain text -#: ../scripts/uscan.1:478 +#: ../scripts/uscan.1:484 msgid "" "If set, the downloaded files will be placed in this directory. This is " "equivalent to the B<--destdir> option." @@ -14105,7 +14116,7 @@ "seront placés. C'est équivalent à l'option B<--destdir>." # type: Plain text -#: ../scripts/uscan.1:482 +#: ../scripts/uscan.1:488 msgid "" "The exit status gives some indication of whether a newer version was found " "or not; one is advised to read the output to determine exactly what happened " @@ -14116,7 +14127,7 @@ "et pour voir s'il n'y a pas eu d'avertissement." # type: Plain text -#: ../scripts/uscan.1:486 +#: ../scripts/uscan.1:492 msgid "" "Either B<--help> or B<--version> was used, or for some watchfile which was " "examined, a newer upstream version was located." @@ -14125,7 +14136,7 @@ "nouvelle version amont a été trouvée pour un des fichiers « watch » examinés." # type: Plain text -#: ../scripts/uscan.1:490 +#: ../scripts/uscan.1:496 msgid "" "No newer upstream versions were located for any of the watchfiles examined." msgstr "" @@ -14133,13 +14144,13 @@ "examinés." # type: SH -#: ../scripts/uscan.1:490 +#: ../scripts/uscan.1:496 #, no-wrap msgid "HISTORY AND UPGRADING" msgstr "HISTORIQUE ET MISE À NIVEAU" # type: Plain text -#: ../scripts/uscan.1:494 +#: ../scripts/uscan.1:500 msgid "" "This section briefly describes the backwards-incompatible watchfile features " "which have been added in each watchfile version, and the first version of " @@ -14151,13 +14162,13 @@ "comprenait." # type: TP -#: ../scripts/uscan.1:494 +#: ../scripts/uscan.1:500 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../scripts/uscan.1:499 +#: ../scripts/uscan.1:505 msgid "" "The watchfile syntax was significantly different in those days. Don't use " "it. If you are upgrading from a pre-version 2 watchfile, you are advised to " @@ -14169,13 +14180,13 @@ "recommencer à zéro." # type: TP -#: ../scripts/uscan.1:499 +#: ../scripts/uscan.1:505 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../scripts/uscan.1:503 +#: ../scripts/uscan.1:509 msgid "" "devscripts version 2.6.90: The first incarnation of the current style of " "watchfiles." @@ -14184,13 +14195,13 @@ "watchfile." # type: TP -#: ../scripts/uscan.1:503 +#: ../scripts/uscan.1:509 #, no-wrap msgid "I" msgstr "I" # type: Plain text -#: ../scripts/uscan.1:509 +#: ../scripts/uscan.1:515 msgid "" "devscripts version 2.8.12: Introduced the following: correct handling of " "regex special characters in the path part, directory/path pattern matching, " @@ -14204,7 +14215,7 @@ "modification des liens." # type: Plain text -#: ../scripts/uscan.1:515 +#: ../scripts/uscan.1:521 msgid "" "If you are upgrading from version 2, the key incompatibility is if you have " "multiple groups in the pattern part; whereas only the first one would be " @@ -14220,12 +14231,12 @@ "groupe ordinaire (...)." # type: Plain text -#: ../scripts/uscan.1:521 +#: ../scripts/uscan.1:527 msgid "B(1), B(1), B(1) and B(5)." msgstr "B(1), B(1), B(1) et B(5)." # type: Plain text -#: ../scripts/uscan.1:526 +#: ../scripts/uscan.1:532 msgid "" "The original version of B was written by Christoph Lameter " "Eclameter@debian.orgE. Significant improvements, changes and " diff -Nru devscripts-2.10.35lenny3/scripts/bts.pl devscripts-2.10.35lenny6/scripts/bts.pl --- devscripts-2.10.35lenny3/scripts/bts.pl 2008-06-29 12:36:17.000000000 +0000 +++ devscripts-2.10.35lenny6/scripts/bts.pl 2009-03-06 18:23:17.000000000 +0000 @@ -120,7 +120,7 @@ "pending", "sarge", "sarge-ignore", "experimental", "d-i", "confirmed", "ipv6", "lfs", "fixed-in-experimental", "fixed-upstream", "l10n", "etch", "etch-ignore", - "lenny", "lenny-ignore", + "lenny", "lenny-ignore", "squeeze", "squeeze-ignore", ); *valid_tags = \@gTags; diff -Nru devscripts-2.10.35lenny3/scripts/debchange.1 devscripts-2.10.35lenny6/scripts/debchange.1 --- devscripts-2.10.35lenny3/scripts/debchange.1 2008-07-09 22:39:48.000000000 +0000 +++ devscripts-2.10.35lenny6/scripts/debchange.1 2009-03-06 18:33:32.000000000 +0000 @@ -218,7 +218,7 @@ upload, and add a Security Team upload changelog comment. .TP .B \-\-bpo -Increment the Debian release number for a upload to etch-backports, +Increment the Debian release number for an upload to lenny-backports, and add a backport upload changelog comment. .TP .B \-\-local ", " \-l \fIsuffix\fR diff -Nru devscripts-2.10.35lenny3/scripts/debchange.pl devscripts-2.10.35lenny6/scripts/debchange.pl --- devscripts-2.10.35lenny3/scripts/debchange.pl 2009-02-11 07:48:12.000000000 +0000 +++ devscripts-2.10.35lenny6/scripts/debchange.pl 2009-03-06 19:40:15.000000000 +0000 @@ -110,7 +110,7 @@ Increment the Debian release number for a Debian Security Team upload --bpo Increment the Debian release number for a Backports.org upload - to "etch-backports" + to "lenny-backports" -l, --local Add a suffix to the Debian version number for a local build -b, --force-bad-version @@ -484,6 +484,8 @@ my $EMAIL = 'EMAIL'; my $DISTRIBUTION = 'UNRELEASED'; my $bpo_dist = ''; +my %bpo_dists = ( '40', 'etch', '50', 'lenny' ); +my $latest_bpo_dist = '50'; my $CHANGES = ''; if (! $opt_create || ($opt_create && $opt_news)) { @@ -985,10 +987,10 @@ $debian_revision++; $start = "$upstream_version-$debian_revision"; $end = ""; - } elsif ($opt_bpo and not $start =~ /~bpo\.$/) { + } elsif ($opt_bpo and not $start =~ /~bpo[0-9]+\+$/) { # If it's not already a backport make it so # otherwise we can be safe if we behave like dch -i - $end .= "~bpo40+1"; + $end .= "~bpo$latest_bpo_dist+1"; } elsif ($opt_l and not $start =~ /\Q$opt_l\E/) { # If it's not already a local package make it so # otherwise we can be safe if we behave like dch -i @@ -997,7 +999,22 @@ # Don't bump the version of a NEWS file in this case as we're # using the version from the changelog $end++; + + # Attempt to set the distribution for a backport correctly + # based on the version of the previous backport + if ($opt_bpo) { + my $previous_dist = $start; + $previous_dist =~ s/^.*~bpo([0-9]+)\+$/$1/; + if (defined $previous_dist and defined + $bpo_dists{$previous_dist}) { + $bpo_dist = $bpo_dists{$previous_dist} . '-backports'; + } else { + # Fallback to using the previous distribution + $bpo_dist = $changelog{'Distribution'}; + } + } } + $NEW_VERSION = "$start$end"; ($NEW_SVERSION=$NEW_VERSION) =~ s/^\d+://; ($NEW_UVERSION=$NEW_SVERSION) =~ s/-[^-]*$//; @@ -1014,7 +1031,7 @@ } if ($opt_bpo) { - $bpo_dist='etch-backports'; + $bpo_dist ||= $bpo_dists{$latest_bpo_dist} . '-backports'; } my $distribution = $opt_D || $bpo_dist || (($opt_release_heuristic eq 'changelog') ? "UNRELEASED" : $DISTRIBUTION); @@ -1042,7 +1059,7 @@ print O " * Non-maintainer upload by the Security Team.\n"; $line = 1; } elsif ($opt_bpo && ! $opt_news) { - print O " * Rebuild for etch-backports.\n"; + print O " * Rebuild for $bpo_dist.\n"; $line = 1; } if (@closes_text or $TEXT) { diff -Nru devscripts-2.10.35lenny3/scripts/rc-alert.pl devscripts-2.10.35lenny6/scripts/rc-alert.pl --- devscripts-2.10.35lenny3/scripts/rc-alert.pl 2008-06-24 20:12:37.000000000 +0000 +++ devscripts-2.10.35lenny6/scripts/rc-alert.pl 2009-03-06 18:23:36.000000000 +0000 @@ -43,7 +43,7 @@ '....(R)' => "unreproducible", '.....(S)' => "security", '......(U)' => "upstream", - '.......(I)' => "etch-ignore or lenny-ignore", + '.......(I)' => "lenny-ignore or squeeze-ignore", ); # A little hacky but allows us to sort the list by length my %distmap = ( '(O)' => "oldstable", diff -Nru devscripts-2.10.35lenny3/scripts/uscan.1 devscripts-2.10.35lenny6/scripts/uscan.1 --- devscripts-2.10.35lenny3/scripts/uscan.1 2008-06-28 17:13:09.000000000 +0000 +++ devscripts-2.10.35lenny6/scripts/uscan.1 2009-03-24 19:13:09.000000000 +0000 @@ -233,7 +233,8 @@ This is used to mangle the upstream version number as matched by the ftp://... or http:// rules as follows. First, the \fIrules\fR string is split into multiple rules at every `;'. Then the upstream version -number is mangled by executing the Perl command: +number is mangled by applying \fIrule\fR to the version, in a similar +way to executing the Perl command: .nf $version =~ \fIrule\fR; .fi @@ -241,6 +242,11 @@ `0.' to the version number and `s/_/./' to change underscores into periods. Note that the \fIrules\fR string may not contain commas; this should not be a problem. + +\fIrule\fR may only use the 's', 'tr' and 'y' operations. When the 's' +operation is used, only the 'g', 'i' and 'x' flags are available and +\fIrule\fR may not contain any expressions which have the potential to +execute code (i.e. the (?{}) and (??{}) constructs are not supported). .TP \fBdversionmangle=\fIrules\fR This is used to mangle the Debian version number of the currently diff -Nru devscripts-2.10.35lenny3/scripts/uscan.pl devscripts-2.10.35lenny6/scripts/uscan.pl --- devscripts-2.10.35lenny3/scripts/uscan.pl 2008-07-03 18:44:33.000000000 +0000 +++ devscripts-2.10.35lenny6/scripts/uscan.pl 2009-05-25 22:32:32.000000000 +0000 @@ -66,6 +66,8 @@ sub dehs_warn ($); sub dehs_die ($); sub dehs_output (); +sub quoted_regex_replace ($); +sub safe_replace ($$); sub usage { print <<"EOF"; @@ -899,7 +901,14 @@ join(".", map { $_ if defined($_) } $href =~ m&^$_pattern$&); foreach my $pat (@{$options{'uversionmangle'}}) { - eval "\$mangled_version =~ $pat;"; + if (! safe_replace(\$mangled_version, $pat)) { + warn "$progname: In $watchfile, potentially" + . " unsafe or malformed uversionmangle" + . " pattern:\n '$pat'" + . " found. Skipping watchline\n" + . " $line\n"; + return 1; + } } push @hrefs, [$mangled_version, $href]; } @@ -970,7 +979,14 @@ my $file = $1; my $mangled_version = join(".", $file =~ m/^$pattern$/); foreach my $pat (@{$options{'uversionmangle'}}) { - eval "\$mangled_version =~ $pat;"; + if (! safe_replace(\$mangled_version, $pat)) { + warn "$progname: In $watchfile, potentially" + . " unsafe or malformed uversionmangle" + . " pattern:\n '$pat'" + . " found. Skipping watchline\n" + . " $line\n"; + return 1; + } } push @files, [$mangled_version, $file]; } @@ -981,7 +997,14 @@ my $file = $1; my $mangled_version = join(".", $file =~ m/^$filepattern$/); foreach my $pat (@{$options{'uversionmangle'}}) { - eval "\$mangled_version =~ $pat;"; + if (! safe_replace(\$mangled_version, $pat)) { + warn "$progname: In $watchfile, potentially" + . " unsafe or malformed uversionmangle" + . " pattern:\n '$pat'" + . " found. Skipping watchline\n" + . " $line\n"; + return 1; + } } push @files, [$mangled_version, $file]; } @@ -1037,7 +1060,14 @@ $newfile_base=$newfile; } foreach my $pat (@{$options{'filenamemangle'}}) { - eval "\$newfile_base =~ $pat;"; + if (! safe_replace(\$newfile_base, $pat)) { + warn "$progname: In $watchfile, potentially" + . " unsafe or malformed filenamemangle" + . " pattern:\n '$pat'" + . " found. Skipping watchline\n" + . " $line\n"; + return 1; + } } # Remove HTTP header trash if ($site =~ m%^https?://%) { @@ -1058,7 +1088,14 @@ # And mangle it if requested my $mangled_lastversion = $lastversion; foreach my $pat (@{$options{'dversionmangle'}}) { - eval "\$mangled_lastversion =~ $pat;"; + if (! safe_replace(\$mangled_lastversion, $pat)) { + warn "$progname: In $watchfile, potentially" + . " unsafe or malformed dversionmangle" + . " pattern:\n '$pat'" + . " found. Skipping watchline\n" + . " $line\n"; + return 1; + } } # So what have we got to report now? @@ -1100,7 +1137,14 @@ $upstream_url =~ s/&/&/g; if (exists $options{'downloadurlmangle'}) { foreach my $pat (@{$options{'downloadurlmangle'}}) { - eval "\$upstream_url =~ $pat;"; + if (! safe_replace(\$upstream_url, $pat)) { + warn "$progname: In $watchfile, potentially" + . " unsafe or malformed downloadurlmangle" + . " pattern:\n '$pat'" + . " found. Skipping watchline\n" + . " $line\n"; + return 1; + } } } } @@ -1116,7 +1160,7 @@ # Can't just use $lastversion eq $newversion, as then 0.01 and 0.1 # compare different, whereas they are treated as equal by dpkg - if (system("dpkg --compare-versions '$mangled_lastversion' eq '$newversion'") == 0) { + if (system("dpkg", "--compare-versions", "'$mangled_lastversion'", "eq", "'$newversion'") == 0) { if ($verbose or ($download == 0 and $report and ! $dehs)) { print $pkg_report_header; $pkg_report_header = ''; @@ -1142,7 +1186,7 @@ # We use dpkg's rules to determine whether our current version # is newer or older than the remote version. - if (system("dpkg --compare-versions '$mangled_lastversion' gt '$newversion'") == 0) { + if (system("dpkg", "--compare-versions", "'$mangled_lastversion'", "gt", "'$newversion'") == 0) { if ($verbose) { print " => remote site does not even have current version\n"; } elsif ($dehs) { @@ -1352,6 +1396,7 @@ # Do whatever the user wishes to do if ($action) { my $usefile = "$destdir/$newfile_base"; + my @cmd = ($action); if ($symlink =~ /^(symlink|rename)$/ and $newfile_base =~ /\.(tar\.gz|tgz)$/) { $usefile = "$destdir/${pkg}_${newversion}.orig.tar.gz"; @@ -1364,6 +1409,7 @@ # Any symlink requests are already handled by uscan if ($action =~ /^uupdate(\s|$)/) { $action =~ s/^uupdate/uupdate --no-symlink/; + push @cmd, "--no-symlink"; } if ($watch_version > 1) { @@ -1373,7 +1419,7 @@ $msg .= `$action --upstream-version $newversion $usefile 2>&1`; dehs_msg($msg); } else { - system("$action --upstream-version $newversion $usefile"); + system(@cmd, "--upstream-version", "$newversion", "$usefile"); } } else { print "-- Executing user specified script $action $newfile_base $newversion" if $verbose; @@ -1382,7 +1428,7 @@ $msg .= `$action $usefile $newversion 2>&1`; dehs_msg($msg); } else { - system("$action $usefile $newversion"); + system(@cmd, "$usefile", "$newversion"); } } } @@ -1672,3 +1718,178 @@ # Don't repeat output %dehs_tags = (); } + +sub quoted_regex_parse($) { + my $pattern = shift; + my %closers = ('{', '}', '[', ']', '(', ')', '<', '>'); + + $pattern =~ /^(s|tr|y)(.)(.*)$/; + my ($sep, $rest) = ($2, $3 || ''); + my $closer = $closers{$sep}; + + my $parsed_ok = 1; + my $regexp = ''; + my $replacement = ''; + my $flags = ''; + my $open = 1; + my $last_was_escape = 0; + my $in_replacement = 0; + + for my $char (split //, $rest) { + if ($char eq $sep and ! $last_was_escape) { + $open++; + if ($open == 1) { + if ($in_replacement) { + # Separator after end of replacement + $parsed_ok = 0; + last; + } else { + $in_replacement = 1; + } + } else { + if ($open > 1) { + if ($in_replacement) { + $replacement .= $char; + } else { + $regexp .= $char; + } + } + } + } elsif ($char eq $closer and ! $last_was_escape) { + $open--; + if ($open) { + if ($in_replacement) { + $replacement .= $char; + } else { + $regexp .= $char; + } + } elsif ($open < 0) { + $parsed_ok = 0; + last; + } + } else { + if ($in_replacement) { + if ($open) { + $replacement .= $char; + } else { + $flags .= $char; + } + } else { + $regexp .= $char; + } + } + # Don't treat \\ as an escape + $last_was_escape = ($char eq '\\' and ! $last_was_escape); + } + + $parsed_ok = 0 unless $in_replacement and $open == 0; + + return ($parsed_ok, $regexp, $replacement, $flags); +} + +sub safe_replace($$) { + my ($in, $pat) = @_; + $pat =~ s/^\s*(.*)\s*$/$1/; + + $pat =~ /^(s|tr|y)(.)/; + my ($op, $sep) = ($1, $2 || ''); + my $esc = "\Q$sep\E"; + my ($parsed_ok, $regexp, $replacement, $flags); + + if ($sep eq '{' or $sep eq '(' or $sep eq '[' or $sep eq '<') { + ($parsed_ok, $regexp, $replacement, $flags) = quoted_regex_parse($pat); + + return 0 unless $parsed_ok; + } elsif ($pat !~ /^(?:s|tr|y)$esc((?:\\.|[^\\$esc])*)$esc((?:\\.|[^\\$esc])*)$esc([a-z]*)$/) { + return 0; + } else { + ($regexp, $replacement, $flags) = ($1, $2, $3); + } + + my $safeflags = $flags; + if ($op eq 'tr' or $op eq 'y') { + $safeflags =~ tr/cds//cd; + return 0 if $safeflags ne $flags; + + $regexp =~ s/\\(.)/$1/g; + $replacement =~ s/\\(.)/$1/g; + + $regexp =~ s/([^-])/'\\x' . unpack 'H*', $1/ge; + $replacement =~ s/([^-])/'\\x' . unpack 'H*', $1/ge; + + eval "\$\$in =~ tr<$regexp><$replacement>$flags;"; + + if ($@) { + return 0; + } else { + return 1; + } + } else { + $safeflags =~ tr/gix//cd; + return 0 if $safeflags ne $flags; + + my $global = ($flags =~ s/g//); + $flags = "(?$flags)" if length $flags; + + my (@captures, $first, $last); + + # Behave like Perl and treat e.g. "\." in replacement as "." + # We allow the case escape characters to remain and + # process them later + $replacement =~ s/(^|[^\\])\\([^luLUE])/$1$2/g; + + # Unescape escaped separator characters + $replacement =~ s/\\\Q$sep\E/$sep/g; + # If bracketing quotes were used, also unescape the + # closing version + $replacement =~ s/\\\Q}\E/}/g if $sep eq '{'; + $replacement =~ s/\\\Q]\E/]/g if $sep eq '['; + $replacement =~ s/\\\Q)\E/)/g if $sep eq '('; + $replacement =~ s/\\\Q>\E/>/g if $sep eq '<'; + + # The replacement below will modify $replacement so keep + # a copy. We'll need to restore it to the current value if + # the global flag was set on the input pattern. + my $orig_replacement = $replacement; + + while (1) { + eval { + # handle errors due to unsafe constructs in $regexp + no re 'eval'; + + my $re = qr/$flags$regexp/; + + @captures = ($$in =~ $re); + ($first, $last) = ($-[0], $+[0]); + }; + return 0 if $@; + + # No match; leave the original string untouched but return + # success as there was nothing wrong with the pattern + return 1 if @captures == 0; + + # Replace $X + unshift @captures, substr $$in, $first, $last - $first; + $replacement =~ s/[\$\\](\d)/defined $captures[$1] ? $captures[$1] : ''/ge; + $replacement =~ s/\$\{(\d)\}/defined $captures[$1] ? $captures[$1] : ''/ge; + $replacement =~ s/\$&/$captures[0]/g; + + # Make \l etc escapes work + $replacement =~ s/\\l(.)/lc $1/e; + $replacement =~ s/\\L(.*?)(\\E|\z)/lc $1/e; + $replacement =~ s/\\u(.)/uc $1/e; + $replacement =~ s/\\U(.*?)(\\E|\z)/uc $1/e; + + # Actually do the replacement + substr $$in, $first, $last - $first, $replacement; + + if ($global) { + $replacement = $orig_replacement; + } else { + last; + } + } + + return 1; + } +}