package maint-guide tags 602454 + patch thanks On 05-Nov-2010, Ben Finney wrote: > Since an empty version string is of no use in a Debian package (it > may even be invalid), and since it is likely never the intention to > match an empty version string, I think the documents should > consistently give only examples that will not match an empty version > string.
The attached patch (made against the Subversion repository at r7728) modifies all the examples in the SGML, PO, and POT files to use only ‘(.+)’ for the version string part in the examples. -- \ “Be careless in your dress if you must, but keep a tidy soul.” | `\ —Mark Twain, _Following the Equator_ | _o__) | Ben Finney <b...@benfinney.id.au>
=== modified file 'maint-guide.de.sgml' --- maint-guide.de.sgml 2010-08-20 18:59:29 +0000 +++ maint-guide.de.sgml 2010-11-04 01:12:01 +0000 @@ -1591,7 +1591,7 @@ <p><example> # watch control file for uscan # Site Directory Pattern Version Script -ftp.obsession.se /gentoo gentoo-(.*)\.tar\.gz debian uupdate +ftp.obsession.se /gentoo gentoo-(.+)\.tar\.gz debian uupdate </example> <p>Hinweis: Wechseln Sie, wenn Sie die Datei einmal erstellt haben, mit === modified file 'maint-guide.en.sgml' --- maint-guide.en.sgml 2010-09-27 14:39:42 +0000 +++ maint-guide.en.sgml 2010-11-04 01:12:01 +0000 @@ -2424,14 +2424,14 @@ <example> # watch control file for uscan version=3 -http://sf.net/gentoo/gentoo-(.*)\.tar\.gz debian uupdate +http://sf.net/gentoo/gentoo-(.+)\.tar\.gz debian uupdate </example> <p>Normally with this <file>watch</file> file, the URL at "<tt>http://sf.net/gentoo</tt>" is downloaded and searched for links of the form "<tt><a href=...></tt>". The base name (just the part after the final "<tt>/</tt>") of these linked URLs are matched against Perl regexp (see - <manref name="perlre" section="1">) pattern "<tt>gentoo-(.*)\.tar\.gz</tt>". + <manref name="perlre" section="1">) pattern "<tt>gentoo-(.+)\.tar\.gz</tt>". Out of matched files, the file with the greatest version number is downloaded and the <prgn>uupdate</prgn> program is run to create the updated source tree from them. === modified file 'maint-guide.es.sgml' --- maint-guide.es.sgml 2010-08-20 18:59:29 +0000 +++ maint-guide.es.sgml 2010-11-04 01:12:01 +0000 @@ -1605,7 +1605,7 @@ <p><example> # watch control file for uscan # Site Directory Pattern Version Script -ftp.obsession.se /gentoo gentoo-(.*)\.tar\.gz debian uupdate +ftp.obsession.se /gentoo gentoo-(.+)\.tar\.gz debian uupdate </example> <p>Pista: conéctate a Internet, e intenta ejecutar el programa === modified file 'maint-guide.fr.po' --- maint-guide.fr.po 2010-09-27 14:39:42 +0000 +++ maint-guide.fr.po 2010-11-04 01:12:01 +0000 @@ -6466,11 +6466,11 @@ msgid "" "# watch control file for uscan\n" "version=3\n" -"http://sf.net/gentoo/gentoo-(.*)\\.tar\\.gz debian uupdate" +"http://sf.net/gentoo/gentoo-(.+)\\.tar\\.gz debian uupdate" msgstr "" "# watch control file for uscan\n" "version=3\n" -"http://sf.net/gentoo/gentoo-(.*)\\.tar\\.gz debian uupdate" +"http://sf.net/gentoo/gentoo-(.+)\\.tar\\.gz debian uupdate" #. type: <p></p> #: maint-guide.en.sgml:2438 @@ -6479,7 +6479,7 @@ "gentoo</tt>\" is downloaded and searched for links of the form \"<tt><a " "href=...></tt>\". The base name (just the part after the final \"<tt>/</" "tt>\") of these linked URLs are matched against Perl regexp (see <manref " -"section=\"1\" name=\"perlre\">) pattern \"<tt>gentoo-(.*)\\.tar\\.gz</tt>\". " +"section=\"1\" name=\"perlre\">) pattern \"<tt>gentoo-(.+)\\.tar\\.gz</tt>\". " "Out of matched files, the file with the greatest version number is " "downloaded and the <prgn>uupdate</prgn> program is run to create the updated " "source tree from them." @@ -6487,7 +6487,7 @@ "Normalement, avec ce fichier <file>watch</file>, la page servie à l'URL " "« <tt>http://sf.net/gentoo</tt> » est téléchargée pour chercher des liens " "sous la forme « <tt><a href=...></tt> ». Ces liens sont comparés au " -"nom de base (juste après la dernière « <tt>/</tt> ») « <tt>gentoo-(.*)\\.tar" +"nom de base (juste après la dernière « <tt>/</tt> ») « <tt>gentoo-(.+)\\.tar" "\\.gz</tt> » comme motif d'expression rationnelle Perl (cf. <manref section=" "\"1\" name=\"perlre\">). Parmi les fichiers concordants, celui avec le plus " "grand numéro de version est téléchargé puis le programme <prgn>uupdate</" === modified file 'maint-guide.it.po' --- maint-guide.it.po 2010-09-27 14:39:42 +0000 +++ maint-guide.it.po 2010-11-04 01:12:01 +0000 @@ -6602,11 +6602,11 @@ msgid "" "# watch control file for uscan\n" "version=3\n" -"http://sf.net/gentoo/gentoo-(.*)\\.tar\\.gz debian uupdate" +"http://sf.net/gentoo/gentoo-(.+)\\.tar\\.gz debian uupdate" msgstr "" "# watch control file for uscan\n" "version=3\n" -"http://sf.net/gentoo/gentoo-(.*)\\.tar\\.gz debian uupdate" +"http://sf.net/gentoo/gentoo-(.+)\\.tar\\.gz debian uupdate" #. type: <p></p> #: maint-guide.en.sgml:2438 @@ -6615,7 +6615,7 @@ "gentoo</tt>\" is downloaded and searched for links of the form \"<tt><a " "href=...></tt>\". The base name (just the part after the final \"<tt>/</" "tt>\") of these linked URLs are matched against Perl regexp (see <manref " -"section=\"1\" name=\"perlre\">) pattern \"<tt>gentoo-(.*)\\.tar\\.gz</tt>\". " +"section=\"1\" name=\"perlre\">) pattern \"<tt>gentoo-(.+)\\.tar\\.gz</tt>\". " "Out of matched files, the file with the greatest version number is " "downloaded and the <prgn>uupdate</prgn> program is run to create the updated " "source tree from them." @@ -6625,7 +6625,7 @@ "del tipo \"<tt><a href=...></tt>\". Il nome base (la parte appena dopo " "l'ultimo \"<tt>/</tt>\") di questi URL sono confrontati con l'espressione " "regolare Perl (si veda <manref section=\"1\" name=\"perlre\">) " -"\"<tt>gentoo-(.*)\\.tar\\.gz</tt>\". Tra i file che combaciano viene scaricato " +"\"<tt>gentoo-(.+)\\.tar\\.gz</tt>\". Tra i file che combaciano viene scaricato " "quello avente il numero di versione più grande e viene avviato il programma " "<prgn>uupdate</prgn> per creare un albero dei sorgenti aggiornato." === modified file 'maint-guide.ja.sgml' --- maint-guide.ja.sgml 2010-09-21 14:15:11 +0000 +++ maint-guide.ja.sgml 2010-11-04 01:12:01 +0000 @@ -1814,7 +1814,7 @@ <p><example> # watch control file for uscan # Site Directory Pattern Version Script -ftp.obsession.se /gentoo gentoo-(.*)\.tar\.gz debian uupdate +ftp.obsession.se /gentoo gentoo-(.+)\.tar\.gz debian uupdate </example> <p>ヒント:このファイルを作成したら、インターネットに接続し、ソースを === modified file 'maint-guide.ko.sgml' --- maint-guide.ko.sgml 2010-11-02 12:01:27 +0000 +++ maint-guide.ko.sgml 2010-11-04 01:12:01 +0000 @@ -1190,7 +1190,7 @@ <p><example> # watch control file for uscan # Site Directory Pattern Version Script -ftp.obsession.se /gentoo gentoo-(.*)\.tar\.gz debian uupdate +ftp.obsession.se /gentoo gentoo-(.+)\.tar\.gz debian uupdate </example> <p>힌트: 인터넷에 연결된 상태에서, 이 파일을 만든 다음 프로그램 === modified file 'maint-guide.pl.sgml' --- maint-guide.pl.sgml 2010-08-20 18:59:29 +0000 +++ maint-guide.pl.sgml 2010-11-04 01:12:02 +0000 @@ -1515,7 +1515,7 @@ <p><example> # watch control file for uscan # Site Directory Pattern Version Script -ftp.obsession.se /gentoo gentoo-(.*)\.tar\.gz debian uupdate +ftp.obsession.se /gentoo gentoo-(.+)\.tar\.gz debian uupdate </example> <p>Wskazówka: połącz się z internetem i spróbuj uruchomić program "uscan" === modified file 'maint-guide.pot' --- maint-guide.pot 2010-09-27 14:39:42 +0000 +++ maint-guide.pot 2010-11-04 01:12:01 +0000 @@ -4629,7 +4629,7 @@ msgid "" "# watch control file for uscan\n" "version=3\n" -"http://sf.net/gentoo/gentoo-(.*)\\.tar\\.gz debian uupdate" +"http://sf.net/gentoo/gentoo-(.+)\\.tar\\.gz debian uupdate" msgstr "" #. type: <p></p> @@ -4640,7 +4640,7 @@ "the form \"<tt><a href=...></tt>\". The base name (just the part after " "the final \"<tt>/</tt>\") of these linked URLs are matched against Perl " "regexp (see <manref section=\"1\" name=\"perlre\">) pattern " -"\"<tt>gentoo-(.*)\\.tar\\.gz</tt>\". Out of matched files, the file with the " +"\"<tt>gentoo-(.+)\\.tar\\.gz</tt>\". Out of matched files, the file with the " "greatest version number is downloaded and the <prgn>uupdate</prgn> program " "is run to create the updated source tree from them." msgstr "" === modified file 'maint-guide.pt-br.sgml' --- maint-guide.pt-br.sgml 2010-08-20 18:59:29 +0000 +++ maint-guide.pt-br.sgml 2010-11-04 01:12:01 +0000 @@ -837,7 +837,7 @@ <p><example> # Arquivo de controle de monitoramento para o uscan # Site Diretório Padrão Versão Script - ftp.obsession.se /gentoo gentoo-(.*)\.tar\.gz debian uupdate + ftp.obsession.se /gentoo gentoo-(.+)\.tar\.gz debian uupdate </example> <p>Dica: conecte à internet, e tente rodar o 'uscan' no diretório do programa assim que você criar o arquivo. E leia os manuais! :) === modified file 'maint-guide.ru.sgml' --- maint-guide.ru.sgml 2010-08-20 18:59:29 +0000 +++ maint-guide.ru.sgml 2010-11-04 01:12:01 +0000 @@ -1122,7 +1122,7 @@ <example> # watch control file for uscan # Site Directory Pattern Version Script -ftp.obsession.se /gentoo gentoo-(.*)\.tar\.gz debian uupdate +ftp.obsession.se /gentoo gentoo-(.+)\.tar\.gz debian uupdate </example> <p>Совет: подсоединитесь к Интернету и попробуйте запустить программу <prgn>uscan</prgn>, находясь в === modified file 'maint-guide.zh-cn.po' --- maint-guide.zh-cn.po 2010-09-27 14:39:42 +0000 +++ maint-guide.zh-cn.po 2010-11-04 01:12:15 +0000 @@ -5943,11 +5943,11 @@ msgid "" "# watch control file for uscan\n" "version=3\n" -"http://sf.net/gentoo/gentoo-(.*)\\.tar\\.gz debian uupdate" +"http://sf.net/gentoo/gentoo-(.+)\\.tar\\.gz debian uupdate" msgstr "" "# watch control file for uscan\n" "version=3\n" -"http://sf.net/gentoo/gentoo-(.*)\\.tar\\.gz debian uupdate" +"http://sf.net/gentoo/gentoo-(.+)\\.tar\\.gz debian uupdate" #. type: <p></p> #: maint-guide.en.sgml:2438 @@ -5956,7 +5956,7 @@ "gentoo</tt>\" is downloaded and searched for links of the form \"<tt><a " "href=...></tt>\". The base name (just the part after the final \"<tt>/</" "tt>\") of these linked URLs are matched against Perl regexp (see <manref " -"section=\"1\" name=\"perlre\">) pattern \"<tt>gentoo-(.*)\\.tar\\.gz</tt>\". " +"section=\"1\" name=\"perlre\">) pattern \"<tt>gentoo-(.+)\\.tar\\.gz</tt>\". " "Out of matched files, the file with the greatest version number is " "downloaded and the <prgn>uupdate</prgn> program is run to create the updated " "source tree from them." @@ -5964,7 +5964,7 @@ "通常,在按照这个 <file>watch</file> 文件执行时,URL <tt>http://sf.net/" "gentoo</tt>\" 会被下载,程序在其中搜搜 <tt><a href=...></tt>。<tt>/</" "tt> 后的基本名称会按照 Perl 正则表达式匹配(参看 <manref section=\"1\" name=" -"\"perlre\">) <tt>gentoo-(.*)\\.tar\\.gz</tt>。在所有匹配的文件里,将会下载带" +"\"perlre\">) <tt>gentoo-(.+)\\.tar\\.gz</tt>。在所有匹配的文件里,将会下载带" "有最大版本号的,此后由 <prgn>uupdate</prgn> 程序创建更新的源代码树。" #. type: <p></p> === modified file 'maint-guide.zh-tw.po' --- maint-guide.zh-tw.po 2010-09-27 14:39:42 +0000 +++ maint-guide.zh-tw.po 2010-11-04 01:12:01 +0000 @@ -5936,11 +5936,11 @@ msgid "" "# watch control file for uscan\n" "version=3\n" -"http://sf.net/gentoo/gentoo-(.*)\\.tar\\.gz debian uupdate" +"http://sf.net/gentoo/gentoo-(.+)\\.tar\\.gz debian uupdate" msgstr "" "# watch control file for uscan\n" "version=3\n" -"http://sf.net/gentoo/gentoo-(.*)\\.tar\\.gz debian uupdate" +"http://sf.net/gentoo/gentoo-(.+)\\.tar\\.gz debian uupdate" #. type: <p></p> #: maint-guide.en.sgml:2438 @@ -5949,7 +5949,7 @@ "gentoo</tt>\" is downloaded and searched for links of the form \"<tt><a " "href=...></tt>\". The base name (just the part after the final \"<tt>/</" "tt>\") of these linked URLs are matched against Perl regexp (see <manref " -"section=\"1\" name=\"perlre\">) pattern \"<tt>gentoo-(.*)\\.tar\\.gz</tt>\". " +"section=\"1\" name=\"perlre\">) pattern \"<tt>gentoo-(.+)\\.tar\\.gz</tt>\". " "Out of matched files, the file with the greatest version number is " "downloaded and the <prgn>uupdate</prgn> program is run to create the updated " "source tree from them." @@ -5957,7 +5957,7 @@ "通常,在按照這個 <file>watch</file> 檔案執行時,URL <tt>http://sf.net/" "gentoo</tt>\" 會被下載,程式在其中搜搜 <tt><a href=...></tt>。<tt>/</" "tt> 後的基本名稱會按照 Perl 正則表達式匹配(參考 <manref section=\"1\" name=" -"\"perlre\">) <tt>gentoo-(.*)\\.tar\\.gz</tt>。在所有匹配的檔案裏,將會下載帶" +"\"perlre\">) <tt>gentoo-(.+)\\.tar\\.gz</tt>。在所有匹配的檔案裏,將會下載帶" "有最大版本號的,此後由 <prgn>uupdate</prgn> 程式創建更新的原始碼樹。" #. type: <p></p>
signature.asc
Description: Digital signature