Bug#857007: unblock: devscripts/2.17.2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package devscripts
devscripts (2.17.2) unstable; urgency=medium
[ James McCoy ]
* deb-reversion:
+ Correct parsing of long-form --new-version switch. (Closes: #853919)
* grep-excuses:
+ Improve robustness of HTML parsing to avoid issues like #856104, until
grep-excuses is converted to consume YAML.
* debsign:
+ Add support for *.buildinfo files. Thanks to Ximin Luo and Guillem
Jover for the patches! (Closes: #855282)
* debian/tests/control: Add mozilla-devscripts to Depends, as needed by
mk-origtargz's tests.
[ Antonio Terceiro ]
* rc-alert:
+ Add bug URL to the output.
[ Guillem Jover ]
* wrap-and-sort:
+ Deal with Build-Conflicts-{Arch,Indep}, Build-Depends-Arch and
Built-Using fields. (Closes: #855433)
[ Mattia Rizzolo ]
* Remove Ryan Niebur from Uploaders after a request from the MIA Team.
Thank you for all your past contributions! (Closes: #856374)
-- James McCoy <jamessan@debian.org> Sun, 05 Mar 2017 22:23:37 -0500
#853919, #855433, and #856104 are minor fixes, both in impact and churn.
The latter, in particular, is just preventative since britney has been
fixed.
#855282 is a fair amount of churn, but I think having buildinfo support
is important for Stretch. Adrian Bunk also noted[0] that debarchiver
was rejecting package uploads signed by debsign since dscverify's
support for buildinfo was uploaded in 2.17.1.
The individual commits may be easier to review:
- https://anonscm.debian.org/git/collab-maint/devscripts.git/log/?id=e1a18a8f..1a3304ab
- https://anonscm.debian.org/git/collab-maint/devscripts.git/log/?id=51b5e50e
The debdiff is attached.
unblock devscripts/2.17.2
[0]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=855282#42
-- 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.1 devscripts-2.17.2
debian/changelog | 29 ++
debian/control | 3
debian/tests/control | 2
po4a/po/de.po | 232 +++++++++++++------
po4a/po/devscripts.pot | 112 ++++-----
po4a/po/fr.po | 206 +++++++++++------
scripts/deb-reversion.sh | 2
scripts/debsign.1 | 64 ++---
scripts/debsign.bash_completion | 1
scripts/debsign.sh | 484 +++++++++++++++++++++++++---------------
scripts/dscverify.pl | 8
scripts/grep-excuses.pl | 4
scripts/rc-alert.pl | 1
scripts/wrap-and-sort | 4
test/test_package_lifecycle | 48 +++
15 files changed, 784 insertions(+), 416 deletions(-)
diff -Nru devscripts-2.17.1/debian/changelog devscripts-2.17.2/debian/changelog
--- devscripts-2.17.1/debian/changelog 2017-02-01 21:25:00.000000000 -0500
+++ devscripts-2.17.2/debian/changelog 2017-03-05 22:23:37.000000000 -0500
@@ -1,3 +1,32 @@
+devscripts (2.17.2) unstable; urgency=medium
+
+ [ James McCoy ]
+ * deb-reversion:
+ + Correct parsing of long-form --new-version switch. (Closes: #853919)
+ * grep-excuses:
+ + Improve robustness of HTML parsing to avoid issues like #856104, until
+ grep-excuses is converted to consume YAML.
+ * debsign:
+ + Add support for *.buildinfo files. Thanks to Ximin Luo and Guillem
+ Jover for the patches! (Closes: #855282)
+ * debian/tests/control: Add mozilla-devscripts to Depends, as needed by
+ mk-origtargz's tests.
+
+ [ Antonio Terceiro ]
+ * rc-alert:
+ + Add bug URL to the output.
+
+ [ Guillem Jover ]
+ * wrap-and-sort:
+ + Deal with Build-Conflicts-{Arch,Indep}, Build-Depends-Arch and
+ Built-Using fields. (Closes: #855433)
+
+ [ Mattia Rizzolo ]
+ * Remove Ryan Niebur from Uploaders after a request from the MIA Team.
+ Thank you for all your past contributions! (Closes: #856374)
+
+ -- James McCoy <jamessan@debian.org> Sun, 05 Mar 2017 22:23:37 -0500
+
devscripts (2.17.1) unstable; urgency=medium
[ Osamu Aoki ]
diff -Nru devscripts-2.17.1/debian/control devscripts-2.17.2/debian/control
--- devscripts-2.17.1/debian/control 2017-02-01 21:25:00.000000000 -0500
+++ devscripts-2.17.2/debian/control 2017-03-05 22:23:37.000000000 -0500
@@ -5,7 +5,6 @@
Uploaders: James McCoy <jamessan@debian.org>,
Martin Zobel-Helas <zobel@debian.org>,
Patrick Schoenfeld <schoenfeld@debian.org>,
- Ryan Niebur <ryanryan52@gmail.com>,
Benjamin Drung <bdrung@debian.org>
Standards-Version: 3.9.8
Build-Depends: bash-completion,
@@ -40,7 +39,7 @@
xz-utils,
zip
Testsuite: autopkgtest
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/devscripts.git
+Vcs-Browser: https://anonscm.debian.org/git/collab-maint/devscripts.git
Vcs-Git: https://anonscm.debian.org/git/collab-maint/devscripts.git
Package: devscripts
diff -Nru devscripts-2.17.1/debian/tests/control devscripts-2.17.2/debian/tests/control
--- devscripts-2.17.1/debian/tests/control 2017-02-01 21:25:00.000000000 -0500
+++ devscripts-2.17.2/debian/tests/control 2017-03-05 22:23:37.000000000 -0500
@@ -1,3 +1,3 @@
Tests: shunit2
-Depends: devscripts, libdistro-info-perl, zip, shunit2, gcc, build-essential
+Depends: devscripts, libdistro-info-perl, zip, shunit2, gcc, build-essential, mozilla-devscripts
Restrictions: allow-stderr needs-recommends
diff -Nru devscripts-2.17.1/po4a/po/de.po devscripts-2.17.2/po4a/po/de.po
--- devscripts-2.17.1/po4a/po/de.po 2017-02-01 21:25:00.000000000 -0500
+++ devscripts-2.17.2/po4a/po/de.po 2017-03-05 22:23:37.000000000 -0500
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: devscripts 2.16.4\n"
"Report-Msgid-Bugs-To: devscripts@packages.debian.org\n"
-"POT-Creation-Date: 2017-02-02 02:29+0000\n"
+"POT-Creation-Date: 2017-03-06 03:32+0000\n"
"PO-Revision-Date: 2016-09-25 18:56+0200\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: de <debian-l10n-german@lists.debian.org>\n"
@@ -251,7 +251,7 @@
#. 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/debsign.1:102 ../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
@@ -340,7 +340,7 @@
#: ../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/debrsign.1:66 ../scripts/debsign.1:132 ../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
@@ -391,7 +391,7 @@
#: ../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/debrsign.1:70 ../scripts/debsign.1:144 ../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
@@ -1248,7 +1248,7 @@
#: ../scripts/bts.pl:448 ../scripts/cvs-debrelease.1:57
#: ../scripts/cvs-debuild.1:38 ../scripts/debc.1:88 ../scripts/debchange.1:377
#: ../scripts/debclean.1:80 ../scripts/debdiff.1:154 ../scripts/debi.1:102
-#: ../scripts/debrelease.1:95 ../scripts/debsign.1:96 ../scripts/debuild.1:256
+#: ../scripts/debrelease.1:95 ../scripts/debsign.1:95 ../scripts/debuild.1:256
#: ../scripts/dpkg-depcheck.1:92 ../scripts/dscverify.1:24
#: ../scripts/grep-excuses.1:15 ../scripts/mass-bug.pl:112
#: ../scripts/nmudiff.1:69 ../scripts/rmadison.pl:313 ../scripts/uscan.pl:1213
@@ -1260,7 +1260,7 @@
#. type: Plain text
#: ../scripts/bts.pl:450 ../scripts/cvs-debrelease.1:61 ../scripts/debc.1:92
#: ../scripts/debchange.1:381 ../scripts/debclean.1:84 ../scripts/debdiff.1:158
-#: ../scripts/debi.1:106 ../scripts/debrelease.1:99 ../scripts/debsign.1:100
+#: ../scripts/debi.1:106 ../scripts/debrelease.1:99 ../scripts/debsign.1:99
#: ../scripts/debuild.1:260 ../scripts/dpkg-depcheck.1:96
#: ../scripts/dscverify.1:28 ../scripts/grep-excuses.1:19
#: ../scripts/mass-bug.pl:114 ../scripts/nmudiff.1:73 ../scripts/uupdate.1:60
@@ -2854,7 +2854,7 @@
#: ../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/debrsign.1:57 ../scripts/debsign.1:105 ../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
@@ -3406,7 +3406,7 @@
#. 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/debrelease.1:102 ../scripts/debsign.1:102 ../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
@@ -3787,7 +3787,7 @@
#. type: TP
#: ../scripts/checkbashisms.1:24 ../scripts/debchange.1:386
-#: ../scripts/debdiff.1:164 ../scripts/debrelease.1:99 ../scripts/debsign.1:100
+#: ../scripts/debdiff.1:164 ../scripts/debrelease.1:99 ../scripts/debsign.1:99
#: ../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
@@ -6529,7 +6529,7 @@
#. type: Plain text
#: ../scripts/debc.1:101 ../scripts/debchange.1:398 ../scripts/debclean.1:99
#: ../scripts/debi.1:115 ../scripts/debrelease.1:111 ../scripts/debrsign.1:63
-#: ../scripts/debsign.1:112 ../scripts/nmudiff.1:85
+#: ../scripts/debsign.1:111 ../scripts/nmudiff.1:85
#: ../scripts/pts-subscribe.1:48 ../scripts/uupdate.1:113
#: ../scripts/who-uploads.1:56
msgid ""
@@ -6548,7 +6548,7 @@
#. type: TP
#: ../scripts/debc.1:101 ../scripts/debdiff.1:220 ../scripts/debi.1:115
-#: ../scripts/debrelease.1:116 ../scripts/debsign.1:124
+#: ../scripts/debrelease.1:116 ../scripts/debsign.1:123
#, no-wrap
msgid "B<DEBRELEASE_DEBS_DIR>"
msgstr "B<DEBRELEASE_DEBS_DIR>"
@@ -7662,7 +7662,7 @@
#. type: Plain text
#: ../scripts/debchange.1:392 ../scripts/debclean.1:93
-#: ../scripts/debrelease.1:105 ../scripts/debsign.1:106
+#: ../scripts/debrelease.1:105 ../scripts/debsign.1:105
#: ../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
@@ -8908,7 +8908,7 @@
"ist I<no>."
#. type: TP
-#: ../scripts/debcommit.pl:134 ../scripts/debsign.1:118
+#: ../scripts/debcommit.pl:134 ../scripts/debsign.1:117
#, no-wrap
msgid "B<DEBSIGN_KEYID>"
msgstr "B<DEBSIGN_KEYID>"
@@ -11051,7 +11051,7 @@
msgstr "B<debsign>(1), B<dpkg-architecture>(1) und B<ssh>(1)"
#. type: Plain text
-#: ../scripts/debrsign.1:72 ../scripts/debsign.1:148
+#: ../scripts/debrsign.1:72 ../scripts/debsign.1:146
msgid ""
"This program was written by Julian Gilbey E<lt>jdg@debian.orgE<gt> and is "
"copyright under the GPL, version 2 or later."
@@ -11079,15 +11079,24 @@
"B<debsign> [I<Optionen>] [I<Changes-Datei>|I<Dsc-Datei>|I<Befehlsdatei> …]"
#. type: Plain text
-#: ../scripts/debsign.1:16
+#: ../scripts/debsign.1:14
+#, fuzzy
+#| msgid ""
+#| "B<debsign> mimics the signing aspects (and bugs) of B<dpkg-"
+#| "buildpackage>(1). It takes either an unsigned I<.dsc> file or an "
+#| "unsigned I<.changes> file (along with the associated unsigned I<.dsc> "
+#| "file found by replacing the architecture name and I<.changes> by I<.dsc> "
+#| "if it appears in the I<.changes> file), and signs them using the GNU "
+#| "Privacy Guard. It is careful to calculate the size and checksums of the "
+#| "newly signed I<.dsc> file and replace the original values in the I<."
+#| "changes> file."
msgid ""
"B<debsign> mimics the signing aspects (and bugs) of B<dpkg-"
-"buildpackage>(1). It takes either an unsigned I<.dsc> file or an unsigned "
-"I<.changes> file (along with the associated unsigned I<.dsc> file found by "
-"replacing the architecture name and I<.changes> by I<.dsc> if it appears in "
-"the I<.changes> file), and signs them using the GNU Privacy Guard. It is "
-"careful to calculate the size and checksums of the newly signed I<.dsc> file "
-"and replace the original values in the I<.changes> file."
+"buildpackage>(1). It takes a I<.dsc>, I<.buildinfo>, or I<.changes> file "
+"and signs it, and any child I<.dsc>, I<.buildinfo>, or I<.changes> files "
+"directly or indirectly referenced by it, using the GNU Privacy Guard. It is "
+"careful to calculate the size and checksums of any newly signed child files "
+"and replace the original values in the parent file."
msgstr ""
"B<debsign> ahmt die Signierungsgesichtspunkte (und Fehler) von B<dpkg-"
"buildpackage>(1) nach. Es nimmt entweder eine nicht signierte I<.dsc>-Datei "
@@ -11099,19 +11108,23 @@
"Originalwerte in der I<.changes>-Datei zu ersetzen."
#. type: Plain text
-#: ../scripts/debsign.1:21
+#: ../scripts/debsign.1:18
+#, fuzzy
+#| msgid ""
+#| "If a I<.changes> or I<.dsc> file is specified, it is signed, otherwise, "
+#| "I<debian/changelog> is parsed to determine the name of the I<.changes> "
+#| "file to look for in the parent directory."
msgid ""
-"If a I<.changes>, I<.dsc> or I<.commands> file is specified, it is signed, "
-"otherwise, I<debian/changelog> is parsed to determine the name of the I<."
-"changes> file to look for in the parent directory."
+"If no file is specified, I<debian/changelog> is parsed to determine the name "
+"of the I<.changes> file to look for in the parent directory."
msgstr ""
-"Falls eine I<.changes>-, I<.dsc>- oder I<.commands>-Datei angegeben wurde, "
-"wird sie signiert, andernfalls wird I<debian/changelog> ausgewertet, um den "
-"Namen der I<.changes>-Datei zu bestimmen, nach der im übergeordneten "
-"Verzeichnis gesucht werden soll."
+"Falls eine I<.changes>- oder I<.dsc>-Datei angegeben wurde, wird sie "
+"signiert, andernfalls wird I<debian/changelog> ausgewertet, um den Namen der "
+"I<.changes>-Datei zu bestimmen, nach der im übergeordneten Verzeichnis "
+"gesucht werden soll."
#. type: Plain text
-#: ../scripts/debsign.1:25
+#: ../scripts/debsign.1:22
msgid ""
"If a I<.commands> file is specified it is first validated (see the details "
"at I<ftp://ftp.upload.debian.org/pub/UploadQueue/README>), and the name "
@@ -11124,16 +11137,30 @@
#. type: Plain text
#: ../scripts/debsign.1:36
+#, fuzzy
+#| msgid ""
+#| "This utility is useful if a developer must build a package on one machine "
+#| "where it is unsafe to sign it; they need then only transfer the small I<."
+#| "dsc> and I<.changes> files to a safe machine and then use the B<debsign> "
+#| "program to sign them before transferring them back. This process can be "
+#| "automated in two ways. If the files to be signed live on the B<remote> "
+#| "machine, the B<-r> option may be used to copy them to the local machine "
+#| "and back again after signing. If the files live on the B<local> machine, "
+#| "then they may be transferred to the remote machine for signing using "
+#| "B<debrsign>(1)."
msgid ""
"This utility is useful if a developer must build a package on one machine "
"where it is unsafe to sign it; they need then only transfer the small I<."
-"dsc> and I<.changes> files to a safe machine and then use the B<debsign> "
-"program to sign them before transferring them back. This process can be "
-"automated in two ways. If the files to be signed live on the B<remote> "
-"machine, the B<-r> option may be used to copy them to the local machine and "
-"back again after signing. If the files live on the B<local> machine, then "
-"they may be transferred to the remote machine for signing using "
-"B<debrsign>(1)."
+"dsc>, I<.buildinfo> and I<.changes> files to a safe machine and then use the "
+"B<debsign> program to sign them before transferring them back. This process "
+"can be automated in two ways. If the files to be signed live on the "
+"B<remote> machine, the B<-r> option may be used to copy them to the local "
+"machine and back again after signing. If the files live on the B<local> "
+"machine, then they may be transferred to the remote machine for signing "
+"using B<debrsign>(1). However note that it is probably safer to have your "
+"trusted signing machine use B<debsign> to connect to the untrusted non-"
+"signing machine, rather than using B<debrsign> to make the connection in the "
+"reverse direction."
msgstr ""
"Dieses Hilfswerkzeug ist nützlich, falls ein Entwickler ein Paket auf einem "
"Rechner bauen muss, der nicht sicher genug ist, um es zu signieren; er muss "
@@ -11163,12 +11190,20 @@
#. type: Plain text
#: ../scripts/debsign.1:48
-msgid ""
-"The I<.changes> and I<.dsc> files live on the specified remote host. In "
-"this case, a I<.changes> file must be explicitly named, with an absolute "
-"directory or one relative to the remote home directory. B<scp> will be used "
-"for the copying. The [I<username>B<@>]I<remotehost>B<:>I<changes> syntax is "
-"permitted as an alternative. Wildcards (B<*> etc.) are allowed."
+#, fuzzy
+#| msgid ""
+#| "The I<.changes> and I<.dsc> files live on the specified remote host. In "
+#| "this case, a I<.changes> file must be explicitly named, with an absolute "
+#| "directory or one relative to the remote home directory. B<scp> will be "
+#| "used for the copying. The [I<username>B<@>]I<remotehost>B<:>I<changes> "
+#| "syntax is permitted as an alternative. Wildcards (B<*> etc.) are allowed."
+msgid ""
+"The files to be signed live on the specified remote host. In this case, a "
+"I<.dsc>, I<.buildinfo> or I<.changes> file must be explicitly named, with an "
+"absolute directory or one relative to the remote home directory. B<scp> "
+"will be used for the copying. The [I<username>B<@>]I<remotehost>B<:"
+">I<filename> syntax is permitted as an alternative. Wildcards (B<*> etc.) "
+"are allowed."
msgstr ""
"Die I<.changes>- und I<.dsc>-Dateien liegen auf dem angegebenen Rechner. In "
"diesem Fall muss explizit eine I<.changes>-Datei mit einem absoluten Pfad "
@@ -11281,52 +11316,56 @@
msgstr "B<--debs-dir> I<VERZ>"
#. type: Plain text
-#: ../scripts/debsign.1:96
-msgid ""
-"Look for the I<.changes> and I<.dsc> files in directory I<DIR> instead of "
-"the parent of the source directory. This should either be an absolute path "
-"or relative to the top of the source directory."
+#: ../scripts/debsign.1:95
+#, fuzzy
+#| msgid ""
+#| "Look for the I<.dsc> files in I<directory> instead of the parent of the "
+#| "source directory. This should either be an absolute path or relative to "
+#| "the top of the source directory."
+msgid ""
+"Look for the files to be signed in directory I<DIR> instead of the parent of "
+"the source directory. This should either be an absolute path or relative to "
+"the top of the source directory."
msgstr ""
-"sucht im Verzeichnis I<VERZ> nach den I<.changes>- und I<.dsc>-Dateien "
-"anstatt im übergeordneten Verzeichnis des Quellverzeichnisses. Dies sollte "
-"entweder ein absoluter Pfad oder relativ zur Wurzel des Quellverzeichnisses "
-"sein."
+"sucht nach I<.dsc>-Dateien in I<Verzeichnis> statt im übergeordneten "
+"Verzeichnis des Quellverzeichnisses. Dies sollte entweder ein absoluter Pfad "
+"oder relativ zur Wurzel des Quellverzeichnisses sein."
#. type: TP
-#: ../scripts/debsign.1:112
+#: ../scripts/debsign.1:111
#, no-wrap
msgid "B<DEBSIGN_PROGRAM>"
msgstr "B<DEBSIGN_PROGRAM>"
#. type: Plain text
-#: ../scripts/debsign.1:115
+#: ../scripts/debsign.1:114
msgid "Setting this is equivalent to giving a B<-p> option."
msgstr "Diese Einstellung entspricht der Angabe der Option B<-p>."
#. type: TP
-#: ../scripts/debsign.1:115
+#: ../scripts/debsign.1:114
#, no-wrap
msgid "B<DEBSIGN_MAINT>"
msgstr "B<DEBSIGN_MAINT>"
#. type: Plain text
-#: ../scripts/debsign.1:118
+#: ../scripts/debsign.1:117
msgid "This is the B<-m> option."
msgstr "Dies ist die Option B<-m>."
#. type: Plain text
-#: ../scripts/debsign.1:121
+#: ../scripts/debsign.1:120
msgid "And this is the B<-k> option."
msgstr "Und dies ist die Option B<-k>."
#. type: TP
-#: ../scripts/debsign.1:121
+#: ../scripts/debsign.1:120
#, no-wrap
msgid "B<DEBSIGN_ALWAYS_RESIGN>"
msgstr "B<DEBSIGN_ALWAYS_RESIGN>"
#. type: Plain text
-#: ../scripts/debsign.1:124
+#: ../scripts/debsign.1:123
msgid ""
"Always re-sign files even if they are already signed, without prompting."
msgstr ""
@@ -11334,25 +11373,33 @@
"sind."
#. type: Plain text
-#: ../scripts/debsign.1:134
-msgid ""
-"This specifies the directory in which to look for the I<.changes> and I<."
-"dsc> files, and is either an absolute path or relative to the top of the "
-"source tree. This corresponds to the B<--debs-dir> command line option. "
-"This directive could be used, for example, if you always use B<pbuilder> or "
-"B<svn-buildpackage> to build your packages. Note that it also affects "
+#: ../scripts/debsign.1:132
+#, fuzzy
+#| msgid ""
+#| "This specifies the directory in which to look for the I<.dsc> and files, "
+#| "and is either an absolute path or relative to the top of the source "
+#| "tree. This corresponds to the B<--debs-dir> command line option. This "
+#| "directive could be used, for example, if you always use B<pbuilder> or "
+#| "B<svn-buildpackage> to build your packages. Note that it also affects "
+#| "B<debrelease>(1) in the same way, hence the strange name of the option."
+msgid ""
+"This specifies the directory in which to look for the files to be signed, "
+"and is either an absolute path or relative to the top of the source tree. "
+"This corresponds to the B<--debs-dir> command line option. This directive "
+"could be used, for example, if you always use B<pbuilder> or B<svn-"
+"buildpackage> to build your packages. Note that it also affects "
"B<debrelease>(1) in the same way, hence the strange name of the option."
msgstr ""
-"Dies gibt das Verzeichnis an, in dem nach den I<.changes>- und I<.dsc>-"
-"Dateien gesucht werden soll. Es ist entweder ein absoluter Pfad oder relativ "
-"zur obersten Ebene des Quellverzeichnisbaums. Dies entspricht der "
-"Befehlszeilenoption B<--debs-dir>. Diese Direktive kann zum Beispiel benutzt "
-"werden, falls Sie immer B<pbuilder> oder B<svn-buildpackage> verwenden, um "
-"Ihre Pakete zu bauen. Beachten Sie, dass es außerdem B<debrelease>(1) auf "
-"die gleiche Weise beeinflusst, daher der merkwürdige Name der Option."
+"Dies gibt das Verzeichnis an, in dem nach den I<.dsc>-Dateien gesucht werden "
+"soll. Es ist entweder ein absoluter Pfad oder relativ zur obersten Ebene des "
+"Quellverzeichnisbaums. Dies entspricht der Befehlszeilenoption B<--debs-"
+"dir>. Diese Direktive kann zum Beispiel benutzt werden, falls Sie immer "
+"B<pbuilder> oder B<svn-buildpackage> verwenden, um Ihre Pakete zu bauen. "
+"Beachten Sie, dass es außerdem B<debrelease>(1) auf die gleiche Weise "
+"beeinflusst, daher der merkwürdige Name der Option."
#. type: Plain text
-#: ../scripts/debsign.1:146
+#: ../scripts/debsign.1:144
msgid ""
"B<debrsign>(1), B<debuild>(1), B<dpkg-architecture>(1), B<dpkg-"
"buildpackage>(1), B<gpg>(1), B<gpg2>(1), B<md5sum>(1), B<sha1sum>(1), "
@@ -25025,6 +25072,43 @@
"Paketbetreuer Julian Gilbey E<lt>jdg@debian.orgE<gt> geschrieben."
#~ msgid ""
+#~ "If a I<.changes>, I<.dsc> or I<.commands> file is specified, it is "
+#~ "signed, otherwise, I<debian/changelog> is parsed to determine the name of "
+#~ "the I<.changes> file to look for in the parent directory."
+#~ msgstr ""
+#~ "Falls eine I<.changes>-, I<.dsc>- oder I<.commands>-Datei angegeben "
+#~ "wurde, wird sie signiert, andernfalls wird I<debian/changelog> "
+#~ "ausgewertet, um den Namen der I<.changes>-Datei zu bestimmen, nach der im "
+#~ "übergeordneten Verzeichnis gesucht werden soll."
+
+#~ msgid ""
+#~ "Look for the I<.changes> and I<.dsc> files in directory I<DIR> instead of "
+#~ "the parent of the source directory. This should either be an absolute "
+#~ "path or relative to the top of the source directory."
+#~ msgstr ""
+#~ "sucht im Verzeichnis I<VERZ> nach den I<.changes>- und I<.dsc>-Dateien "
+#~ "anstatt im übergeordneten Verzeichnis des Quellverzeichnisses. Dies "
+#~ "sollte entweder ein absoluter Pfad oder relativ zur Wurzel des "
+#~ "Quellverzeichnisses sein."
+
+#~ msgid ""
+#~ "This specifies the directory in which to look for the I<.changes> and I<."
+#~ "dsc> files, and is either an absolute path or relative to the top of the "
+#~ "source tree. This corresponds to the B<--debs-dir> command line option. "
+#~ "This directive could be used, for example, if you always use B<pbuilder> "
+#~ "or B<svn-buildpackage> to build your packages. Note that it also affects "
+#~ "B<debrelease>(1) in the same way, hence the strange name of the option."
+#~ msgstr ""
+#~ "Dies gibt das Verzeichnis an, in dem nach den I<.changes>- und I<.dsc>-"
+#~ "Dateien gesucht werden soll. Es ist entweder ein absoluter Pfad oder "
+#~ "relativ zur obersten Ebene des Quellverzeichnisbaums. Dies entspricht der "
+#~ "Befehlszeilenoption B<--debs-dir>. Diese Direktive kann zum Beispiel "
+#~ "benutzt werden, falls Sie immer B<pbuilder> oder B<svn-buildpackage> "
+#~ "verwenden, um Ihre Pakete zu bauen. Beachten Sie, dass es außerdem "
+#~ "B<debrelease>(1) auf die gleiche Weise beeinflusst, daher der merkwürdige "
+#~ "Name der Option."
+
+#~ msgid ""
#~ "Finally, only B<dpkg-buildpackage-hook> and the hooks from B<lintian-"
#~ "hook> onwards can be used if B<dpkg-cross> is installed. (This is "
#~ "because internally, B<debuild> reimplements B<dpkg-buildpackage>, but it "
diff -Nru devscripts-2.17.1/po4a/po/devscripts.pot devscripts-2.17.2/po4a/po/devscripts.pot
--- devscripts-2.17.1/po4a/po/devscripts.pot 2017-02-01 21:25:00.000000000 -0500
+++ devscripts-2.17.2/po4a/po/devscripts.pot 2017-03-05 22:23:37.000000000 -0500
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-02-02 02:29+0000\n"
+"POT-Creation-Date: 2017-03-06 03:32+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@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:40 ../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:102 ../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: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
+#: ../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:132 ../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: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
+#: ../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:144 ../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 ""
@@ -833,13 +833,13 @@
msgstr ""
#. type: TP
-#: ../scripts/bts.pl:448 ../scripts/cvs-debrelease.1:57 ../scripts/cvs-debuild.1:38 ../scripts/debc.1:88 ../scripts/debchange.1:377 ../scripts/debclean.1:80 ../scripts/debdiff.1:154 ../scripts/debi.1:102 ../scripts/debrelease.1:95 ../scripts/debsign.1:96 ../scripts/debuild.1:256 ../scripts/dpkg-depcheck.1:92 ../scripts/dscverify.1:24 ../scripts/grep-excuses.1:15 ../scripts/mass-bug.pl:112 ../scripts/nmudiff.1:69 ../scripts/rmadison.pl:313 ../scripts/uscan.pl:1213 ../scripts/uupdate.1:56 ../scripts/who-uploads.1:40
+#: ../scripts/bts.pl:448 ../scripts/cvs-debrelease.1:57 ../scripts/cvs-debuild.1:38 ../scripts/debc.1:88 ../scripts/debchange.1:377 ../scripts/debclean.1:80 ../scripts/debdiff.1:154 ../scripts/debi.1:102 ../scripts/debrelease.1:95 ../scripts/debsign.1:95 ../scripts/debuild.1:256 ../scripts/dpkg-depcheck.1:92 ../scripts/dscverify.1:24 ../scripts/grep-excuses.1:15 ../scripts/mass-bug.pl:112 ../scripts/nmudiff.1:69 ../scripts/rmadison.pl:313 ../scripts/uscan.pl:1213 ../scripts/uupdate.1:56 ../scripts/who-uploads.1:40
#, no-wrap
msgid "B<--no-conf>, B<--noconf>"
msgstr ""
#. type: Plain text
-#: ../scripts/bts.pl:450 ../scripts/cvs-debrelease.1:61 ../scripts/debc.1:92 ../scripts/debchange.1:381 ../scripts/debclean.1:84 ../scripts/debdiff.1:158 ../scripts/debi.1:106 ../scripts/debrelease.1:99 ../scripts/debsign.1:100 ../scripts/debuild.1:260 ../scripts/dpkg-depcheck.1:96 ../scripts/dscverify.1:28 ../scripts/grep-excuses.1:19 ../scripts/mass-bug.pl:114 ../scripts/nmudiff.1:73 ../scripts/uupdate.1:60 ../scripts/who-uploads.1:44
+#: ../scripts/bts.pl:450 ../scripts/cvs-debrelease.1:61 ../scripts/debc.1:92 ../scripts/debchange.1:381 ../scripts/debclean.1:84 ../scripts/debdiff.1:158 ../scripts/debi.1:106 ../scripts/debrelease.1:99 ../scripts/debsign.1:99 ../scripts/debuild.1:260 ../scripts/dpkg-depcheck.1:96 ../scripts/dscverify.1:28 ../scripts/grep-excuses.1:19 ../scripts/mass-bug.pl:114 ../scripts/nmudiff.1:73 ../scripts/uupdate.1:60 ../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."
@@ -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: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
+#: ../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:105 ../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: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
+#: ../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:102 ../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: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
+#: ../scripts/checkbashisms.1:24 ../scripts/debchange.1:386 ../scripts/debdiff.1:164 ../scripts/debrelease.1:99 ../scripts/debsign.1:99 ../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 ""
@@ -5021,7 +5021,7 @@
msgstr ""
#. type: Plain text
-#: ../scripts/debc.1:101 ../scripts/debchange.1:398 ../scripts/debclean.1:99 ../scripts/debi.1:115 ../scripts/debrelease.1:111 ../scripts/debrsign.1:63 ../scripts/debsign.1:112 ../scripts/nmudiff.1:85 ../scripts/pts-subscribe.1:48 ../scripts/uupdate.1:113 ../scripts/who-uploads.1:56
+#: ../scripts/debc.1:101 ../scripts/debchange.1:398 ../scripts/debclean.1:99 ../scripts/debi.1:115 ../scripts/debrelease.1:111 ../scripts/debrsign.1:63 ../scripts/debsign.1:111 ../scripts/nmudiff.1:85 ../scripts/pts-subscribe.1:48 ../scripts/uupdate.1:113 ../scripts/who-uploads.1:56
msgid ""
"The two configuration files I</etc/devscripts.conf> and I<~/.devscripts> are "
"sourced in that order to set configuration variables. Command line options "
@@ -5031,7 +5031,7 @@
msgstr ""
#. type: TP
-#: ../scripts/debc.1:101 ../scripts/debdiff.1:220 ../scripts/debi.1:115 ../scripts/debrelease.1:116 ../scripts/debsign.1:124
+#: ../scripts/debc.1:101 ../scripts/debdiff.1:220 ../scripts/debi.1:115 ../scripts/debrelease.1:116 ../scripts/debsign.1:123
#, no-wrap
msgid "B<DEBRELEASE_DEBS_DIR>"
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:43 ../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:105 ../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 ""
@@ -6811,7 +6811,7 @@
msgstr ""
#. type: TP
-#: ../scripts/debcommit.pl:134 ../scripts/debsign.1:118
+#: ../scripts/debcommit.pl:134 ../scripts/debsign.1:117
#, no-wrap
msgid "B<DEBSIGN_KEYID>"
msgstr ""
@@ -8514,7 +8514,7 @@
msgstr ""
#. type: Plain text
-#: ../scripts/debrsign.1:72 ../scripts/debsign.1:148
+#: ../scripts/debrsign.1:72 ../scripts/debsign.1:146
msgid ""
"This program was written by Julian Gilbey E<lt>jdg@debian.orgE<gt> and is "
"copyright under the GPL, version 2 or later."
@@ -8537,27 +8537,25 @@
msgstr ""
#. type: Plain text
-#: ../scripts/debsign.1:16
+#: ../scripts/debsign.1:14
msgid ""
"B<debsign> mimics the signing aspects (and bugs) of "
-"B<dpkg-buildpackage>(1). It takes either an unsigned I<.dsc> file or an "
-"unsigned I<.changes> file (along with the associated unsigned I<.dsc> file "
-"found by replacing the architecture name and I<.changes> by I<.dsc> if it "
-"appears in the I<.changes> file), and signs them using the GNU Privacy "
-"Guard. It is careful to calculate the size and checksums of the newly "
-"signed I<.dsc> file and replace the original values in the I<.changes> file."
+"B<dpkg-buildpackage>(1). It takes a I<.dsc>, I<.buildinfo>, or I<.changes> "
+"file and signs it, and any child I<.dsc>, I<.buildinfo>, or I<.changes> "
+"files directly or indirectly referenced by it, using the GNU Privacy "
+"Guard. It is careful to calculate the size and checksums of any newly signed "
+"child files and replace the original values in the parent file."
msgstr ""
#. type: Plain text
-#: ../scripts/debsign.1:21
+#: ../scripts/debsign.1:18
msgid ""
-"If a I<.changes>, I<.dsc> or I<.commands> file is specified, it is signed, "
-"otherwise, I<debian/changelog> is parsed to determine the name of the "
-"I<.changes> file to look for in the parent directory."
+"If no file is specified, I<debian/changelog> is parsed to determine the name "
+"of the I<.changes> file to look for in the parent directory."
msgstr ""
#. type: Plain text
-#: ../scripts/debsign.1:25
+#: ../scripts/debsign.1:22
msgid ""
"If a I<.commands> file is specified it is first validated (see the details "
"at I<ftp://ftp.upload.debian.org/pub/UploadQueue/README>), and the name "
@@ -8569,13 +8567,16 @@
msgid ""
"This utility is useful if a developer must build a package on one machine "
"where it is unsafe to sign it; they need then only transfer the small "
-"I<.dsc> and I<.changes> files to a safe machine and then use the B<debsign> "
-"program to sign them before transferring them back. This process can be "
-"automated in two ways. If the files to be signed live on the B<remote> "
-"machine, the B<-r> option may be used to copy them to the local machine and "
-"back again after signing. If the files live on the B<local> machine, then "
-"they may be transferred to the remote machine for signing using "
-"B<debrsign>(1)."
+"I<.dsc>, I<.buildinfo> and I<.changes> files to a safe machine and then use "
+"the B<debsign> program to sign them before transferring them back. This "
+"process can be automated in two ways. If the files to be signed live on the "
+"B<remote> machine, the B<-r> option may be used to copy them to the local "
+"machine and back again after signing. If the files live on the B<local> "
+"machine, then they may be transferred to the remote machine for signing "
+"using B<debrsign>(1). However note that it is probably safer to have your "
+"trusted signing machine use B<debsign> to connect to the untrusted "
+"non-signing machine, rather than using B<debrsign> to make the connection in "
+"the reverse direction."
msgstr ""
#. type: Plain text
@@ -8594,11 +8595,12 @@
#. type: Plain text
#: ../scripts/debsign.1:48
msgid ""
-"The I<.changes> and I<.dsc> files live on the specified remote host. In "
-"this case, a I<.changes> file must be explicitly named, with an absolute "
-"directory or one relative to the remote home directory. B<scp> will be used "
-"for the copying. The [I<username>B<@>]I<remotehost>B<:>I<changes> syntax is "
-"permitted as an alternative. Wildcards (B<*> etc.) are allowed."
+"The files to be signed live on the specified remote host. In this case, a "
+"I<.dsc>, I<.buildinfo> or I<.changes> file must be explicitly named, with an "
+"absolute directory or one relative to the remote home directory. B<scp> "
+"will be used for the copying. The "
+"[I<username>B<@>]I<remotehost>B<:>I<filename> syntax is permitted as an "
+"alternative. Wildcards (B<*> etc.) are allowed."
msgstr ""
#. type: TP
@@ -8685,64 +8687,64 @@
msgstr ""
#. type: Plain text
-#: ../scripts/debsign.1:96
+#: ../scripts/debsign.1:95
msgid ""
-"Look for the I<.changes> and I<.dsc> files in directory I<DIR> instead of "
-"the parent of the source directory. This should either be an absolute path "
-"or relative to the top of the source directory."
+"Look for the files to be signed in directory I<DIR> instead of the parent of "
+"the source directory. This should either be an absolute path or relative to "
+"the top of the source directory."
msgstr ""
#. type: TP
-#: ../scripts/debsign.1:112
+#: ../scripts/debsign.1:111
#, no-wrap
msgid "B<DEBSIGN_PROGRAM>"
msgstr ""
#. type: Plain text
-#: ../scripts/debsign.1:115
+#: ../scripts/debsign.1:114
msgid "Setting this is equivalent to giving a B<-p> option."
msgstr ""
#. type: TP
-#: ../scripts/debsign.1:115
+#: ../scripts/debsign.1:114
#, no-wrap
msgid "B<DEBSIGN_MAINT>"
msgstr ""
#. type: Plain text
-#: ../scripts/debsign.1:118
+#: ../scripts/debsign.1:117
msgid "This is the B<-m> option."
msgstr ""
#. type: Plain text
-#: ../scripts/debsign.1:121
+#: ../scripts/debsign.1:120
msgid "And this is the B<-k> option."
msgstr ""
#. type: TP
-#: ../scripts/debsign.1:121
+#: ../scripts/debsign.1:120
#, no-wrap
msgid "B<DEBSIGN_ALWAYS_RESIGN>"
msgstr ""
#. type: Plain text
-#: ../scripts/debsign.1:124
+#: ../scripts/debsign.1:123
msgid "Always re-sign files even if they are already signed, without prompting."
msgstr ""
#. type: Plain text
-#: ../scripts/debsign.1:134
+#: ../scripts/debsign.1:132
msgid ""
-"This specifies the directory in which to look for the I<.changes> and "
-"I<.dsc> files, and is either an absolute path or relative to the top of the "
-"source tree. This corresponds to the B<--debs-dir> command line option. "
-"This directive could be used, for example, if you always use B<pbuilder> or "
+"This specifies the directory in which to look for the files to be signed, "
+"and is either an absolute path or relative to the top of the source tree. "
+"This corresponds to the B<--debs-dir> command line option. This directive "
+"could be used, for example, if you always use B<pbuilder> or "
"B<svn-buildpackage> to build your packages. Note that it also affects "
"B<debrelease>(1) in the same way, hence the strange name of the option."
msgstr ""
#. type: Plain text
-#: ../scripts/debsign.1:146
+#: ../scripts/debsign.1:144
msgid ""
"B<debrsign>(1), B<debuild>(1), B<dpkg-architecture>(1), "
"B<dpkg-buildpackage>(1), B<gpg>(1), B<gpg2>(1), B<md5sum>(1), B<sha1sum>(1), "
diff -Nru devscripts-2.17.1/po4a/po/fr.po devscripts-2.17.2/po4a/po/fr.po
--- devscripts-2.17.1/po4a/po/fr.po 2017-02-01 21:25:00.000000000 -0500
+++ devscripts-2.17.2/po4a/po/fr.po 2017-03-05 22:23:37.000000000 -0500
@@ -12,7 +12,7 @@
msgid ""
msgstr ""
"Project-Id-Version: devscripts\n"
-"POT-Creation-Date: 2017-02-02 02:29+0000\n"
+"POT-Creation-Date: 2017-03-06 03:32+0000\n"
"PO-Revision-Date: 2014-12-23 08:45-0400\n"
"Last-Translator: David Prévot <david@tilapin.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -260,7 +260,7 @@
#. 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/debsign.1:102 ../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
@@ -349,7 +349,7 @@
#: ../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/debrsign.1:66 ../scripts/debsign.1:132 ../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
@@ -400,7 +400,7 @@
#: ../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/debrsign.1:70 ../scripts/debsign.1:144 ../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
@@ -1265,7 +1265,7 @@
#: ../scripts/bts.pl:448 ../scripts/cvs-debrelease.1:57
#: ../scripts/cvs-debuild.1:38 ../scripts/debc.1:88 ../scripts/debchange.1:377
#: ../scripts/debclean.1:80 ../scripts/debdiff.1:154 ../scripts/debi.1:102
-#: ../scripts/debrelease.1:95 ../scripts/debsign.1:96 ../scripts/debuild.1:256
+#: ../scripts/debrelease.1:95 ../scripts/debsign.1:95 ../scripts/debuild.1:256
#: ../scripts/dpkg-depcheck.1:92 ../scripts/dscverify.1:24
#: ../scripts/grep-excuses.1:15 ../scripts/mass-bug.pl:112
#: ../scripts/nmudiff.1:69 ../scripts/rmadison.pl:313 ../scripts/uscan.pl:1213
@@ -1277,7 +1277,7 @@
#. type: Plain text
#: ../scripts/bts.pl:450 ../scripts/cvs-debrelease.1:61 ../scripts/debc.1:92
#: ../scripts/debchange.1:381 ../scripts/debclean.1:84 ../scripts/debdiff.1:158
-#: ../scripts/debi.1:106 ../scripts/debrelease.1:99 ../scripts/debsign.1:100
+#: ../scripts/debi.1:106 ../scripts/debrelease.1:99 ../scripts/debsign.1:99
#: ../scripts/debuild.1:260 ../scripts/dpkg-depcheck.1:96
#: ../scripts/dscverify.1:28 ../scripts/grep-excuses.1:19
#: ../scripts/mass-bug.pl:114 ../scripts/nmudiff.1:73 ../scripts/uupdate.1:60
@@ -2864,7 +2864,7 @@
#: ../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/debrsign.1:57 ../scripts/debsign.1:105 ../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
@@ -3406,7 +3406,7 @@
#. 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/debrelease.1:102 ../scripts/debsign.1:102 ../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
@@ -3792,7 +3792,7 @@
#. type: TP
#: ../scripts/checkbashisms.1:24 ../scripts/debchange.1:386
-#: ../scripts/debdiff.1:164 ../scripts/debrelease.1:99 ../scripts/debsign.1:100
+#: ../scripts/debdiff.1:164 ../scripts/debrelease.1:99 ../scripts/debsign.1:99
#: ../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
@@ -6550,7 +6550,7 @@
#. type: Plain text
#: ../scripts/debc.1:101 ../scripts/debchange.1:398 ../scripts/debclean.1:99
#: ../scripts/debi.1:115 ../scripts/debrelease.1:111 ../scripts/debrsign.1:63
-#: ../scripts/debsign.1:112 ../scripts/nmudiff.1:85
+#: ../scripts/debsign.1:111 ../scripts/nmudiff.1:85
#: ../scripts/pts-subscribe.1:48 ../scripts/uupdate.1:113
#: ../scripts/who-uploads.1:56
msgid ""
@@ -6569,7 +6569,7 @@
#. type: TP
#: ../scripts/debc.1:101 ../scripts/debdiff.1:220 ../scripts/debi.1:115
-#: ../scripts/debrelease.1:116 ../scripts/debsign.1:124
+#: ../scripts/debrelease.1:116 ../scripts/debsign.1:123
#, no-wrap
msgid "B<DEBRELEASE_DEBS_DIR>"
msgstr "B<DEBRELEASE_DEBS_DIR>"
@@ -7676,7 +7676,7 @@
#. type: Plain text
#: ../scripts/debchange.1:392 ../scripts/debclean.1:93
-#: ../scripts/debrelease.1:105 ../scripts/debsign.1:106
+#: ../scripts/debrelease.1:105 ../scripts/debsign.1:105
#: ../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
@@ -8922,7 +8922,7 @@
"changelog>. La valeur par défaut est I<no>."
#. type: TP
-#: ../scripts/debcommit.pl:134 ../scripts/debsign.1:118
+#: ../scripts/debcommit.pl:134 ../scripts/debsign.1:117
#, no-wrap
msgid "B<DEBSIGN_KEYID>"
msgstr "B<DEBSIGN_KEYID>"
@@ -11076,7 +11076,7 @@
msgstr "B<debsign>(1), B<dpkg-architecture>(1), B<ssh>(1)"
#. type: Plain text
-#: ../scripts/debrsign.1:72 ../scripts/debsign.1:148
+#: ../scripts/debrsign.1:72 ../scripts/debsign.1:146
msgid ""
"This program was written by Julian Gilbey E<lt>jdg@debian.orgE<gt> and is "
"copyright under the GPL, version 2 or later."
@@ -11105,15 +11105,24 @@
"commands> ...]"
#. type: Plain text
-#: ../scripts/debsign.1:16
+#: ../scripts/debsign.1:14
+#, fuzzy
+#| msgid ""
+#| "B<debsign> mimics the signing aspects (and bugs) of B<dpkg-"
+#| "buildpackage>(1). It takes either an unsigned I<.dsc> file or an "
+#| "unsigned I<.changes> file (along with the associated unsigned I<.dsc> "
+#| "file found by replacing the architecture name and I<.changes> by I<.dsc> "
+#| "if it appears in the I<.changes> file), and signs them using the GNU "
+#| "Privacy Guard. It is careful to calculate the size and checksums of the "
+#| "newly signed I<.dsc> file and replace the original values in the I<."
+#| "changes> file."
msgid ""
"B<debsign> mimics the signing aspects (and bugs) of B<dpkg-"
-"buildpackage>(1). It takes either an unsigned I<.dsc> file or an unsigned "
-"I<.changes> file (along with the associated unsigned I<.dsc> file found by "
-"replacing the architecture name and I<.changes> by I<.dsc> if it appears in "
-"the I<.changes> file), and signs them using the GNU Privacy Guard. It is "
-"careful to calculate the size and checksums of the newly signed I<.dsc> file "
-"and replace the original values in the I<.changes> file."
+"buildpackage>(1). It takes a I<.dsc>, I<.buildinfo>, or I<.changes> file "
+"and signs it, and any child I<.dsc>, I<.buildinfo>, or I<.changes> files "
+"directly or indirectly referenced by it, using the GNU Privacy Guard. It is "
+"careful to calculate the size and checksums of any newly signed child files "
+"and replace the original values in the parent file."
msgstr ""
"B<debsign> imite les aspects (et les bogues) concernant la signature de "
"B<dpkg-buildpackage>(1). Il prend en argument soit un fichier I<.dsc> non "
@@ -11125,18 +11134,22 @@
"et remplace les valeurs du fichier I<.changes>."
#. type: Plain text
-#: ../scripts/debsign.1:21
+#: ../scripts/debsign.1:18
+#, fuzzy
+#| msgid ""
+#| "If a I<.changes> or I<.dsc> file is specified, it is signed, otherwise, "
+#| "I<debian/changelog> is parsed to determine the name of the I<.changes> "
+#| "file to look for in the parent directory."
msgid ""
-"If a I<.changes>, I<.dsc> or I<.commands> file is specified, it is signed, "
-"otherwise, I<debian/changelog> is parsed to determine the name of the I<."
-"changes> file to look for in the parent directory."
+"If no file is specified, I<debian/changelog> is parsed to determine the name "
+"of the I<.changes> file to look for in the parent directory."
msgstr ""
-"Si un fichier I<.changes>, I<.dsc> ou I<.commands> est fourni, il est signé. "
-"Sinon, I<debian/changelog> est analysé pour déterminer le nom du fichier I<."
+"Si un fichier I<.changes> ou I<.dsc> est fourni, il est signé. Sinon, "
+"I<debian/changelog> est analysé pour déterminer le nom du fichier I<."
"changes> à rechercher dans le répertoire parent."
#. type: Plain text
-#: ../scripts/debsign.1:25
+#: ../scripts/debsign.1:22
msgid ""
"If a I<.commands> file is specified it is first validated (see the details "
"at I<ftp://ftp.upload.debian.org/pub/UploadQueue/README>), and the name "
@@ -11149,16 +11162,30 @@
# NOTE: presque identique à une autre chaîne
#. type: Plain text
#: ../scripts/debsign.1:36
+#, fuzzy
+#| msgid ""
+#| "This utility is useful if a developer must build a package on one machine "
+#| "where it is unsafe to sign it; they need then only transfer the small I<."
+#| "dsc> and I<.changes> files to a safe machine and then use the B<debsign> "
+#| "program to sign them before transferring them back. This process can be "
+#| "automated in two ways. If the files to be signed live on the B<remote> "
+#| "machine, the B<-r> option may be used to copy them to the local machine "
+#| "and back again after signing. If the files live on the B<local> machine, "
+#| "then they may be transferred to the remote machine for signing using "
+#| "B<debrsign>(1)."
msgid ""
"This utility is useful if a developer must build a package on one machine "
"where it is unsafe to sign it; they need then only transfer the small I<."
-"dsc> and I<.changes> files to a safe machine and then use the B<debsign> "
-"program to sign them before transferring them back. This process can be "
-"automated in two ways. If the files to be signed live on the B<remote> "
-"machine, the B<-r> option may be used to copy them to the local machine and "
-"back again after signing. If the files live on the B<local> machine, then "
-"they may be transferred to the remote machine for signing using "
-"B<debrsign>(1)."
+"dsc>, I<.buildinfo> and I<.changes> files to a safe machine and then use the "
+"B<debsign> program to sign them before transferring them back. This process "
+"can be automated in two ways. If the files to be signed live on the "
+"B<remote> machine, the B<-r> option may be used to copy them to the local "
+"machine and back again after signing. If the files live on the B<local> "
+"machine, then they may be transferred to the remote machine for signing "
+"using B<debrsign>(1). However note that it is probably safer to have your "
+"trusted signing machine use B<debsign> to connect to the untrusted non-"
+"signing machine, rather than using B<debrsign> to make the connection in the "
+"reverse direction."
msgstr ""
"Cet utilitaire permet à un développeur de construire un paquet sur une "
"machine où il serait dangereux (du point de vue de la sécurité) de réaliser "
@@ -11188,12 +11215,20 @@
#. type: Plain text
#: ../scripts/debsign.1:48
-msgid ""
-"The I<.changes> and I<.dsc> files live on the specified remote host. In "
-"this case, a I<.changes> file must be explicitly named, with an absolute "
-"directory or one relative to the remote home directory. B<scp> will be used "
-"for the copying. The [I<username>B<@>]I<remotehost>B<:>I<changes> syntax is "
-"permitted as an alternative. Wildcards (B<*> etc.) are allowed."
+#, fuzzy
+#| msgid ""
+#| "The I<.changes> and I<.dsc> files live on the specified remote host. In "
+#| "this case, a I<.changes> file must be explicitly named, with an absolute "
+#| "directory or one relative to the remote home directory. B<scp> will be "
+#| "used for the copying. The [I<username>B<@>]I<remotehost>B<:>I<changes> "
+#| "syntax is permitted as an alternative. Wildcards (B<*> etc.) are allowed."
+msgid ""
+"The files to be signed live on the specified remote host. In this case, a "
+"I<.dsc>, I<.buildinfo> or I<.changes> file must be explicitly named, with an "
+"absolute directory or one relative to the remote home directory. B<scp> "
+"will be used for the copying. The [I<username>B<@>]I<remotehost>B<:"
+">I<filename> syntax is permitted as an alternative. Wildcards (B<*> etc.) "
+"are allowed."
msgstr ""
"Les fichiers I<.changes> et I<.dsc> se trouvent sur l'hôte distant indiqué. "
"Dans ce cas, un fichier I<.changes> doit être explicitement nommé, avec un "
@@ -11303,51 +11338,56 @@
msgstr "B<--debs-dir> I<RÉP>"
#. type: Plain text
-#: ../scripts/debsign.1:96
+#: ../scripts/debsign.1:95
+#, fuzzy
+#| msgid ""
+#| "Look for the I<.changes> and I<.deb> files in I<directory> instead of the "
+#| "parent of the source directory. This should either be an absolute path "
+#| "or relative to the top of the source directory."
msgid ""
-"Look for the I<.changes> and I<.dsc> files in directory I<DIR> instead of "
-"the parent of the source directory. This should either be an absolute path "
-"or relative to the top of the source directory."
+"Look for the files to be signed in directory I<DIR> instead of the parent of "
+"the source directory. This should either be an absolute path or relative to "
+"the top of the source directory."
msgstr ""
-"Chercher les fichiers I<.changes> et I<.deb> dans le répertoire I<RÉP> au "
-"lieu du répertoire parent du répertoire source. Cela doit être soit un "
-"chemin absolu, soit un chemin relatif à la racine du répertoire source."
+"Chercher les fichiers I<.changes> et I<.deb> dans le I<répertoire> au lieu "
+"du répertoire parent du répertoire source. Cela doit être soit un chemin "
+"absolu, soit un chemin relatif à la racine du répertoire source."
#. type: TP
-#: ../scripts/debsign.1:112
+#: ../scripts/debsign.1:111
#, no-wrap
msgid "B<DEBSIGN_PROGRAM>"
msgstr "B<DEBSIGN_PROGRAM>"
#. type: Plain text
-#: ../scripts/debsign.1:115
+#: ../scripts/debsign.1:114
msgid "Setting this is equivalent to giving a B<-p> option."
msgstr "Lui attribuer une valeur équivaut à fournir une option B<-p>."
#. type: TP
-#: ../scripts/debsign.1:115
+#: ../scripts/debsign.1:114
#, no-wrap
msgid "B<DEBSIGN_MAINT>"
msgstr "B<DEBSIGN_MAINT>"
#. type: Plain text
-#: ../scripts/debsign.1:118
+#: ../scripts/debsign.1:117
msgid "This is the B<-m> option."
msgstr "Équivaut à utiliser l'option B<-m>."
#. type: Plain text
-#: ../scripts/debsign.1:121
+#: ../scripts/debsign.1:120
msgid "And this is the B<-k> option."
msgstr "Équivaut à utiliser l'option B<-k>."
#. type: TP
-#: ../scripts/debsign.1:121
+#: ../scripts/debsign.1:120
#, no-wrap
msgid "B<DEBSIGN_ALWAYS_RESIGN>"
msgstr "B<DEBSIGN_ALWAYS_RESIGN>"
#. type: Plain text
-#: ../scripts/debsign.1:124
+#: ../scripts/debsign.1:123
msgid ""
"Always re-sign files even if they are already signed, without prompting."
msgstr ""
@@ -11355,13 +11395,21 @@
"sans demander."
#. type: Plain text
-#: ../scripts/debsign.1:134
+#: ../scripts/debsign.1:132
+#, fuzzy
+#| msgid ""
+#| "This specifies the directory in which to look for the I<.changes> and I<."
+#| "dsc> files, and is either an absolute path or relative to the top of the "
+#| "source tree. This corresponds to the B<--debs-dir> command line option. "
+#| "This directive could be used, for example, if you always use B<pbuilder> "
+#| "or B<svn-buildpackage> to build your packages. Note that it also affects "
+#| "B<debrelease>(1) in the same way, hence the strange name of the option."
msgid ""
-"This specifies the directory in which to look for the I<.changes> and I<."
-"dsc> files, and is either an absolute path or relative to the top of the "
-"source tree. This corresponds to the B<--debs-dir> command line option. "
-"This directive could be used, for example, if you always use B<pbuilder> or "
-"B<svn-buildpackage> to build your packages. Note that it also affects "
+"This specifies the directory in which to look for the files to be signed, "
+"and is either an absolute path or relative to the top of the source tree. "
+"This corresponds to the B<--debs-dir> command line option. This directive "
+"could be used, for example, if you always use B<pbuilder> or B<svn-"
+"buildpackage> to build your packages. Note that it also affects "
"B<debrelease>(1) in the same way, hence the strange name of the option."
msgstr ""
"Indiquer le répertoire dans lequel chercher les fichiers I<.changes> et I<."
@@ -11373,7 +11421,7 @@
"explique le nom étrange de l'option."
#. type: Plain text
-#: ../scripts/debsign.1:146
+#: ../scripts/debsign.1:144
#, fuzzy
#| msgid ""
#| "B<debrsign>(1), B<debuild>(1), B<dpkg-architecture>(1), B<dpkg-"
@@ -24724,6 +24772,40 @@
"responsable du paquet, Julian Gilbey E<lt>jdg@debian.orgE<gt>."
#~ msgid ""
+#~ "If a I<.changes>, I<.dsc> or I<.commands> file is specified, it is "
+#~ "signed, otherwise, I<debian/changelog> is parsed to determine the name of "
+#~ "the I<.changes> file to look for in the parent directory."
+#~ msgstr ""
+#~ "Si un fichier I<.changes>, I<.dsc> ou I<.commands> est fourni, il est "
+#~ "signé. Sinon, I<debian/changelog> est analysé pour déterminer le nom du "
+#~ "fichier I<.changes> à rechercher dans le répertoire parent."
+
+#~ msgid ""
+#~ "Look for the I<.changes> and I<.dsc> files in directory I<DIR> instead of "
+#~ "the parent of the source directory. This should either be an absolute "
+#~ "path or relative to the top of the source directory."
+#~ msgstr ""
+#~ "Chercher les fichiers I<.changes> et I<.deb> dans le répertoire I<RÉP> au "
+#~ "lieu du répertoire parent du répertoire source. Cela doit être soit un "
+#~ "chemin absolu, soit un chemin relatif à la racine du répertoire source."
+
+#~ msgid ""
+#~ "This specifies the directory in which to look for the I<.changes> and I<."
+#~ "dsc> files, and is either an absolute path or relative to the top of the "
+#~ "source tree. This corresponds to the B<--debs-dir> command line option. "
+#~ "This directive could be used, for example, if you always use B<pbuilder> "
+#~ "or B<svn-buildpackage> to build your packages. Note that it also affects "
+#~ "B<debrelease>(1) in the same way, hence the strange name of the option."
+#~ msgstr ""
+#~ "Indiquer le répertoire dans lequel chercher les fichiers I<.changes> et "
+#~ "I<.deb>, et est soit un chemin absolu ou un chemin relatif à la racine du "
+#~ "répertoire racine. Cela correspond à l'option en ligne de commande B<--"
+#~ "debs-dir>. Cette directive peut être utilisée par exemple si vous "
+#~ "utilisez systématiquement B<pbuilder> ou B<svn-buildpackage> pour "
+#~ "construire vos paquets. Remarquez que cela concerne également "
+#~ "B<debrelease>(1), ce qui explique le nom étrange de l'option."
+
+#~ msgid ""
#~ "Finally, only B<dpkg-buildpackage-hook> and the hooks from B<lintian-"
#~ "hook> onwards can be used if B<dpkg-cross> is installed. (This is "
#~ "because internally, B<debuild> reimplements B<dpkg-buildpackage>, but it "
diff -Nru devscripts-2.17.1/scripts/deb-reversion.sh devscripts-2.17.2/scripts/deb-reversion.sh
--- devscripts-2.17.1/scripts/deb-reversion.sh 2017-02-01 21:25:00.000000000 -0500
+++ devscripts-2.17.2/scripts/deb-reversion.sh 2017-03-05 22:23:37.000000000 -0500
@@ -62,7 +62,7 @@
CURDIR="$(pwd)"
SHORTOPTS=hVo:v:ck:Ds:b
-LONGOPTS=help,version,old-version:new-version:,calculate-only,hook:,debug,string:,force-bad-version
+LONGOPTS=help,version,old-version:,new-version:,calculate-only,hook:,debug,string:,force-bad-version
eval set -- "$(getopt -s bash -o $SHORTOPTS -l $LONGOPTS -n $PROGNAME -- "$@")"
CALCULATE=0
diff -Nru devscripts-2.17.1/scripts/debsign.1 devscripts-2.17.2/scripts/debsign.1
--- devscripts-2.17.1/scripts/debsign.1 2017-02-01 21:25:00.000000000 -0500
+++ devscripts-2.17.2/scripts/debsign.1 2017-03-05 22:23:37.000000000 -0500
@@ -5,17 +5,14 @@
\fBdebsign\fR [\fIoptions\fR] [\fIchanges-file\fR|\fIdsc-file\fR|\fIcommands-file\fR ...]
.SH DESCRIPTION
\fBdebsign\fR mimics the signing aspects (and bugs) of
-\fBdpkg-buildpackage\fR(1). It takes either an unsigned \fI.dsc\fR
-file or an unsigned \fI.changes\fR file (along with the associated
-unsigned \fI.dsc\fR file found by replacing the architecture name and
-\fI.changes\fR by \fI.dsc\fR if it appears in the \fI.changes\fR
-file), and signs them using the GNU Privacy Guard. It is
-careful to calculate the size and checksums of the newly signed
-\fI.dsc\fR file and replace the original values in the \fI.changes\fR
-file.
+\fBdpkg-buildpackage\fR(1). It takes a \fI.dsc\fR, \fI.buildinfo\fR, or
+\fI.changes\fR file and signs it, and any child \fI.dsc\fR,
+\fI.buildinfo\fR, or \fI.changes\fR files directly or indirectly
+referenced by it, using the GNU Privacy Guard. It is careful to
+calculate the size and checksums of any newly signed child files and
+replace the original values in the parent file.
.PP
-If a \fI.changes\fR, \fI.dsc\fR or \fI.commands\fR file is specified,
-it is signed, otherwise, \fIdebian/changelog\fR is parsed to determine
+If no file is specified, \fIdebian/changelog\fR is parsed to determine
the name of the \fI.changes\fR file to look for in the parent
directory.
.PP
@@ -25,25 +22,28 @@
.PP
This utility is useful if a developer must build a package on one
machine where it is unsafe to sign it; they need then only transfer
-the small \fI.dsc\fR and \fI.changes\fR files to a safe machine and
-then use the \fBdebsign\fR program to sign them before
+the small \fI.dsc\fR, \fI.buildinfo\fR and \fI.changes\fR files to a
+safe machine and then use the \fBdebsign\fR program to sign them before
transferring them back. This process can be automated in two ways.
-If the files to be signed live on the \fBremote\fR machine, the \fB\-r\fR
-option may be used to copy them to the local machine and back again
-after signing. If the files live on the \fBlocal\fR machine, then they may
-be transferred to the remote machine for signing using
-\fBdebrsign\fR(1).
+If the files to be signed live on the \fBremote\fR machine, the
+\fB\-r\fR option may be used to copy them to the local machine and back
+again after signing. If the files live on the \fBlocal\fR machine, then
+they may be transferred to the remote machine for signing using
+\fBdebrsign\fR(1). However note that it is probably safer to have your
+trusted signing machine use \fBdebsign\fR to connect to the untrusted
+non-signing machine, rather than using \fBdebrsign\fR to make the
+connection in the reverse direction.
.PP
This program can take default settings from the \fBdevscripts\fR
configuration files, as described below.
.SH OPTIONS
.TP
.B \-r \fR[\fIusername\fB@\fR]\fIremotehost\fR
-The \fI.changes\fR and \fI.dsc\fR files live on the specified remote
-host. In this case, a \fI.changes\fR file must be explicitly named,
-with an absolute directory or one relative to the remote home
+The files to be signed live on the specified remote host. In this case,
+a \fI.dsc\fR, \fI.buildinfo\fR or \fI.changes\fR file must be explicitly
+named, with an absolute directory or one relative to the remote home
directory. \fBscp\fR will be used for the copying. The
-\fR[\fIusername\fB@\fR]\fIremotehost\fB:\fIchanges\fR syntax is
+\fR[\fIusername\fB@\fR]\fIremotehost\fB:\fIfilename\fR syntax is
permitted as an alternative. Wildcards (\fB*\fR etc.) are allowed.
.TP
.B \-p\fIprogname\fR
@@ -89,10 +89,9 @@
current signature.
.TP
\fB\-\-debs\-dir\fR \fIDIR\fR
-Look for the \fI.changes\fR and \fI.dsc\fR files in directory
-\fIDIR\fR instead of the parent of the source directory. This should
-either be an absolute path or relative to the top of the source
-directory.
+Look for the files to be signed in directory \fIDIR\fR instead of the
+parent of the source directory. This should either be an absolute path
+or relative to the top of the source directory.
.TP
\fB\-\-no-conf\fR, \fB\-\-noconf\fR
Do not read any configuration files. This can only be used as the
@@ -123,14 +122,13 @@
Always re-sign files even if they are already signed, without prompting.
.TP
.B DEBRELEASE_DEBS_DIR
-This specifies the directory in which to look for the \fI.changes\fR
-and \fI.dsc\fR files, and is either an absolute path or relative to
-the top of the source tree. This corresponds to the
-\fB\-\-debs\-dir\fR command line option. This directive could be
-used, for example, if you always use \fBpbuilder\fR or
-\fBsvn-buildpackage\fR to build your packages. Note that it also
-affects \fBdebrelease\fR(1) in the same way, hence the strange name of
-the option.
+This specifies the directory in which to look for the files to be
+signed, and is either an absolute path or relative to the top of the
+source tree. This corresponds to the \fB\-\-debs\-dir\fR command line
+option. This directive could be used, for example, if you always use
+\fBpbuilder\fR or \fBsvn-buildpackage\fR to build your packages. Note
+that it also affects \fBdebrelease\fR(1) in the same way, hence the
+strange name of the option.
.SH "SEE ALSO"
.BR debrsign (1),
.BR debuild (1),
diff -Nru devscripts-2.17.1/scripts/debsign.bash_completion devscripts-2.17.2/scripts/debsign.bash_completion
--- devscripts-2.17.1/scripts/debsign.bash_completion 2017-02-01 21:25:00.000000000 -0500
+++ devscripts-2.17.2/scripts/debsign.bash_completion 2017-03-05 22:23:37.000000000 -0500
@@ -20,6 +20,7 @@
*)
COMPREPLY=( $(
compgen -G "${cur}*.changes"
+ compgen -G "${cur}*.buildinfo"
compgen -G "${cur}*.dsc"
compgen -G "${cur}*.commands"
compgen -W "$options" | grep "^$cur"
diff -Nru devscripts-2.17.1/scripts/debsign.sh devscripts-2.17.2/scripts/debsign.sh
--- devscripts-2.17.1/scripts/debsign.sh 2017-02-01 21:25:00.000000000 -0500
+++ devscripts-2.17.2/scripts/debsign.sh 2017-03-05 22:23:37.000000000 -0500
@@ -1,9 +1,8 @@
#!/bin/sh
-# This program is designed to GPG sign a .dsc and .changes file pair
-# in the form needed for a legal Debian upload. It is based in part
-# on dpkg-buildpackage. It takes one argument: the name of the
-# .changes file.
+# This program is designed to GPG sign .dsc, .buildinfo, or .changes
+# files (or any combination of these) in the form needed for a legal
+# Debian upload. It is based in part on dpkg-buildpackage.
# Debian GNU/Linux debsign. Copyright (C) 1999 Julian Gilbey.
# Modifications to work with GPG by Joseph Carter and Julian Gilbey
@@ -27,6 +26,8 @@
PRECIOUS_FILES=0
PROGNAME=`basename $0`
MODIFIED_CONF_MSG='Default settings modified by devscripts configuration files:'
+HAVE_SIGNED=""
+NUM_SIGNED=0
# Temporary directories
signingdir=""
@@ -58,13 +59,13 @@
usage () {
echo \
-"Usage: debsign [options] [changes, dsc or commands file]
+"Usage: debsign [options] [changes, buildinfo, dsc or commands file]
Options:
-r [username@]remotehost
- The machine on which the changes/dsc files live.
- A changes file with full pathname (or relative
- to the remote home directory) must be given in
- such a case
+ The machine on which the files live. If given, then a
+ changes file with full pathname (or relative to the
+ remote home directory) must be given as the main
+ argument in the rest of the command line.
-k<keyid> The key to use for signing
-p<sign-command> The command to use for signing
-e<maintainer> Sign using key of <maintainer> (takes precedence over -m)
@@ -76,16 +77,16 @@
--re-sign Re-sign if the file is already signed.
--no-re-sign Don't re-sign if the file is already signed.
--debs-dir <directory>
- The location of the .changes / .dsc files when called from
+ The location of the files to be signed when called from
within a source tree (default "..")
--no-conf, --noconf
Don't read devscripts config files;
must be the first option given
--help Show this message
--version Show version and copyright information
- If a commands or dsc or changes file is specified, it and any .dsc files in
- the changes file are signed, otherwise debian/changelog is parsed to find
- the changes file.
+ If an explicit filename is specified, it along with any child .buildinfo and
+ .dsc files are signed. Otherwise, debian/changelog is parsed to find the
+ changes file.
$MODIFIED_CONF_MSG"
}
@@ -114,6 +115,10 @@
echo "$filename"
}
+to_bool() {
+ if "$@"; then echo true; else echo false; fi
+}
+
movefile() {
if [ -w "$(dirname "$2")" ]; then
mv -f -- "$1" "$2"
@@ -156,11 +161,14 @@
# of dpkg-buildpackage, because we do not know all of the necessary
# information when this function is read first.
signfile () {
+ local type="$1"
+ local file="$2"
+ local signas="$3"
local savestty=$(stty -g 2>/dev/null) || true
mksigningdir
- UNSIGNED_FILE="$signingdir/$(basename "$1")"
+ UNSIGNED_FILE="$signingdir/$(basename "$file")"
ASCII_SIGNED_FILE="${UNSIGNED_FILE}.asc"
- (cat "$1" ; echo "") > "$UNSIGNED_FILE"
+ (cat "$file" ; echo "") > "$UNSIGNED_FILE"
gpgversion=`$signcommand --version | head -n 1 | cut -d' ' -f3`
gpgmajorversion=`echo $gpgversion | cut -d. -f1`
@@ -168,7 +176,7 @@
if [ $gpgmajorversion -gt 1 -o $gpgminorversion -ge 4 ]
then
- $signcommand --local-user "$2" --clearsign \
+ $signcommand --local-user "$signas" --clearsign \
--list-options no-show-policy-urls \
--armor --textmode --output "$ASCII_SIGNED_FILE"\
"$UNSIGNED_FILE" || \
@@ -178,7 +186,7 @@
exit $SAVESTAT
}
else
- $signcommand --local-user "$2" --clearsign \
+ $signcommand --local-user "$signas" --clearsign \
--no-show-policy-url \
--armor --textmode --output "$ASCII_SIGNED_FILE" \
"$UNSIGNED_FILE" || \
@@ -191,7 +199,9 @@
stty $savestty 2>/dev/null || true
echo
PRECIOUS_FILES=$(($PRECIOUS_FILES + 1))
- movefile "$ASCII_SIGNED_FILE" "$1"
+ HAVE_SIGNED="${HAVE_SIGNED:+${HAVE_SIGNED}, }$type"
+ NUM_SIGNED=$((NUM_SIGNED + 1))
+ movefile "$ASCII_SIGNED_FILE" "$file"
}
withecho () {
@@ -199,14 +209,24 @@
"$@"
}
+file_is_already_signed() {
+ test "$(head -n 1 "$1")" = "-----BEGIN PGP SIGNED MESSAGE-----"
+}
+
+unsignfile() {
+ UNSIGNED_FILE="$(temp_filename "$1" "unsigned")"
+
+ sed -e '1,/^$/d; /^$/,$d' "$1" > "$UNSIGNED_FILE"
+ movefile "$UNSIGNED_FILE" "$1"
+}
+
# Has the dsc file already been signed, perhaps from a previous, partially
# successful invocation of debsign? We give the user the option of
# resigning the file or accepting it as is. Returns success if already
# and failure if the file needs signing. Parameters: $1=filename,
-# $2=file description for message (dsc or changes)
+# $2=file type for message (e.g. "changes", "commands")
check_already_signed () {
- [ "`head -n 1 \"$1\"`" = "-----BEGIN PGP SIGNED MESSAGE-----" ] || \
- return 1
+ file_is_already_signed "$1" || return 1
local resign
if [ "$opt_re_sign" = "true" ]; then
@@ -228,10 +248,7 @@
[ "$resign" = "true" ] || \
return 0
- UNSIGNED_FILE="$(temp_filename "$1" "unsigned")"
-
- sed -e '1,/^$/d; /^$/,$d' "$1" > "$UNSIGNED_FILE"
- movefile "$UNSIGNED_FILE" "$1"
+ withecho unsignfile "$1"
return 1
}
@@ -363,6 +380,229 @@
exit 1
fi
+ensure_local_copy() {
+ local remotehost="$1"
+ local remotefile="$2"
+ local file="$3"
+ local type="$4"
+ if [ -n "$remotehost" ]
+ then
+ if [ ! -f "$file" ]
+ then
+ withecho scp "$remotehost:$remotefile" "$file"
+ fi
+ fi
+
+ if [ ! -f "$file" -o ! -r "$file" ]
+ then
+ echo "$PROGNAME: Can't find or can't read $type file $file!" >&2
+ exit 1
+ fi
+}
+
+fixup_control() {
+ local filter_out="$1"
+ local childtype="$2"
+ local parenttype="$3"
+ local child="$4"
+ local parent="$5"
+ test -r "$child" || {
+ echo "$PROGNAME: Can't read .$childtype file $child!" >&2
+ return 1
+ }
+
+ local md5=$(md5sum "$child" | cut -d' ' -f1)
+ local sha1=$(sha1sum "$child" | cut -d' ' -f1)
+ local sha256=$(sha256sum "$child" | cut -d' ' -f1)
+ perl -i -pe 'BEGIN {
+ '" \$file=\"$child\"; \$md5=\"$md5\"; "'
+ '" \$sha1=\"$sha1\"; \$sha256=\"$sha256\"; "'
+ $size=(-s $file); ($base=$file) =~ s|.*/||;
+ $infiles=0; $inmd5=0; $insha1=0; $insha256=0; $format="";
+ }
+ if(/^Format:\s+(.*)/) {
+ $format=$1;
+ die "Unrecognised .$parenttype format: $format\n"
+ unless $format =~ /^\d+(\.\d+)*$/;
+ ($major, $minor) = split(/\./, $format);
+ $major+=0;$minor+=0;
+ die "Unsupported .$parenttype format: $format\n"
+ if('"$filter_out"');
+ }
+ /^Files:/i && ($infiles=1,$inmd5=0,$insha1=0,$insha256=0);
+ if(/^Checksums-Sha1:/i) {$insha1=1;$infiles=0;$inmd5=0;$insha256=0;}
+ elsif(/^Checksums-Sha256:/i) {
+ $insha256=1;$infiles=0;$inmd5=0;$insha1=0;
+ } elsif(/^Checksums-Md5:/i) {
+ $inmd5=1;$infiles=0;$insha1=0;$insha256=0;
+ } elsif(/^Checksums-.*?:/i) {
+ die "Unknown checksum format: $_\n";
+ }
+ /^\s*$/ && ($infiles=0,$inmd5=0,$insha1=0,$insha256=0);
+ if ($infiles &&
+ /^ (\S+) (\d+) (\S+) (\S+) \Q$base\E\s*$/) {
+ $_ = " $md5 $size $3 $4 $base\n";
+ $infiles=0;
+ }
+ if ($inmd5 &&
+ /^ (\S+) (\d+) \Q$base\E\s*$/) {
+ $_ = " $md5 $size $base\n";
+ $inmd5=0;
+ }
+ if ($insha1 &&
+ /^ (\S+) (\d+) \Q$base\E\s*$/) {
+ $_ = " $sha1 $size $base\n";
+ $insha1=0;
+ }
+ if ($insha256 &&
+ /^ (\S+) (\d+) \Q$base\E\s*$/) {
+ $_ = " $sha256 $size $base\n";
+ $insha256=0;
+ }' "$parent"
+}
+
+fixup_buildinfo() {
+ fixup_control '($major != 0 or $minor > 2) and ($major != 1 or $minor > 0)' dsc buildinfo "$@"
+}
+
+fixup_changes() {
+ local childtype="$1"
+ shift
+ fixup_control '$major!=1 or $minor > 8 or $minor < 7' $childtype changes "$@"
+}
+
+withtempfile() {
+ local filetype="$1"
+ local mainfile="$2"
+ shift 2
+ local temp_file="$(temp_filename "$mainfile" "temp")"
+ cp "$mainfile" "$temp_file"
+ if "$@" "$temp_file"; then
+ if ! cmp -s "$mainfile" "$temp_file"; then
+ # emulate output of "withecho" but on the mainfile
+ echo " $@" "$mainfile" >&2
+ fi
+ movefile "$temp_file" "$mainfile"
+ else
+ rm "$temp_file"
+ echo "$PROGNAME: Error processing .$filetype file (see above)" >&2
+ exit 1
+ fi
+}
+
+guess_signas() {
+ if [ -n "$maint" ]
+ then maintainer="$maint"
+ # Try the new "Changed-By:" field first
+ else maintainer=`sed -n 's/^Changed-By: //p' $1`
+ fi
+ if [ -z "$maint" ]
+ then maintainer=`sed -n 's/^Maintainer: //p' $1`
+ fi
+
+ echo "${signkey:-$maintainer}"
+}
+
+maybesign_dsc() {
+ local signas="$1"
+ local remotehost="$2"
+ local remotedsc="$3"
+ local dsc="$4"
+
+ ensure_local_copy "$remotehost" "$remotedsc" "$dsc" dsc
+ if check_already_signed "$dsc" dsc; then
+ echo "Leaving current signature unchanged." >&2
+ return
+ fi
+
+ withecho signfile dsc "$dsc" "$signas"
+
+ if [ -n "$remotehost" ]
+ then
+ withecho scp "$dsc" "$remotehost:$remotedsc"
+ PRECIOUS_FILES=$(($PRECIOUS_FILES - 1))
+ fi
+}
+
+maybesign_buildinfo() {
+ local signas="$1"
+ local remotehost="$2"
+ local remotebuildinfo="$3"
+ local buildinfo="$4"
+ local remotedsc="$5"
+ local dsc="$6"
+
+ ensure_local_copy "$remotehost" "$remotebuildinfo" "$buildinfo" buildinfo
+ if check_already_signed "$buildinfo" "buildinfo"; then
+ echo "Leaving current signature unchanged." >&2
+ return
+ fi
+
+ if grep -q `basename "$dsc"` "$buildinfo"; then
+ maybesign_dsc "$signas" "$remotehost" "$remotedsc" "$dsc"
+ withtempfile buildinfo "$buildinfo" fixup_buildinfo "$dsc"
+ fi
+
+ withecho signfile buildinfo "$buildinfo" "$signas"
+
+ if [ -n "$remotehost" ]
+ then
+ withecho scp "$buildinfo" "$remotehost:$remotebuildinfo"
+ PRECIOUS_FILES=$(($PRECIOUS_FILES - 1))
+ fi
+}
+
+maybesign_changes() {
+ local signas="$1"
+ local remotehost="$2"
+ local remotechanges="$3"
+ local changes="$4"
+ local remotebuildinfo="$5"
+ local buildinfo="$6"
+ local remotedsc="$7"
+ local dsc="$8"
+
+ ensure_local_copy "$remotehost" "$remotechanges" "$changes" changes
+ if check_already_signed "$changes" "changes"; then
+ echo "Leaving current signature unchanged." >&2
+ return
+ fi
+
+ hasdsc="$(to_bool grep -q `basename "$dsc"` "$changes")"
+ hasbuildinfo="$(to_bool grep -q `basename "$buildinfo"` "$changes")"
+
+ if $hasbuildinfo; then
+ # assume that this will also sign the same dsc if it's available
+ maybesign_buildinfo "$signas" "$remotehost" \
+ "$remotebuildinfo" "$buildinfo" \
+ "$remotedsc" "$dsc"
+ elif $hasdsc; then
+ maybesign_dsc "$signas" "$remotehost" "$remotedsc" "$dsc"
+ fi
+
+ if $hasdsc; then
+ withtempfile changes "$changes" fixup_changes dsc "$dsc"
+ fi
+ if $hasbuildinfo; then
+ withtempfile changes "$changes" fixup_changes buildinfo "$buildinfo"
+ fi
+ withecho signfile changes "$changes" "$signas"
+
+ if [ -n "$remotehost" ]
+ then
+ withecho scp "$changes" "$remotehost:$remotechanges"
+ PRECIOUS_FILES=$(($PRECIOUS_FILES - 1))
+ fi
+}
+
+report_signed() {
+ if [ $NUM_SIGNED -eq 1 ]; then
+ echo "Successfully signed $HAVE_SIGNED file"
+ elif [ $NUM_SIGNED -gt 0 ]; then
+ echo "Successfully signed $HAVE_SIGNED files"
+ fi
+}
+
dosigning() {
# Do we have to download the changes file?
if [ -n "$remotehost" ]
@@ -371,29 +611,22 @@
cd "$remotefilesdir"
remotechanges=$changes
+ remotebuildinfo=$buildinfo
remotedsc=$dsc
remotecommands=$commands
remotedir="`perl -e 'chomp($_="'"$dsc"'"); m%/% && s%/[^/]*$%% && print'`"
changes=`basename "$changes"`
+ buildinfo=`basename "$buildinfo"`
dsc=`basename "$dsc"`
commands=`basename "$commands"`
- if [ -n "$changes" ]
- then
- if [ ! -f "$changes" ]
- then
- withecho scp "$remotehost:$remotechanges" .
- fi
- elif [ -n "$dsc" ]
- then withecho scp "$remotehost:$remotedsc" "$dsc"
- else withecho scp "$remotehost:$remotecommands" "$commands"
- fi
-
if [ -n "$changes" ] && echo "$changes" | egrep -q '[][*?]'
then
+ withecho scp "$remotehost:$remotechanges" .
for changes in $changes
do
printf "\n"
+ buildinfo="${remotedir+$remotedir/}${changes%.changes}.buildinfo"
dsc=`echo "${remotedir+$remotedir/}$changes" | \
perl -pe 's/\.changes$/.dsc/; s/(.*)_(.*)_(.*)\.dsc/\1_\2.dsc/'`
dosigning;
@@ -402,116 +635,7 @@
fi
fi
- if [ -n "$changes" ]
- then
- if [ ! -f "$changes" -o ! -r "$changes" ]
- then
- echo "$PROGNAME: Can't find or can't read changes file $changes!" >&2
- exit 1
- fi
-
- check_already_signed "$changes" "changes" && {
- echo "Leaving current signature unchanged." >&2
- return
- }
- if [ -n "$maint" ]
- then maintainer="$maint"
- # Try the "Changed-By:" field first
- else maintainer=`sed -n 's/^Changed-By: //p' $changes`
- fi
- if [ -z "$maintainer" ]
- then maintainer=`sed -n 's/^Maintainer: //p' $changes`
- fi
-
- signas="${signkey:-$maintainer}"
-
- # Is there a dsc file listed in the changes file?
- if grep -q `basename "$dsc"` "$changes"
- then
- if [ -n "$remotehost" ]
- then
- withecho scp "$remotehost:$remotedsc" "$dsc"
- fi
-
- if [ ! -f "$dsc" -o ! -r "$dsc" ]
- then
- echo "$PROGNAME: Can't find or can't read dsc file $dsc!" >&2
- exit 1
- fi
- check_already_signed "$dsc" "dsc" || withecho signfile "$dsc" "$signas"
- dsc_md5=`md5sum $dsc | cut -d' ' -f1`
- dsc_sha1=`sha1sum $dsc | cut -d' ' -f1`
- dsc_sha256=`sha256sum $dsc | cut -d' ' -f1`
-
- temp_changes="$(temp_filename "$changes" "temp")"
- cp "$changes" "$temp_changes"
- if perl -i -pe 'BEGIN {
- '" \$dsc_file=\"$dsc\"; \$dsc_md5=\"$dsc_md5\"; "'
- '" \$dsc_sha1=\"$dsc_sha1\"; \$dsc_sha256=\"$dsc_sha256\"; "'
- $dsc_size=(-s $dsc_file); ($dsc_base=$dsc_file) =~ s|.*/||;
- $infiles=0; $insha1=0; $insha256=0; $format="";
- }
- if(/^Format:\s+(.*)/) {
- $format=$1;
- die "Unrecognised .changes format: $format\n"
- unless $format =~ /^\d+(\.\d+)*$/;
- ($major, $minor) = split(/\./, $format);
- $major+=0;$minor+=0;
- die "Unsupported .changes format: $format\n"
- if($major!=1 or $minor > 8 or $minor < 7);
- }
- /^Files:/i && ($infiles=1,$insha1=0,$insha256=0);
- if(/^Checksums-Sha1:/i) {$insha1=1;$infiles=0;$insha256=0;}
- elsif(/^Checksums-Sha256:/i) {
- $insha256=1;$infiles=0;$insha1=0;
- } elsif(/^Checksums-.*?:/i) {
- die "Unknown checksum format: $_\n";
- }
- /^\s*$/ && ($infiles=0,$insha1=0,$insha256=0);
- if ($infiles &&
- /^ (\S+) (\d+) (\S+) (\S+) \Q$dsc_base\E\s*$/) {
- $_ = " $dsc_md5 $dsc_size $3 $4 $dsc_base\n";
- $infiles=0;
- }
- if ($insha1 &&
- /^ (\S+) (\d+) \Q$dsc_base\E\s*$/) {
- $_ = " $dsc_sha1 $dsc_size $dsc_base\n";
- $insha1=0;
- }
- if ($insha256 &&
- /^ (\S+) (\d+) \Q$dsc_base\E\s*$/) {
- $_ = " $dsc_sha256 $dsc_size $dsc_base\n";
- $insha256=0;
- }' "$temp_changes"
- then
- movefile "$temp_changes" "$changes"
- else
- rm "$temp_changes"
- echo "$PROGNAME: Error processing .changes file (see above)" >&2
- exit 1
- fi
-
- withecho signfile "$changes" "$signas"
-
- if [ -n "$remotehost" ]
- then
- withecho scp "$changes" "$dsc" "$remotehost:$remotedir"
- PRECIOUS_FILES=$(($PRECIOUS_FILES - 2))
- fi
-
- echo "Successfully signed dsc and changes files"
- else
- withecho signfile "$changes" "$signas"
-
- if [ -n "$remotehost" ]
- then
- withecho scp "$changes" "$remotehost:$remotedir"
- PRECIOUS_FILES=$(($PRECIOUS_FILES - 1))
- fi
-
- echo "Successfully signed changes file"
- fi
- elif [ -n "$commands" ] # sign .commands file
+ if [ -n "$commands" ] # sign .commands file
then
if [ ! -f "$commands" -o ! -r "$commands" ]
then
@@ -519,6 +643,7 @@
exit 1
fi
+ ensure_local_copy "$remotehost" "$remotecommands" "$commands" commands
check_already_signed "$commands" commands && {
echo "Leaving current signature unchanged." >&2
return
@@ -570,7 +695,7 @@
signas="${signkey:-$maintainer}"
- withecho signfile "$commands" "$signas"
+ withecho signfile commands "$commands" "$signas"
if [ -n "$remotehost" ]
then
@@ -578,38 +703,31 @@
PRECIOUS_FILES=$(($PRECIOUS_FILES - 1))
fi
- echo "Successfully signed commands file"
- else # only a dsc file to sign; much easier
- if [ ! -f "$dsc" -o ! -r "$dsc" ]
- then
- echo "$PROGNAME: Can't find or can't read dsc file $dsc!" >&2
- exit 1
- fi
-
- check_already_signed "$dsc" dsc && {
- echo "Leaving current signature unchanged." >&2
- return
- }
- if [ -n "$maint" ]
- then maintainer="$maint"
- # Try the new "Changed-By:" field first
- else maintainer=`sed -n 's/^Changed-By: //p' $dsc`
- fi
- if [ -z "$maint" ]
- then maintainer=`sed -n 's/^Maintainer: //p' $dsc`
- fi
+ report_signed
- signas="${signkey:-$maintainer}"
+ elif [ -n "$changes" ]
+ then
+ signas="$(guess_signas "$changes")"
+ maybesign_changes "$signas" "$remotehost" \
+ "$remotechanges" "$changes" \
+ "$remotebuildinfo" "$buildinfo" \
+ "$remotedsc" "$dsc"
+ report_signed
- withecho signfile "$dsc" "$signas"
+ elif [ -n "$buildinfo" ]
+ then
+ signas="$(guess_signas "$buildinfo")"
+ maybesign_buildinfo "$signas" "$remotehost" \
+ "$remotebuildinfo" "$buildinfo" \
+ "$remotedsc" "$dsc"
+ report_signed
- if [ -n "$remotehost" ]
- then
- withecho scp "$dsc" "$remotehost:$remotedsc"
- PRECIOUS_FILES=$(($PRECIOUS_FILES - 1))
- fi
+ else
+ signas="$(guess_signas "$dsc")"
+ maybesign_dsc "$signas" "$remotehost" \
+ "$remotedsc" "$dsc"
+ report_signed
- echo "Successfully signed dsc file"
fi
}
@@ -624,7 +742,7 @@
exit 1
fi
if [ -n "$remotehost" ]; then
- echo "$PROGNAME: Need to specify a .changes, .dsc or .commands file location with -r!" >&2
+ echo "$PROGNAME: Need to specify a remote file location when giving -r!" >&2
exit 1
fi
if [ ! -r debian/changelog ]; then
@@ -654,9 +772,11 @@
pv="${package}_${sversion}"
pva="${package}_${sversion}_${arch}"
dsc="$debsdir/$pv.dsc"
+ buildinfo="$debsdir/$pva.buildinfo"
changes="$debsdir/$pva.changes"
if [ -n "$multiarch" -o ! -r $changes ]; then
changes=$(ls "$debsdir/${package}_${sversion}_*+*.changes" "$debsdir/${package}_${sversion}_multi.changes" 2>/dev/null | head -1)
+ # TODO: dpkg-cross does not yet do buildinfo, so don't worry about it here
if [ -z "$multiarch" ]; then
if [ -n "$changes" ]; then
echo "$PROGNAME: could not find normal .changes file but found multiarch file:" >&2
@@ -679,22 +799,32 @@
case "$1" in
*.dsc)
changes=
+ buildinfo=
dsc=$1
commands=
;;
+ *.buildinfo)
+ changes=
+ buildinfo=$1
+ dsc=`echo $buildinfo | \
+ perl -pe 's/\.buildinfo$/.dsc/; s/(.*)_(.*)_(.*)\.dsc/\1_\2.dsc/'`
+ commands=
+ ;;
*.changes)
changes=$1
+ buildinfo="${changes%.changes}.buildinfo"
dsc=`echo $changes | \
perl -pe 's/\.changes$/.dsc/; s/(.*)_(.*)_(.*)\.dsc/\1_\2.dsc/'`
commands=
;;
*.commands)
changes=
+ buildinfo=
dsc=
commands=$1
;;
*)
- echo "$PROGNAME: Only a .changes, .dsc or .commands file is allowed as argument!" >&2
+ echo "$PROGNAME: Only a .changes, .buildinfo, .dsc or .commands file is allowed as argument!" >&2
exit 1 ;;
esac
dosigning
diff -Nru devscripts-2.17.1/scripts/dscverify.pl devscripts-2.17.2/scripts/dscverify.pl
--- devscripts-2.17.1/scripts/dscverify.pl 2017-02-01 21:25:00.000000000 -0500
+++ devscripts-2.17.2/scripts/dscverify.pl 2017-03-05 22:23:37.000000000 -0500
@@ -198,7 +198,7 @@
}
}
- if ($file =~ /\.changes$/ and $out =~ /^Format:\s*(.*)$/mi) {
+ if ($file =~ /\.(changes|buildinfo)$/ and $out =~ /^Format:\s*(.*)$/mi) {
my $format = $1;
unless ($format =~ /^(\d+)\.(\d+)$/) {
xwarn "$file has an unrecognised format: $format\n";
@@ -207,7 +207,9 @@
my ($major, $minor) = split /\./, $format;
$major += 0;
$minor += 0;
- unless ($major == 1 and $minor <= 8) {
+ if ($file =~ /\.changes$/ and ($major != 1 or $minor > 8) or
+ $file =~ /\.buildinfo$/ and (($major != 0 or $minor > 2) and
+ ($major != 1 or $minor > 0))) {
xwarn "$file is an unsupported format: $format\n";
return;
}
@@ -220,7 +222,7 @@
}
my @checksums = map { split /\n/ } $out =~ /^Checksums-(\S+):\s*\n/mgi;
- @checksums = grep {!/^Sha(1|256)$/i} @checksums;
+ @checksums = grep {!/^(Md5|Sha(1|256))$/i} @checksums;
if (@checksums) {
xwarn "$file contains unsupported checksums:\n"
. join (", ", @checksums) . "\n";
diff -Nru devscripts-2.17.1/scripts/grep-excuses.pl devscripts-2.17.2/scripts/grep-excuses.pl
--- devscripts-2.17.1/scripts/grep-excuses.pl 2017-02-01 21:25:00.000000000 -0500
+++ devscripts-2.17.2/scripts/grep-excuses.pl 2017-03-05 22:23:37.000000000 -0500
@@ -306,6 +306,7 @@
# New item?
if (! $sublist and /^\s*<li>/) {
s%<li>%%;
+ s%<li>%\n%g;
$item = $_;
}
elsif (! $sublist and /^\s*<ul>/) {
@@ -316,13 +317,12 @@
# Did the last item match?
if ($item=~/^-?\Q$string\E\s/ or
$item=~/^\s*Maintainer:\s[^\n]*\b\Q$string\E\b[^\n]*$/m) {
- # In case there are embedded <li> tags
- $item =~ s%<li>%\n %g;
print $item;
}
}
elsif ($sublist and /^\s*<li>/) {
s%<li>% %;
+ s%<li>%\n %g;
$item .= $_;
}
else {
diff -Nru devscripts-2.17.1/scripts/rc-alert.pl devscripts-2.17.2/scripts/rc-alert.pl
--- devscripts-2.17.1/scripts/rc-alert.pl 2017-02-01 21:25:00.000000000 -0500
+++ devscripts-2.17.2/scripts/rc-alert.pl 2017-03-05 22:23:37.000000000 -0500
@@ -334,6 +334,7 @@
my $bug_string = "Package: $pkgname\n" .
$comment . # non-empty comments always contain the trailing \n
"Bug: $args{num}\n" .
+ "Bug-URL: https://bugs.debian.org/$args{num}\n"; .
"Title: " . unhtmlsanit($args{name}) . "\n" .
"Flags: " . $flags . "\n" .
(defined $args{dists} ? "Dists: " . $dists . "\n" : "") .
diff -Nru devscripts-2.17.1/scripts/wrap-and-sort devscripts-2.17.2/scripts/wrap-and-sort
--- devscripts-2.17.1/scripts/wrap-and-sort 2017-02-01 21:25:00.000000000 -0500
+++ devscripts-2.17.2/scripts/wrap-and-sort 2017-03-05 22:23:37.000000000 -0500
@@ -27,8 +27,12 @@
CONTROL_LIST_FIELDS = (
"Breaks",
"Build-Conflicts",
+ "Build-Conflicts-Arch",
+ "Build-Conflicts-Indep",
"Build-Depends",
+ "Build-Depends-Arch",
"Build-Depends-Indep",
+ "Built-Using",
"Conflicts",
"Depends",
"Enhances",
diff -Nru devscripts-2.17.1/test/test_package_lifecycle devscripts-2.17.2/test/test_package_lifecycle
--- devscripts-2.17.1/test/test_package_lifecycle 2017-02-01 21:25:00.000000000 -0500
+++ devscripts-2.17.2/test/test_package_lifecycle 2017-03-05 22:23:37.000000000 -0500
@@ -146,12 +146,30 @@
dpkg-source --after-build test
dpkg-buildpackage: full upload (original source is included)
Now signing changes and any dsc files...
- signfile test_1.0-1.dsc uscan test key (no secret) <none@debian.org>
+EOS
+ if which dpkg-genbuildinfo >/dev/null 2>&1; then
+ cat >> ${WORKDIR}/package_lifecycle/debuild.txt <<-EOS
+ signfile dsc test_1.0-1.dsc uscan test key (no secret) <none@debian.org>
+
+ fixup_buildinfo test_1.0-1.dsc test_1.0-1_${_ARCH}.buildinfo
+ signfile buildinfo test_1.0-1_${_ARCH}.buildinfo uscan test key (no secret) <none@debian.org>
+
+ fixup_changes dsc test_1.0-1.dsc test_1.0-1_${_ARCH}.changes
+ fixup_changes buildinfo test_1.0-1_${_ARCH}.buildinfo test_1.0-1_${_ARCH}.changes
+ signfile changes test_1.0-1_${_ARCH}.changes uscan test key (no secret) <none@debian.org>
+
+ Successfully signed dsc, buildinfo, changes files
+EOS
+ else
+ cat >> ${WORKDIR}/package_lifecycle/debuild.txt <<-EOS
+ signfile dsc test_1.0-1.dsc uscan test key (no secret) <none@debian.org>
- signfile test_1.0-1_${_ARCH}.changes uscan test key (no secret) <none@debian.org>
+ fixup_changes dsc test_1.0-1.dsc test_1.0-1_${_ARCH}.changes
+ signfile changes test_1.0-1_${_ARCH}.changes uscan test key (no secret) <none@debian.org>
- Successfully signed dsc and changes files
+ Successfully signed dsc, changes files
EOS
+ fi
runCommandOutCmpFile "-k'uscan test key (no secret) <none@debian.org>'" "${WORKDIR}/package_lifecycle/debuild.txt" "" 0
cd ${WORKDIR}
}
@@ -272,12 +290,30 @@
dpkg-source --after-build test
dpkg-buildpackage: binary and diff upload (original source NOT included)
Now signing changes and any dsc files...
- signfile test_1.0-2.dsc uscan test key (no secret) <none@debian.org>
+EOS
+ if which dpkg-genbuildinfo >/dev/null 2>&1; then
+ cat >> ${WORKDIR}/package_lifecycle/debuild.txt <<-EOS
+ signfile dsc test_1.0-2.dsc uscan test key (no secret) <none@debian.org>
+
+ fixup_buildinfo test_1.0-2.dsc test_1.0-2_${_ARCH}.buildinfo
+ signfile buildinfo test_1.0-2_${_ARCH}.buildinfo uscan test key (no secret) <none@debian.org>
+
+ fixup_changes dsc test_1.0-2.dsc test_1.0-2_${_ARCH}.changes
+ fixup_changes buildinfo test_1.0-2_${_ARCH}.buildinfo test_1.0-2_${_ARCH}.changes
+ signfile changes test_1.0-2_${_ARCH}.changes uscan test key (no secret) <none@debian.org>
+
+ Successfully signed dsc, buildinfo, changes files
+EOS
+ else
+ cat >> ${WORKDIR}/package_lifecycle/debuild.txt <<-EOS
+ signfile dsc test_1.0-2.dsc uscan test key (no secret) <none@debian.org>
- signfile test_1.0-2_${_ARCH}.changes uscan test key (no secret) <none@debian.org>
+ fixup_changes dsc test_1.0-2.dsc test_1.0-2_${_ARCH}.changes
+ signfile changes test_1.0-2_${_ARCH}.changes uscan test key (no secret) <none@debian.org>
- Successfully signed dsc and changes files
+ Successfully signed dsc, changes files
EOS
+ fi
runCommandOutCmpFile "-k'uscan test key (no secret) <none@debian.org>'" "${WORKDIR}/package_lifecycle/debuild.txt" "" 0
cd ${WORKDIR}
}
Reply to: