Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package devscripts * Fix FTBFS (test failure) due to recent debhelper changes (#852918) * Add .buildinfo support to dscverify * Documentation/translation updates debdiff attached. unblock devscripts/2.17.1 -- System Information: Debian Release: 9.0 APT prefers unstable-debug APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1, 'experimental-debug'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
diffstat for devscripts-2.17.0 devscripts-2.17.1 debian/changelog | 27 +++++++++++ debian/tests/control | 2 po4a/po/de.po | 100 +++++++++++++++++++++++++++----------------- po4a/po/devscripts.pot | 77 +++++++++++++++++---------------- po4a/po/fr.po | 91 ++++++++++++++++++++++++---------------- scripts/dscverify.1 | 15 +++--- scripts/dscverify.pl | 10 ++-- scripts/uscan.pl | 2 test/test_package_lifecycle | 8 ++- 9 files changed, 205 insertions(+), 127 deletions(-) diff -Nru devscripts-2.17.0/debian/changelog devscripts-2.17.1/debian/changelog --- devscripts-2.17.0/debian/changelog 2017-01-10 23:21:45.000000000 -0500 +++ devscripts-2.17.1/debian/changelog 2017-02-01 21:25:00.000000000 -0500 @@ -1,3 +1,30 @@ +devscripts (2.17.1) unstable; urgency=medium + + [ Osamu Aoki ] + * uscan: + + PyPI packages location change. (Closes: #851590) + + [ Guillem Jover ] + * dscverify: + + Add support for .buildinfo files. (Closes: #852801) + + [ Mattia Rizzolo ] + * dscverify: + + Remove reference to the long gone debian-maintainers package. + * test_package_lifecycle: + + Import patch from Ubuntu to have the test pass on their builders too: + filter out output from pkg-create-dbgsym's dh_gencontrol wrapper, pass + --set-envvar=NO_PKG_MANGLE=1 to debuild, and pass -U to debchange. + * debian/tests/control: + + Depend on build-essential. + + [ James McCoy ] + * test_package_lifecycle: + + Ignore debhelper's new "create-stamp" output to fix the test failure. + (Closes: #852918) + + -- James McCoy <james...@debian.org> Wed, 01 Feb 2017 21:25:00 -0500 + devscripts (2.17.0) unstable; urgency=medium [ Sean Whitton ] diff -Nru devscripts-2.17.0/debian/tests/control devscripts-2.17.1/debian/tests/control --- devscripts-2.17.0/debian/tests/control 2017-01-10 23:21:45.000000000 -0500 +++ devscripts-2.17.1/debian/tests/control 2017-02-01 21:25:00.000000000 -0500 @@ -1,3 +1,3 @@ Tests: shunit2 -Depends: devscripts, libdistro-info-perl, zip, shunit2, gcc +Depends: devscripts, libdistro-info-perl, zip, shunit2, gcc, build-essential Restrictions: allow-stderr needs-recommends diff -Nru devscripts-2.17.0/po4a/po/de.po devscripts-2.17.1/po4a/po/de.po --- devscripts-2.17.0/po4a/po/de.po 2017-01-10 23:21:45.000000000 -0500 +++ devscripts-2.17.1/po4a/po/de.po 2017-02-01 21:25:00.000000000 -0500 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: devscripts 2.16.4\n" "Report-Msgid-Bugs-To: devscri...@packages.debian.org\n" -"POT-Creation-Date: 2017-01-11 04:24+0000\n" +"POT-Creation-Date: 2017-02-02 02:29+0000\n" "PO-Revision-Date: 2016-09-25 18:56+0200\n" "Last-Translator: Chris Leick <c.le...@vollbio.de>\n" "Language-Team: de <debian-l10n-ger...@lists.debian.org>\n" @@ -252,7 +252,7 @@ #: ../scripts/annotate-output.1:19 ../scripts/debchange.1:389 #: ../scripts/debclean.1:90 ../scripts/debrelease.1:102 #: ../scripts/debsign.1:103 ../scripts/dep3changelog.1:19 -#: ../scripts/dscverify.1:39 ../scripts/nmudiff.1:76 +#: ../scripts/dscverify.1:40 ../scripts/nmudiff.1:76 #: ../scripts/pts-subscribe.1:31 ../scripts/uupdate.1:104 #: ../scripts/who-uploads.1:47 msgid "Display a help message and exit successfully." @@ -344,7 +344,7 @@ #: ../scripts/debuild.1:445 ../scripts/dep3changelog.1:28 #: ../scripts/dget.pl:717 ../scripts/diff2patches.1:45 #: ../scripts/dpkg-depcheck.1:118 ../scripts/dpkg-genbuilddeps.1:30 -#: ../scripts/dscverify.1:75 ../scripts/git-deborig.pl:52 +#: ../scripts/dscverify.1:76 ../scripts/git-deborig.pl:52 #: ../scripts/grep-excuses.1:45 ../scripts/list-unreleased.1:19 #: ../scripts/mk-origtargz.pl:181 ../scripts/nmudiff.1:108 #: ../scripts/origtargz.pl:158 ../scripts/plotchangelog.1:124 @@ -395,7 +395,7 @@ #: ../scripts/desktop2menu.pl:52 ../scripts/dep3changelog.1:26 #: ../scripts/dget.pl:709 ../scripts/diff2patches.1:48 #: ../scripts/dpkg-genbuilddeps.1:36 ../scripts/dscextract.1:32 -#: ../scripts/dscverify.1:80 ../scripts/getbuildlog.1:41 +#: ../scripts/dscverify.1:81 ../scripts/getbuildlog.1:41 #: ../scripts/git-deborig.pl:56 ../scripts/grep-excuses.1:47 #: ../scripts/list-unreleased.1:21 ../scripts/manpage-alert.1:28 #: ../scripts/mass-bug.pl:523 ../scripts/mergechanges.1:28 @@ -2856,7 +2856,7 @@ #: ../scripts/debdiff.1:176 ../scripts/debi.1:109 ../scripts/debrelease.1:105 #: ../scripts/debrsign.1:57 ../scripts/debsign.1:106 ../scripts/debuild.1:325 #: ../scripts/dget.pl:665 ../scripts/dpkg-depcheck.1:102 -#: ../scripts/dscverify.1:42 ../scripts/grep-excuses.1:35 +#: ../scripts/dscverify.1:43 ../scripts/grep-excuses.1:35 #: ../scripts/mass-bug.pl:132 ../scripts/nmudiff.1:79 #: ../scripts/plotchangelog.1:106 ../scripts/pts-subscribe.1:42 #: ../scripts/rmadison.pl:322 ../scripts/uupdate.1:107 @@ -3408,7 +3408,7 @@ #: ../scripts/cowpoke.1:135 ../scripts/debchange.1:389 ../scripts/debclean.1:90 #: ../scripts/debrelease.1:102 ../scripts/debsign.1:103 ../scripts/debsnap.1:77 #: ../scripts/dep3changelog.1:19 ../scripts/diff2patches.1:25 -#: ../scripts/dscverify.1:39 ../scripts/grep-excuses.1:26 +#: ../scripts/dscverify.1:40 ../scripts/grep-excuses.1:26 #: ../scripts/mass-bug.pl:121 ../scripts/nmudiff.1:76 #: ../scripts/plotchangelog.1:95 ../scripts/pts-subscribe.1:31 #: ../scripts/rmadison.pl:309 ../scripts/uscan.pl:1374 ../scripts/uupdate.1:104 @@ -3788,7 +3788,7 @@ #. type: TP #: ../scripts/checkbashisms.1:24 ../scripts/debchange.1:386 #: ../scripts/debdiff.1:164 ../scripts/debrelease.1:99 ../scripts/debsign.1:100 -#: ../scripts/dep3changelog.1:16 ../scripts/dscverify.1:36 +#: ../scripts/dep3changelog.1:16 ../scripts/dscverify.1:37 #: ../scripts/pts-subscribe.1:28 ../scripts/rc-alert.1:21 #: ../scripts/uupdate.1:101 ../scripts/whodepends.1:11 #: ../scripts/who-uploads.1:44 ../scripts/who-permits-upload.pl:66 @@ -7663,7 +7663,7 @@ #. type: Plain text #: ../scripts/debchange.1:392 ../scripts/debclean.1:93 #: ../scripts/debrelease.1:105 ../scripts/debsign.1:106 -#: ../scripts/dep3changelog.1:22 ../scripts/dscverify.1:42 +#: ../scripts/dep3changelog.1:22 ../scripts/dscverify.1:43 #: ../scripts/nmudiff.1:79 ../scripts/pts-subscribe.1:34 #: ../scripts/uupdate.1:107 ../scripts/who-uploads.1:50 msgid "Display version and copyright information and exit successfully." @@ -15247,21 +15247,35 @@ #. type: Plain text #: ../scripts/dscverify.1:6 +#, fuzzy +#| msgid "" +#| "B<dscverify> [B<--keyring >I<keyring>] ... I<changes_or_dsc_filename> ..." msgid "" -"B<dscverify> [B<--keyring >I<keyring>] ... I<changes_or_dsc_filename> ..." +"B<dscverify> [B<--keyring >I<keyring>] ... " +"I<changes_or_buildinfo_or_dsc_filename> ..." msgstr "" "B<dscverify> [B<--keyring >I<Schlüsselbund>] … I<changes-_oder_dsc-" "Dateiname> …" #. type: Plain text #: ../scripts/dscverify.1:17 -msgid "" -"B<dscverify> checks that the GPG signatures on the given I<.changes> or I<." -"dsc> files are good signatures made by keys in the current Debian keyrings, " -"found in the I<debian-keyring> and I<debian-maintainers> packages. " -"(Additional keyrings can be specified using the B<--keyring> option any " -"number of times.) It then checks that the other files listed in the I<." -"changes> or I<.dsc> files have the correct sizes and checksums (MD5 plus " +#, fuzzy +#| msgid "" +#| "B<dscverify> checks that the GPG signatures on the given I<.changes> or " +#| "I<.dsc> files are good signatures made by keys in the current Debian " +#| "keyrings, found in the I<debian-keyring> and I<debian-maintainers> " +#| "packages. (Additional keyrings can be specified using the B<--keyring> " +#| "option any number of times.) It then checks that the other files listed " +#| "in the I<.changes> or I<.dsc> files have the correct sizes and checksums " +#| "(MD5 plus SHA1 and SHA256 if the latter are present). The exit status is " +#| "0 if there are no problems and non-zero otherwise." +msgid "" +"B<dscverify> checks that the GPG signatures on the given I<.changes>, I<." +"buildinfo> or I<.dsc> files are good signatures made by keys in the current " +"Debian keyrings, found in the I<debian-keyring> package. (Additional " +"keyrings can be specified using the B<--keyring> option any number of " +"times.) It then checks that the other files listed in the I<.changes>, I<." +"buildinfo> or I<.dsc> files have the correct sizes and checksums (MD5 plus " "SHA1 and SHA256 if the latter are present). The exit status is 0 if there " "are no problems and non-zero otherwise." msgstr "" @@ -15305,28 +15319,33 @@ msgstr "B<--nosigcheck>, B<--no-sig-check>, B<-u>" #. type: Plain text -#: ../scripts/dscverify.1:32 +#: ../scripts/dscverify.1:33 +#, fuzzy +#| msgid "" +#| "Skip the signature verification step. That is, only verify the sizes and " +#| "checksums of the files listed in the I<.changes> or I<.dsc> files." msgid "" "Skip the signature verification step. That is, only verify the sizes and " -"checksums of the files listed in the I<.changes> or I<.dsc> files." +"checksums of the files listed in the I<.changes>, I<.buildinfo> or I<.dsc> " +"files." msgstr "" "überspringt den Signaturprüfschritt. Sprich, es prüft nur die Größen und " "Prüfsummen der in den I<.changes>- oder I<.dsc>-Dateien aufgeführten Dateien." #. type: TP -#: ../scripts/dscverify.1:32 ../scripts/plotchangelog.1:78 +#: ../scripts/dscverify.1:33 ../scripts/plotchangelog.1:78 #: ../scripts/uupdate.1:98 #, no-wrap msgid "B<--verbose>" msgstr "B<--verbose>" #. type: Plain text -#: ../scripts/dscverify.1:35 +#: ../scripts/dscverify.1:36 msgid "Do not suppress GPG output." msgstr "unterdrückt nicht die Ausgabe von GPG." #. type: Plain text -#: ../scripts/dscverify.1:49 +#: ../scripts/dscverify.1:50 msgid "" "The two configuration files I</etc/devscripts.conf> and I<~/.devscripts> are " "sourced by a shell in that order to set configuration variables. " @@ -15341,13 +15360,13 @@ "ist, werden diese Dateien nicht gelesen. Die derzeit bekannte Variable ist:" #. type: TP -#: ../scripts/dscverify.1:49 +#: ../scripts/dscverify.1:50 #, no-wrap msgid "B<DSCVERIFY_KEYRINGS>" msgstr "B<DSCVERIFY_KEYRINGS>" #. type: Plain text -#: ../scripts/dscverify.1:53 +#: ../scripts/dscverify.1:54 msgid "" "This is a colon-separated list of extra keyrings to use in addition to any " "specified on the command line." @@ -15357,13 +15376,13 @@ "Befehlszeile angegeben wurden." #. type: SH -#: ../scripts/dscverify.1:53 +#: ../scripts/dscverify.1:54 #, no-wrap msgid "KEYRING" msgstr "SCHLÜSSELBUND" #. type: Plain text -#: ../scripts/dscverify.1:60 +#: ../scripts/dscverify.1:61 msgid "" "Please note that the keyring provided by the debian-keyring package can be " "slightly out of date. The latest version can be obtained with rsync, as " @@ -15381,23 +15400,23 @@ "Konfigurationsoption oder die Option --keyring verwenden." #. type: Plain text -#: ../scripts/dscverify.1:62 +#: ../scripts/dscverify.1:63 msgid "Below is an example for an alias:" msgstr "Nachfolgend ein Beispiel für einen Alias:" #. type: Plain text -#: ../scripts/dscverify.1:64 +#: ../scripts/dscverify.1:65 msgid "alias dscverify='dscverify --keyring ~/.gnupg/pubring.gpg'" msgstr "alias dscverify='dscverify --keyring ~/.gnupg/pubring.gpg'" #. type: SH -#: ../scripts/dscverify.1:64 +#: ../scripts/dscverify.1:65 #, no-wrap msgid "STANDARD KEYRING LOCATIONS" msgstr "SPEICHERORTE DES STANDARDSCHLÜSSELBUNDS" #. type: Plain text -#: ../scripts/dscverify.1:67 +#: ../scripts/dscverify.1:68 msgid "" "By default dscverify searches for the debian-keyring in the following " "locations:" @@ -15406,32 +15425,32 @@ "Speicherorten:" #. type: Plain text -#: ../scripts/dscverify.1:69 +#: ../scripts/dscverify.1:70 msgid "- ~/.gnupg/trustedkeys.gpg" msgstr "- ~/.gnupg/trustedkeys.gpg" #. type: Plain text -#: ../scripts/dscverify.1:71 +#: ../scripts/dscverify.1:72 msgid "- /org/keyring.debian.org/keyrings/debian-keyring.gpg" msgstr "- /org/keyring.debian.org/keyrings/debian-keyring.gpg" #. type: Plain text -#: ../scripts/dscverify.1:73 +#: ../scripts/dscverify.1:74 msgid "- /usr/share/keyrings/debian-keyring.gpg" msgstr "- /usr/share/keyrings/debian-keyring.gpg" #. type: Plain text -#: ../scripts/dscverify.1:75 +#: ../scripts/dscverify.1:76 msgid "- /usr/share/keyrings/debian-maintainers.gpg" msgstr "- /usr/share/keyrings/debian-maintainers.gpg" #. type: Plain text -#: ../scripts/dscverify.1:79 +#: ../scripts/dscverify.1:80 msgid "B<gpg>(1), B<gpg2>(1), B<devscripts.conf>(5)" msgstr "B<gpg>(1), B<gpg2>(1), B<devscripts.conf>(5)" #. type: Plain text -#: ../scripts/dscverify.1:83 +#: ../scripts/dscverify.1:84 msgid "" "B<dscverify> was written by Roderick Schertler E<lt>roder...@argon.orge<gt> " "and posted on the debian-de...@lists.debian.org mailing list, with several " @@ -22009,12 +22028,19 @@ #. type: verbatim #: ../scripts/uscan.pl:1088 -#, no-wrap +#, fuzzy, no-wrap +#| msgid "" +#| " version=4\n" +#| " opts=\"pgpmode=none\" \\\n" +#| " https://pypi.python.org/pypi/cfn-sphere/ \\\n" +#| " https://pypi.python.org/packages/source/c/cfn-sphere/\\\n"; +#| " cfn-sphere-([\\d\\.]+).tar.gz#.* debian uupdate\n" +#| "\n" msgid "" " version=4\n" " opts=\"pgpmode=none\" \\\n" " https://pypi.python.org/pypi/cfn-sphere/ \\\n" -" https://pypi.python.org/packages/source/c/cfn-sphere/\\\n"; +" https://pypi.python.org/packages/.*/.*/.*/\\\n"; " cfn-sphere-([\\d\\.]+).tar.gz#.* debian uupdate\n" "\n" msgstr "" diff -Nru devscripts-2.17.0/po4a/po/devscripts.pot devscripts-2.17.1/po4a/po/devscripts.pot --- devscripts-2.17.0/po4a/po/devscripts.pot 2017-01-10 23:21:45.000000000 -0500 +++ devscripts-2.17.1/po4a/po/devscripts.pot 2017-02-01 21:25:00.000000000 -0500 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-01-11 04:24+0000\n" +"POT-Creation-Date: 2017-02-02 02:29+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" @@ -93,7 +93,7 @@ msgstr "" #. type: Plain text -#: ../scripts/annotate-output.1:19 ../scripts/debchange.1:389 ../scripts/debclean.1:90 ../scripts/debrelease.1:102 ../scripts/debsign.1:103 ../scripts/dep3changelog.1:19 ../scripts/dscverify.1:39 ../scripts/nmudiff.1:76 ../scripts/pts-subscribe.1:31 ../scripts/uupdate.1:104 ../scripts/who-uploads.1:47 +#: ../scripts/annotate-output.1:19 ../scripts/debchange.1:389 ../scripts/debclean.1:90 ../scripts/debrelease.1:102 ../scripts/debsign.1:103 ../scripts/dep3changelog.1:19 ../scripts/dscverify.1:40 ../scripts/nmudiff.1:76 ../scripts/pts-subscribe.1:31 ../scripts/uupdate.1:104 ../scripts/who-uploads.1:47 msgid "Display a help message and exit successfully." msgstr "" @@ -149,7 +149,7 @@ msgstr "" #. type: SH -#: ../scripts/annotate-output.1:47 ../scripts/bts.pl:4190 ../scripts/checkbashisms.1:63 ../scripts/cowpoke.1:379 ../scripts/cvs-debc.1:58 ../scripts/cvs-debi.1:62 ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53 ../scripts/dcmd.1:107 ../scripts/dcontrol.pl:290 ../scripts/debc.1:118 ../scripts/debchange.1:469 ../scripts/debcheckout.pl:231 ../scripts/debclean.1:110 ../scripts/debcommit.pl:911 ../scripts/debdiff.1:234 ../scripts/debi.1:132 ../scripts/debrepro.pod:125 ../scripts/debrelease.1:132 ../scripts/deb-reversion.dbk:247 ../scripts/debrsign.1:66 ../scripts/debsign.1:134 ../scripts/debsnap.1:134 ../scripts/debuild.1:445 ../scripts/dep3changelog.1:28 ../scripts/dget.pl:717 ../scripts/diff2patches.1:45 ../scripts/dpkg-depcheck.1:118 ../scripts/dpkg-genbuilddeps.1:30 ../scripts/dscverify.1:75 ../scripts/git-deborig.pl:52 ../scripts/grep-excuses.1:45 ../scripts/list-unreleased.1:19 ../scripts/mk-origtargz.pl:181 ../scripts/nmudiff.1:108 ../scripts/origtargz.pl:158 ../scripts/plotchangelog.1:124 ../scripts/pts-subscribe.1:51 ../scripts/rc-alert.1:121 ../scripts/rmadison.pl:371 ../scripts/sadt.pod:69 ../scripts/tagpending.pl:146 ../scripts/uscan.pl:1675 ../scripts/uupdate.1:189 ../doc/what-patch.1:35 ../scripts/who-permits-upload.pl:162 ../scripts/wnpp-alert.1:29 ../scripts/wnpp-check.1:26 ../scripts/devscripts.conf.5:54 +#: ../scripts/annotate-output.1:47 ../scripts/bts.pl:4190 ../scripts/checkbashisms.1:63 ../scripts/cowpoke.1:379 ../scripts/cvs-debc.1:58 ../scripts/cvs-debi.1:62 ../scripts/cvs-debrelease.1:64 ../scripts/cvs-debuild.1:53 ../scripts/dcmd.1:107 ../scripts/dcontrol.pl:290 ../scripts/debc.1:118 ../scripts/debchange.1:469 ../scripts/debcheckout.pl:231 ../scripts/debclean.1:110 ../scripts/debcommit.pl:911 ../scripts/debdiff.1:234 ../scripts/debi.1:132 ../scripts/debrepro.pod:125 ../scripts/debrelease.1:132 ../scripts/deb-reversion.dbk:247 ../scripts/debrsign.1:66 ../scripts/debsign.1:134 ../scripts/debsnap.1:134 ../scripts/debuild.1:445 ../scripts/dep3changelog.1:28 ../scripts/dget.pl:717 ../scripts/diff2patches.1:45 ../scripts/dpkg-depcheck.1:118 ../scripts/dpkg-genbuilddeps.1:30 ../scripts/dscverify.1:76 ../scripts/git-deborig.pl:52 ../scripts/grep-excuses.1:45 ../scripts/list-unreleased.1:19 ../scripts/mk-origtargz.pl:181 ../scripts/nmudiff.1:108 ../scripts/origtargz.pl:158 ../scripts/plotchangelog.1:124 ../scripts/pts-subscribe.1:51 ../scripts/rc-alert.1:121 ../scripts/rmadison.pl:371 ../scripts/sadt.pod:69 ../scripts/tagpending.pl:146 ../scripts/uscan.pl:1675 ../scripts/uupdate.1:189 ../doc/what-patch.1:35 ../scripts/who-permits-upload.pl:162 ../scripts/wnpp-alert.1:29 ../scripts/wnpp-check.1:26 ../scripts/devscripts.conf.5:54 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -174,7 +174,7 @@ msgstr "" #. type: SH -#: ../scripts/annotate-output.1:55 ../scripts/archpath.1:54 ../scripts/build-rdeps.pl:531 ../scripts/checkbashisms.1:65 ../scripts/cowpoke.1:385 ../scripts/cvs-debc.1:63 ../scripts/cvs-debi.1:67 ../scripts/cvs-debrelease.1:68 ../scripts/cvs-debuild.1:58 ../scripts/dcmd.1:110 ../scripts/dcontrol.pl:283 ../scripts/dd-list.1:106 ../scripts/debc.1:122 ../scripts/debchange.1:475 ../scripts/debcheckout.pl:236 ../scripts/debclean.1:113 ../scripts/debcommit.pl:907 ../scripts/debdiff.1:241 ../scripts/debi.1:135 ../scripts/debpkg.1:23 ../scripts/debrepro.pod:129 ../scripts/debrelease.1:136 ../scripts/deb-reversion.dbk:292 ../scripts/debrsign.1:70 ../scripts/debsign.1:146 ../scripts/debuild.1:457 ../scripts/desktop2menu.pl:52 ../scripts/dep3changelog.1:26 ../scripts/dget.pl:709 ../scripts/diff2patches.1:48 ../scripts/dpkg-genbuilddeps.1:36 ../scripts/dscextract.1:32 ../scripts/dscverify.1:80 ../scripts/getbuildlog.1:41 ../scripts/git-deborig.pl:56 ../scripts/grep-excuses.1:47 ../scripts/list-unreleased.1:21 ../scripts/manpage-alert.1:28 ../scripts/mass-bug.pl:523 ../scripts/mergechanges.1:28 ../scripts/mk-build-deps.pl:118 ../scripts/mk-origtargz.pl:185 ../scripts/namecheck.pl:24 ../scripts/nmudiff.1:112 ../scripts/origtargz.pl:162 ../scripts/plotchangelog.1:126 ../scripts/pts-subscribe.1:56 ../scripts/rc-alert.1:125 ../scripts/rmadison.pl:375 ../scripts/svnpath.pl:93 ../scripts/transition-check.pl:81 ../scripts/uscan.pl:1679 ../scripts/uupdate.1:196 ../scripts/whodepends.1:19 ../scripts/who-uploads.1:71 ../scripts/who-permits-upload.pl:157 ../scripts/wnpp-alert.1:31 ../scripts/wnpp-check.1:36 ../scripts/devscripts.conf.5:58 +#: ../scripts/annotate-output.1:55 ../scripts/archpath.1:54 ../scripts/build-rdeps.pl:531 ../scripts/checkbashisms.1:65 ../scripts/cowpoke.1:385 ../scripts/cvs-debc.1:63 ../scripts/cvs-debi.1:67 ../scripts/cvs-debrelease.1:68 ../scripts/cvs-debuild.1:58 ../scripts/dcmd.1:110 ../scripts/dcontrol.pl:283 ../scripts/dd-list.1:106 ../scripts/debc.1:122 ../scripts/debchange.1:475 ../scripts/debcheckout.pl:236 ../scripts/debclean.1:113 ../scripts/debcommit.pl:907 ../scripts/debdiff.1:241 ../scripts/debi.1:135 ../scripts/debpkg.1:23 ../scripts/debrepro.pod:129 ../scripts/debrelease.1:136 ../scripts/deb-reversion.dbk:292 ../scripts/debrsign.1:70 ../scripts/debsign.1:146 ../scripts/debuild.1:457 ../scripts/desktop2menu.pl:52 ../scripts/dep3changelog.1:26 ../scripts/dget.pl:709 ../scripts/diff2patches.1:48 ../scripts/dpkg-genbuilddeps.1:36 ../scripts/dscextract.1:32 ../scripts/dscverify.1:81 ../scripts/getbuildlog.1:41 ../scripts/git-deborig.pl:56 ../scripts/grep-excuses.1:47 ../scripts/list-unreleased.1:21 ../scripts/manpage-alert.1:28 ../scripts/mass-bug.pl:523 ../scripts/mergechanges.1:28 ../scripts/mk-build-deps.pl:118 ../scripts/mk-origtargz.pl:185 ../scripts/namecheck.pl:24 ../scripts/nmudiff.1:112 ../scripts/origtargz.pl:162 ../scripts/plotchangelog.1:126 ../scripts/pts-subscribe.1:56 ../scripts/rc-alert.1:125 ../scripts/rmadison.pl:375 ../scripts/svnpath.pl:93 ../scripts/transition-check.pl:81 ../scripts/uscan.pl:1679 ../scripts/uupdate.1:196 ../scripts/whodepends.1:19 ../scripts/who-uploads.1:71 ../scripts/who-permits-upload.pl:157 ../scripts/wnpp-alert.1:31 ../scripts/wnpp-check.1:36 ../scripts/devscripts.conf.5:58 #, no-wrap msgid "AUTHOR" msgstr "" @@ -2118,7 +2118,7 @@ msgstr "" #. type: SH -#: ../scripts/bts.pl:4087 ../scripts/dcontrol.pl:267 ../scripts/debc.1:95 ../scripts/debchange.1:392 ../scripts/debcheckout.pl:180 ../scripts/debclean.1:93 ../scripts/debcommit.pl:104 ../scripts/debdiff.1:176 ../scripts/debi.1:109 ../scripts/debrelease.1:105 ../scripts/debrsign.1:57 ../scripts/debsign.1:106 ../scripts/debuild.1:325 ../scripts/dget.pl:665 ../scripts/dpkg-depcheck.1:102 ../scripts/dscverify.1:42 ../scripts/grep-excuses.1:35 ../scripts/mass-bug.pl:132 ../scripts/nmudiff.1:79 ../scripts/plotchangelog.1:106 ../scripts/pts-subscribe.1:42 ../scripts/rmadison.pl:322 ../scripts/uupdate.1:107 ../scripts/who-uploads.1:50 +#: ../scripts/bts.pl:4087 ../scripts/dcontrol.pl:267 ../scripts/debc.1:95 ../scripts/debchange.1:392 ../scripts/debcheckout.pl:180 ../scripts/debclean.1:93 ../scripts/debcommit.pl:104 ../scripts/debdiff.1:176 ../scripts/debi.1:109 ../scripts/debrelease.1:105 ../scripts/debrsign.1:57 ../scripts/debsign.1:106 ../scripts/debuild.1:325 ../scripts/dget.pl:665 ../scripts/dpkg-depcheck.1:102 ../scripts/dscverify.1:43 ../scripts/grep-excuses.1:35 ../scripts/mass-bug.pl:132 ../scripts/nmudiff.1:79 ../scripts/plotchangelog.1:106 ../scripts/pts-subscribe.1:42 ../scripts/rmadison.pl:322 ../scripts/uupdate.1:107 ../scripts/who-uploads.1:50 #, no-wrap msgid "CONFIGURATION VARIABLES" msgstr "" @@ -2559,7 +2559,7 @@ msgstr "" #. type: TP -#: ../scripts/build-rdeps.pl:112 ../scripts/chdist.pl:49 ../scripts/cowpoke.1:135 ../scripts/debchange.1:389 ../scripts/debclean.1:90 ../scripts/debrelease.1:102 ../scripts/debsign.1:103 ../scripts/debsnap.1:77 ../scripts/dep3changelog.1:19 ../scripts/diff2patches.1:25 ../scripts/dscverify.1:39 ../scripts/grep-excuses.1:26 ../scripts/mass-bug.pl:121 ../scripts/nmudiff.1:76 ../scripts/plotchangelog.1:95 ../scripts/pts-subscribe.1:31 ../scripts/rmadison.pl:309 ../scripts/uscan.pl:1374 ../scripts/uupdate.1:104 ../scripts/who-uploads.1:47 +#: ../scripts/build-rdeps.pl:112 ../scripts/chdist.pl:49 ../scripts/cowpoke.1:135 ../scripts/debchange.1:389 ../scripts/debclean.1:90 ../scripts/debrelease.1:102 ../scripts/debsign.1:103 ../scripts/debsnap.1:77 ../scripts/dep3changelog.1:19 ../scripts/diff2patches.1:25 ../scripts/dscverify.1:40 ../scripts/grep-excuses.1:26 ../scripts/mass-bug.pl:121 ../scripts/nmudiff.1:76 ../scripts/plotchangelog.1:95 ../scripts/pts-subscribe.1:31 ../scripts/rmadison.pl:309 ../scripts/uscan.pl:1374 ../scripts/uupdate.1:104 ../scripts/who-uploads.1:47 #, no-wrap msgid "B<--version>" msgstr "" @@ -2887,7 +2887,7 @@ msgstr "" #. type: TP -#: ../scripts/checkbashisms.1:24 ../scripts/debchange.1:386 ../scripts/debdiff.1:164 ../scripts/debrelease.1:99 ../scripts/debsign.1:100 ../scripts/dep3changelog.1:16 ../scripts/dscverify.1:36 ../scripts/pts-subscribe.1:28 ../scripts/rc-alert.1:21 ../scripts/uupdate.1:101 ../scripts/whodepends.1:11 ../scripts/who-uploads.1:44 ../scripts/who-permits-upload.pl:66 ../scripts/wnpp-alert.1:23 ../scripts/wnpp-check.1:17 +#: ../scripts/checkbashisms.1:24 ../scripts/debchange.1:386 ../scripts/debdiff.1:164 ../scripts/debrelease.1:99 ../scripts/debsign.1:100 ../scripts/dep3changelog.1:16 ../scripts/dscverify.1:37 ../scripts/pts-subscribe.1:28 ../scripts/rc-alert.1:21 ../scripts/uupdate.1:101 ../scripts/whodepends.1:11 ../scripts/who-uploads.1:44 ../scripts/who-permits-upload.pl:66 ../scripts/wnpp-alert.1:23 ../scripts/wnpp-check.1:17 #, no-wrap msgid "B<--help>, B<-h>" msgstr "" @@ -5836,7 +5836,7 @@ msgstr "" #. type: Plain text -#: ../scripts/debchange.1:392 ../scripts/debclean.1:93 ../scripts/debrelease.1:105 ../scripts/debsign.1:106 ../scripts/dep3changelog.1:22 ../scripts/dscverify.1:42 ../scripts/nmudiff.1:79 ../scripts/pts-subscribe.1:34 ../scripts/uupdate.1:107 ../scripts/who-uploads.1:50 +#: ../scripts/debchange.1:392 ../scripts/debclean.1:93 ../scripts/debrelease.1:105 ../scripts/debsign.1:106 ../scripts/dep3changelog.1:22 ../scripts/dscverify.1:43 ../scripts/nmudiff.1:79 ../scripts/pts-subscribe.1:34 ../scripts/uupdate.1:107 ../scripts/who-uploads.1:50 msgid "Display version and copyright information and exit successfully." msgstr "" @@ -11895,20 +11895,22 @@ #. type: Plain text #: ../scripts/dscverify.1:6 -msgid "B<dscverify> [B<--keyring >I<keyring>] ... I<changes_or_dsc_filename> ..." +msgid "" +"B<dscverify> [B<--keyring >I<keyring>] " +"... I<changes_or_buildinfo_or_dsc_filename> ..." msgstr "" #. type: Plain text #: ../scripts/dscverify.1:17 msgid "" -"B<dscverify> checks that the GPG signatures on the given I<.changes> or " -"I<.dsc> files are good signatures made by keys in the current Debian " -"keyrings, found in the I<debian-keyring> and I<debian-maintainers> " -"packages. (Additional keyrings can be specified using the B<--keyring> " -"option any number of times.) It then checks that the other files listed in " -"the I<.changes> or I<.dsc> files have the correct sizes and checksums (MD5 " -"plus SHA1 and SHA256 if the latter are present). The exit status is 0 if " -"there are no problems and non-zero otherwise." +"B<dscverify> checks that the GPG signatures on the given I<.changes>, " +"I<.buildinfo> or I<.dsc> files are good signatures made by keys in the " +"current Debian keyrings, found in the I<debian-keyring> package. " +"(Additional keyrings can be specified using the B<--keyring> option any " +"number of times.) It then checks that the other files listed in the " +"I<.changes>, I<.buildinfo> or I<.dsc> files have the correct sizes and " +"checksums (MD5 plus SHA1 and SHA256 if the latter are present). The exit " +"status is 0 if there are no problems and non-zero otherwise." msgstr "" #. type: TP @@ -11940,25 +11942,26 @@ msgstr "" #. type: Plain text -#: ../scripts/dscverify.1:32 +#: ../scripts/dscverify.1:33 msgid "" "Skip the signature verification step. That is, only verify the sizes and " -"checksums of the files listed in the I<.changes> or I<.dsc> files." +"checksums of the files listed in the I<.changes>, I<.buildinfo> or I<.dsc> " +"files." msgstr "" #. type: TP -#: ../scripts/dscverify.1:32 ../scripts/plotchangelog.1:78 ../scripts/uupdate.1:98 +#: ../scripts/dscverify.1:33 ../scripts/plotchangelog.1:78 ../scripts/uupdate.1:98 #, no-wrap msgid "B<--verbose>" msgstr "" #. type: Plain text -#: ../scripts/dscverify.1:35 +#: ../scripts/dscverify.1:36 msgid "Do not suppress GPG output." msgstr "" #. type: Plain text -#: ../scripts/dscverify.1:49 +#: ../scripts/dscverify.1:50 msgid "" "The two configuration files I</etc/devscripts.conf> and I<~/.devscripts> are " "sourced by a shell in that order to set configuration variables. " @@ -11968,26 +11971,26 @@ msgstr "" #. type: TP -#: ../scripts/dscverify.1:49 +#: ../scripts/dscverify.1:50 #, no-wrap msgid "B<DSCVERIFY_KEYRINGS>" msgstr "" #. type: Plain text -#: ../scripts/dscverify.1:53 +#: ../scripts/dscverify.1:54 msgid "" "This is a colon-separated list of extra keyrings to use in addition to any " "specified on the command line." msgstr "" #. type: SH -#: ../scripts/dscverify.1:53 +#: ../scripts/dscverify.1:54 #, no-wrap msgid "KEYRING" msgstr "" #. type: Plain text -#: ../scripts/dscverify.1:60 +#: ../scripts/dscverify.1:61 msgid "" "Please note that the keyring provided by the debian-keyring package can be " "slightly out of date. The latest version can be obtained with rsync, as " @@ -11998,55 +12001,55 @@ msgstr "" #. type: Plain text -#: ../scripts/dscverify.1:62 +#: ../scripts/dscverify.1:63 msgid "Below is an example for an alias:" msgstr "" #. type: Plain text -#: ../scripts/dscverify.1:64 +#: ../scripts/dscverify.1:65 msgid "alias dscverify='dscverify --keyring ~/.gnupg/pubring.gpg'" msgstr "" #. type: SH -#: ../scripts/dscverify.1:64 +#: ../scripts/dscverify.1:65 #, no-wrap msgid "STANDARD KEYRING LOCATIONS" msgstr "" #. type: Plain text -#: ../scripts/dscverify.1:67 +#: ../scripts/dscverify.1:68 msgid "" "By default dscverify searches for the debian-keyring in the following " "locations:" msgstr "" #. type: Plain text -#: ../scripts/dscverify.1:69 +#: ../scripts/dscverify.1:70 msgid "- ~/.gnupg/trustedkeys.gpg" msgstr "" #. type: Plain text -#: ../scripts/dscverify.1:71 +#: ../scripts/dscverify.1:72 msgid "- /org/keyring.debian.org/keyrings/debian-keyring.gpg" msgstr "" #. type: Plain text -#: ../scripts/dscverify.1:73 +#: ../scripts/dscverify.1:74 msgid "- /usr/share/keyrings/debian-keyring.gpg" msgstr "" #. type: Plain text -#: ../scripts/dscverify.1:75 +#: ../scripts/dscverify.1:76 msgid "- /usr/share/keyrings/debian-maintainers.gpg" msgstr "" #. type: Plain text -#: ../scripts/dscverify.1:79 +#: ../scripts/dscverify.1:80 msgid "B<gpg>(1), B<gpg2>(1), B<devscripts.conf>(5)" msgstr "" #. type: Plain text -#: ../scripts/dscverify.1:83 +#: ../scripts/dscverify.1:84 msgid "" "B<dscverify> was written by Roderick Schertler E<lt>roder...@argon.orge<gt> " "and posted on the debian-de...@lists.debian.org mailing list, with several " @@ -17217,7 +17220,7 @@ " version=4\n" " opts=\"pgpmode=none\" \\\n" " https://pypi.python.org/pypi/cfn-sphere/ \\\n" -" https://pypi.python.org/packages/source/c/cfn-sphere/\\\n"; +" https://pypi.python.org/packages/.*/.*/.*/\\\n"; " cfn-sphere-([\\d\\.]+).tar.gz#.* debian uupdate\n" "\n" msgstr "" diff -Nru devscripts-2.17.0/po4a/po/fr.po devscripts-2.17.1/po4a/po/fr.po --- devscripts-2.17.0/po4a/po/fr.po 2017-01-10 23:21:45.000000000 -0500 +++ devscripts-2.17.1/po4a/po/fr.po 2017-02-01 21:25:00.000000000 -0500 @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: devscripts\n" -"POT-Creation-Date: 2017-01-11 04:24+0000\n" +"POT-Creation-Date: 2017-02-02 02:29+0000\n" "PO-Revision-Date: 2014-12-23 08:45-0400\n" "Last-Translator: David Prévot <da...@tilapin.org>\n" "Language-Team: French <debian-l10n-fre...@lists.debian.org>\n" @@ -261,7 +261,7 @@ #: ../scripts/annotate-output.1:19 ../scripts/debchange.1:389 #: ../scripts/debclean.1:90 ../scripts/debrelease.1:102 #: ../scripts/debsign.1:103 ../scripts/dep3changelog.1:19 -#: ../scripts/dscverify.1:39 ../scripts/nmudiff.1:76 +#: ../scripts/dscverify.1:40 ../scripts/nmudiff.1:76 #: ../scripts/pts-subscribe.1:31 ../scripts/uupdate.1:104 #: ../scripts/who-uploads.1:47 msgid "Display a help message and exit successfully." @@ -353,7 +353,7 @@ #: ../scripts/debuild.1:445 ../scripts/dep3changelog.1:28 #: ../scripts/dget.pl:717 ../scripts/diff2patches.1:45 #: ../scripts/dpkg-depcheck.1:118 ../scripts/dpkg-genbuilddeps.1:30 -#: ../scripts/dscverify.1:75 ../scripts/git-deborig.pl:52 +#: ../scripts/dscverify.1:76 ../scripts/git-deborig.pl:52 #: ../scripts/grep-excuses.1:45 ../scripts/list-unreleased.1:19 #: ../scripts/mk-origtargz.pl:181 ../scripts/nmudiff.1:108 #: ../scripts/origtargz.pl:158 ../scripts/plotchangelog.1:124 @@ -404,7 +404,7 @@ #: ../scripts/desktop2menu.pl:52 ../scripts/dep3changelog.1:26 #: ../scripts/dget.pl:709 ../scripts/diff2patches.1:48 #: ../scripts/dpkg-genbuilddeps.1:36 ../scripts/dscextract.1:32 -#: ../scripts/dscverify.1:80 ../scripts/getbuildlog.1:41 +#: ../scripts/dscverify.1:81 ../scripts/getbuildlog.1:41 #: ../scripts/git-deborig.pl:56 ../scripts/grep-excuses.1:47 #: ../scripts/list-unreleased.1:21 ../scripts/manpage-alert.1:28 #: ../scripts/mass-bug.pl:523 ../scripts/mergechanges.1:28 @@ -2866,7 +2866,7 @@ #: ../scripts/debdiff.1:176 ../scripts/debi.1:109 ../scripts/debrelease.1:105 #: ../scripts/debrsign.1:57 ../scripts/debsign.1:106 ../scripts/debuild.1:325 #: ../scripts/dget.pl:665 ../scripts/dpkg-depcheck.1:102 -#: ../scripts/dscverify.1:42 ../scripts/grep-excuses.1:35 +#: ../scripts/dscverify.1:43 ../scripts/grep-excuses.1:35 #: ../scripts/mass-bug.pl:132 ../scripts/nmudiff.1:79 #: ../scripts/plotchangelog.1:106 ../scripts/pts-subscribe.1:42 #: ../scripts/rmadison.pl:322 ../scripts/uupdate.1:107 @@ -3408,7 +3408,7 @@ #: ../scripts/cowpoke.1:135 ../scripts/debchange.1:389 ../scripts/debclean.1:90 #: ../scripts/debrelease.1:102 ../scripts/debsign.1:103 ../scripts/debsnap.1:77 #: ../scripts/dep3changelog.1:19 ../scripts/diff2patches.1:25 -#: ../scripts/dscverify.1:39 ../scripts/grep-excuses.1:26 +#: ../scripts/dscverify.1:40 ../scripts/grep-excuses.1:26 #: ../scripts/mass-bug.pl:121 ../scripts/nmudiff.1:76 #: ../scripts/plotchangelog.1:95 ../scripts/pts-subscribe.1:31 #: ../scripts/rmadison.pl:309 ../scripts/uscan.pl:1374 ../scripts/uupdate.1:104 @@ -3793,7 +3793,7 @@ #. type: TP #: ../scripts/checkbashisms.1:24 ../scripts/debchange.1:386 #: ../scripts/debdiff.1:164 ../scripts/debrelease.1:99 ../scripts/debsign.1:100 -#: ../scripts/dep3changelog.1:16 ../scripts/dscverify.1:36 +#: ../scripts/dep3changelog.1:16 ../scripts/dscverify.1:37 #: ../scripts/pts-subscribe.1:28 ../scripts/rc-alert.1:21 #: ../scripts/uupdate.1:101 ../scripts/whodepends.1:11 #: ../scripts/who-uploads.1:44 ../scripts/who-permits-upload.pl:66 @@ -7677,7 +7677,7 @@ #. type: Plain text #: ../scripts/debchange.1:392 ../scripts/debclean.1:93 #: ../scripts/debrelease.1:105 ../scripts/debsign.1:106 -#: ../scripts/dep3changelog.1:22 ../scripts/dscverify.1:42 +#: ../scripts/dep3changelog.1:22 ../scripts/dscverify.1:43 #: ../scripts/nmudiff.1:79 ../scripts/pts-subscribe.1:34 #: ../scripts/uupdate.1:107 ../scripts/who-uploads.1:50 msgid "Display version and copyright information and exit successfully." @@ -15308,21 +15308,35 @@ #. type: Plain text #: ../scripts/dscverify.1:6 +#, fuzzy +#| msgid "" +#| "B<dscverify> [B<--keyring >I<keyring>] ... I<changes_or_dsc_filename> ..." msgid "" -"B<dscverify> [B<--keyring >I<keyring>] ... I<changes_or_dsc_filename> ..." +"B<dscverify> [B<--keyring >I<keyring>] ... " +"I<changes_or_buildinfo_or_dsc_filename> ..." msgstr "" "B<dscverify> [B<--keyring >I<trousseau_de_clefs>] ... " "I<fichier_changes_ou_dsc> ..." #. type: Plain text #: ../scripts/dscverify.1:17 -msgid "" -"B<dscverify> checks that the GPG signatures on the given I<.changes> or I<." -"dsc> files are good signatures made by keys in the current Debian keyrings, " -"found in the I<debian-keyring> and I<debian-maintainers> packages. " -"(Additional keyrings can be specified using the B<--keyring> option any " -"number of times.) It then checks that the other files listed in the I<." -"changes> or I<.dsc> files have the correct sizes and checksums (MD5 plus " +#, fuzzy +#| msgid "" +#| "B<dscverify> checks that the GPG signatures on the given I<.changes> or " +#| "I<.dsc> files are good signatures made by keys in the current Debian " +#| "keyrings, found in the I<debian-keyring> and I<debian-maintainers> " +#| "packages. (Additional keyrings can be specified using the B<--keyring> " +#| "option any number of times.) It then checks that the other files listed " +#| "in the I<.changes> or I<.dsc> files have the correct sizes and checksums " +#| "(MD5 plus SHA1 and SHA256 if the latter are present). The exit status is " +#| "0 if there are no problems and non-zero otherwise." +msgid "" +"B<dscverify> checks that the GPG signatures on the given I<.changes>, I<." +"buildinfo> or I<.dsc> files are good signatures made by keys in the current " +"Debian keyrings, found in the I<debian-keyring> package. (Additional " +"keyrings can be specified using the B<--keyring> option any number of " +"times.) It then checks that the other files listed in the I<.changes>, I<." +"buildinfo> or I<.dsc> files have the correct sizes and checksums (MD5 plus " "SHA1 and SHA256 if the latter are present). The exit status is 0 if there " "are no problems and non-zero otherwise." msgstr "" @@ -15365,30 +15379,35 @@ msgstr "B<--nosigcheck>, B<--no-sig-check>, B<-u>" #. type: Plain text -#: ../scripts/dscverify.1:32 +#: ../scripts/dscverify.1:33 +#, fuzzy +#| msgid "" +#| "Skip the signature verification step. That is, only verify the sizes and " +#| "checksums of the files listed in the I<.changes> or I<.dsc> files." msgid "" "Skip the signature verification step. That is, only verify the sizes and " -"checksums of the files listed in the I<.changes> or I<.dsc> files." +"checksums of the files listed in the I<.changes>, I<.buildinfo> or I<.dsc> " +"files." msgstr "" "Omettre l'étape de vérification de signature. Vérifier uniquement la taille " "et les sommes de contrôle des fichiers listés dans le fichier I<.changes> ou " "I<.dsc>." #. type: TP -#: ../scripts/dscverify.1:32 ../scripts/plotchangelog.1:78 +#: ../scripts/dscverify.1:33 ../scripts/plotchangelog.1:78 #: ../scripts/uupdate.1:98 #, no-wrap msgid "B<--verbose>" msgstr "B<--verbose>" #. type: Plain text -#: ../scripts/dscverify.1:35 +#: ../scripts/dscverify.1:36 msgid "Do not suppress GPG output." msgstr "Ne pas supprimer la sortie de GPG." # NOTE: presque identique, manque la surcharge par les options #. type: Plain text -#: ../scripts/dscverify.1:49 +#: ../scripts/dscverify.1:50 msgid "" "The two configuration files I</etc/devscripts.conf> and I<~/.devscripts> are " "sourced by a shell in that order to set configuration variables. " @@ -15406,13 +15425,13 @@ "variables actuellement identifiées sont :" #. type: TP -#: ../scripts/dscverify.1:49 +#: ../scripts/dscverify.1:50 #, no-wrap msgid "B<DSCVERIFY_KEYRINGS>" msgstr "B<DSCVERIFY_KEYRINGS>" #. type: Plain text -#: ../scripts/dscverify.1:53 +#: ../scripts/dscverify.1:54 msgid "" "This is a colon-separated list of extra keyrings to use in addition to any " "specified on the command line." @@ -15421,13 +15440,13 @@ "utiliser en plus de ceux indiqués en ligne de commande." #. type: SH -#: ../scripts/dscverify.1:53 +#: ../scripts/dscverify.1:54 #, no-wrap msgid "KEYRING" msgstr "TROUSSEAU DE CLEFS" #. type: Plain text -#: ../scripts/dscverify.1:60 +#: ../scripts/dscverify.1:61 msgid "" "Please note that the keyring provided by the debian-keyring package can be " "slightly out of date. The latest version can be obtained with rsync, as " @@ -15445,23 +15464,23 @@ "mentionnée ci-dessus, soit en utilisant l'option --keyring." #. type: Plain text -#: ../scripts/dscverify.1:62 +#: ../scripts/dscverify.1:63 msgid "Below is an example for an alias:" msgstr "Voici un exemple d'alias :" #. type: Plain text -#: ../scripts/dscverify.1:64 +#: ../scripts/dscverify.1:65 msgid "alias dscverify='dscverify --keyring ~/.gnupg/pubring.gpg'" msgstr "alias dscverify='dscverify --keyring ~/.gnupg/pubring.gpg'" #. type: SH -#: ../scripts/dscverify.1:64 +#: ../scripts/dscverify.1:65 #, no-wrap msgid "STANDARD KEYRING LOCATIONS" msgstr "EMPLACEMENTS STANDARDS DES TROUSSEAUX" #. type: Plain text -#: ../scripts/dscverify.1:67 +#: ../scripts/dscverify.1:68 msgid "" "By default dscverify searches for the debian-keyring in the following " "locations:" @@ -15470,34 +15489,34 @@ "emplacements suivants :" #. type: Plain text -#: ../scripts/dscverify.1:69 +#: ../scripts/dscverify.1:70 msgid "- ~/.gnupg/trustedkeys.gpg" msgstr "- ~/.gnupg/trustedkeys.gpg" #. type: Plain text -#: ../scripts/dscverify.1:71 +#: ../scripts/dscverify.1:72 msgid "- /org/keyring.debian.org/keyrings/debian-keyring.gpg" msgstr "- /org/keyring.debian.org/keyrings/debian-keyring.gpg" #. type: Plain text -#: ../scripts/dscverify.1:73 +#: ../scripts/dscverify.1:74 msgid "- /usr/share/keyrings/debian-keyring.gpg" msgstr "- /usr/share/keyrings/debian-keyring.gpg" #. type: Plain text -#: ../scripts/dscverify.1:75 +#: ../scripts/dscverify.1:76 msgid "- /usr/share/keyrings/debian-maintainers.gpg" msgstr "- /usr/share/keyrings/debian-maintainers.gpg" #. type: Plain text -#: ../scripts/dscverify.1:79 +#: ../scripts/dscverify.1:80 #, fuzzy #| msgid "B<dput>(1), B<dupload>(1), B<devscripts.conf>(5)" msgid "B<gpg>(1), B<gpg2>(1), B<devscripts.conf>(5)" msgstr "B<dput>(1), B<dupload>(1), B<devscripts.conf>(5)" #. type: Plain text -#: ../scripts/dscverify.1:83 +#: ../scripts/dscverify.1:84 msgid "" "B<dscverify> was written by Roderick Schertler E<lt>roder...@argon.orge<gt> " "and posted on the debian-de...@lists.debian.org mailing list, with several " @@ -21622,7 +21641,7 @@ " version=4\n" " opts=\"pgpmode=none\" \\\n" " https://pypi.python.org/pypi/cfn-sphere/ \\\n" -" https://pypi.python.org/packages/source/c/cfn-sphere/\\\n"; +" https://pypi.python.org/packages/.*/.*/.*/\\\n"; " cfn-sphere-([\\d\\.]+).tar.gz#.* debian uupdate\n" "\n" msgstr "" diff -Nru devscripts-2.17.0/scripts/dscverify.1 devscripts-2.17.1/scripts/dscverify.1 --- devscripts-2.17.0/scripts/dscverify.1 2017-01-10 23:21:45.000000000 -0500 +++ devscripts-2.17.1/scripts/dscverify.1 2017-02-01 21:25:00.000000000 -0500 @@ -2,15 +2,15 @@ .SH NAME dscverify \- verify the validity of a Debian package .SH SYNOPSIS -\fBdscverify\fR [\fB\-\-keyring \fIkeyring\fR] ... \fIchanges_or_dsc_filename\fR ... +\fBdscverify\fR [\fB\-\-keyring \fIkeyring\fR] ... \fIchanges_or_buildinfo_or_dsc_filename\fR ... .SH DESCRIPTION \fBdscverify\fR checks that the GPG signatures on the given -\fI.changes\fR or \fI.dsc\fR files are good signatures made by keys in -the current Debian keyrings, found in the \fIdebian-keyring\fR -and \fIdebian-maintainers\fR -packages. (Additional keyrings can be specified using the +\fI.changes\fR, \fI.buildinfo\fP or \fI.dsc\fR files are good signatures +made by keys in the current Debian keyrings, found in the \fIdebian-keyring\fR +package. (Additional keyrings can be specified using the \fB--keyring\fR option any number of times.) It then checks that the -other files listed in the \fI.changes\fR or \fI.dsc\fR files have the +other files listed in the \fI.changes\fR, \fI.buildinfo\fP or \fI.dsc\fR +files have the correct sizes and checksums (MD5 plus SHA1 and SHA256 if the latter are present). The exit status is 0 if there are no problems and non-zero otherwise. @@ -28,7 +28,8 @@ .TP \fB\-\-nosigcheck\fR, \fB\-\-no\-sig\-check\fR, \fB-u\fR Skip the signature verification step. That is, only verify the sizes and -checksums of the files listed in the \fI.changes\fR or \fI.dsc\fR files. +checksums of the files listed in the \fI.changes\fR, \fI.buildinfo\fP or +\fI.dsc\fR files. .TP \fB\-\-verbose\fR Do not suppress GPG output. diff -Nru devscripts-2.17.0/scripts/dscverify.pl devscripts-2.17.1/scripts/dscverify.pl --- devscripts-2.17.0/scripts/dscverify.pl 2017-01-10 23:21:45.000000000 -0500 +++ devscripts-2.17.1/scripts/dscverify.pl 2017-02-01 21:25:00.000000000 -0500 @@ -46,7 +46,7 @@ sub usage { print <<"EOF"; -Usage: $progname [options] dsc-or-changes-file ... +Usage: $progname [options] changes-or-buildinfo-dsc-file ... Options: --help Display this message --version Display version and copyright information --keyring <keyring> @@ -213,7 +213,7 @@ } } - my @spec = map { split /\n/ } $out =~ /^Files:\s*\n((?:[ \t]+.*\n)+)/mgi; + my @spec = map { split /\n/ } $out =~ /^(?:Checksums-Md5|Files):\s*\n((?:[ \t]+.*\n)+)/mgi; unless (@spec) { xwarn "no file spec lines in $file\n"; return; @@ -342,7 +342,7 @@ close FILE; - if ($filename =~ /\.dsc$/ && $verify_sigs) { + if ($filename =~ /\.(?:dsc|buildinfo)$/ && $verify_sigs) { $sigcheck = check_signature $filename, @rings; if ($sigcheck) { xwarn "$filename failed signature check:\n$sigcheck"; @@ -358,7 +358,7 @@ } sub main { - @ARGV or xdie "no .changes or .dsc files specified\n"; + @ARGV or xdie "no .changes, .buildinfo or .dsc files specified\n"; my @rings; @@ -416,7 +416,7 @@ 'verbose' => \$verbose, ) or do { usage; exit 1 }; - @ARGV or xdie "no .changes or .dsc files specified\n"; + @ARGV or xdie "no .changes, .buildinfo or .dsc files specified\n"; @rings = get_rings @rings if $use_default_keyrings and $verify_sigs; diff -Nru devscripts-2.17.0/scripts/uscan.pl devscripts-2.17.1/scripts/uscan.pl --- devscripts-2.17.0/scripts/uscan.pl 2017-01-10 23:21:45.000000000 -0500 +++ devscripts-2.17.1/scripts/uscan.pl 2017-02-01 21:25:00.000000000 -0500 @@ -1088,7 +1088,7 @@ version=4 opts="pgpmode=none" \ https://pypi.python.org/pypi/cfn-sphere/ \ - https://pypi.python.org/packages/source/c/cfn-sphere/\ + https://pypi.python.org/packages/.*/.*/.*/\ cfn-sphere-([\d\.]+).tar.gz#.* debian uupdate =head2 code.google.com diff -Nru devscripts-2.17.0/test/test_package_lifecycle devscripts-2.17.1/test/test_package_lifecycle --- devscripts-2.17.0/test/test_package_lifecycle 2017-01-10 23:21:45.000000000 -0500 +++ devscripts-2.17.1/test/test_package_lifecycle 2017-02-01 21:25:00.000000000 -0500 @@ -100,6 +100,8 @@ eval "${COMMAND} $param" 2> ${stderrF} | \ grep -v File::FcntlLock | \ grep -v '^ *dh_' | \ + grep -v '^dh_gencontrol debug symbol wrapper:' | \ + grep -v '^ *create-stamp debian/debhelper' | \ sed -e "s/\`/'/g" | \ sed -e "s/^dpkg-buildpackage: info: /dpkg-buildpackage: /g" | \ sed -e "s/^dpkg-genchanges: info: /dpkg-genchanges: /g" | \ @@ -118,7 +120,7 @@ test_debuild() { export GNUPGHOME=$GPGHOME cd ${WORKDIR}/package_lifecycle/test - COMMAND='debuild --no-conf --no-lintian --preserve-envvar=PATH --preserve-envvar=PERL5LIB --preserve-envvar=DEBFULLNAME --preserve-envvar=DEBEMAIL --preserve-envvar=GNUPGHOME' + COMMAND='debuild --no-conf --no-lintian --preserve-envvar=PATH --preserve-envvar=PERL5LIB --preserve-envvar=DEBFULLNAME --preserve-envvar=DEBEMAIL --preserve-envvar=GNUPGHOME --set-envvar=NO_PKG_MANGLE=1' cat > ${WORKDIR}/package_lifecycle/debuild.txt <<-EOS dpkg-buildpackage -us -uc dpkg-buildpackage: source package test @@ -220,7 +222,7 @@ -- Testophilus Testownik <tes...@testity.org> EOS - runCommand "-i 'new killer app functionality'" "" "" 0 + runCommand "-iU 'new killer app functionality'" "" "" 0 COMMAND=cat runCommandOutCmpFile "debian/changelog" "../debchange.txt" "" 0 cd ${WORKDIR} @@ -244,7 +246,7 @@ test_debuild2() { export GNUPGHOME=$GPGHOME cd ${WORKDIR}/package_lifecycle/test - COMMAND='debuild --no-conf --no-lintian --preserve-envvar=PATH --preserve-envvar=PERL5LIB --preserve-envvar=DEBFULLNAME --preserve-envvar=DEBEMAIL --preserve-envvar=GNUPGHOME' + COMMAND='debuild --no-conf --no-lintian --preserve-envvar=PATH --preserve-envvar=PERL5LIB --preserve-envvar=DEBFULLNAME --preserve-envvar=DEBEMAIL --preserve-envvar=GNUPGHOME --set-envvar=NO_PKG_MANGLE=1' cat > ${WORKDIR}/package_lifecycle/debuild.txt <<-EOS dpkg-buildpackage -us -uc dpkg-buildpackage: source package test
