Your message dated Sun, 22 Apr 2018 22:50:34 +0000
with message-id <[email protected]>
and subject line Bug#662794: fixed in devscripts 2.18.2
has caused the Debian Bug report #662794,
regarding [devscripts] [nmudiff] Please, add a non-dd template for those who
can not upload NMUs
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
662794: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=662794
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: devscripts
Version: 2.11.4
Severity: wishlist
Tags: patch
Non-DDs can't upload NMUs but can write patches and use nmudiff.
Default behaviour of nmudiff is not adapted to non-DDs because:
1.- Pending tag is applied.
2.- Default message says the package will be uploaded.
I know you can edit the message each time, but it is a little bit tedious ;)
A patch that fixes these two items is attached.
Moreover, this patch also fixes #555863 providing an option that allows you
to pass a template for message.
Thanks for your work!
Description: Adds two options to nmudiff:
--non-dd: uses a message adapted to non-DDs and does not add pending tag.
--template=TEMPLATEFILE: uses content of TEMPLATEFILE for he message.
Author: Mònica Ramírez Arceda <[email protected]>
Last-Update: 2012-03-06
diff -ru devscripts-2.11.4/scripts/nmudiff.1 devscripts-2.11.5/scripts/nmudiff.1
--- devscripts-2.11.4/scripts/nmudiff.1 2011-12-22 22:39:47.000000000 +0100
+++ devscripts-2.11.5/scripts/nmudiff.1 2012-03-06 11:25:38.666975875 +0100
@@ -71,6 +71,14 @@
Do not read any configuration files. This can only be used as the
first option given on the command-line.
.TP
+\fB\-\-non\-dd\fR, \fB\-\-nondd\fR
+Use a different message, specially designed for non-DDs, who can not upload NMUs.
+Pending tag won't be added.
+.TP
+\fB\-\-template\fR \fITEMPLATEFILE\fR
+Use content of TEMPLATEFILE for message body instead of default template.
+If TEMPLATEFILE does not exist, default template is applied.
+.TP
.B \-\-help
Display a help message and exit successfully.
.TP
diff -ru devscripts-2.11.4/scripts/nmudiff.sh devscripts-2.11.5/scripts/nmudiff.sh
--- devscripts-2.11.4/scripts/nmudiff.sh 2011-12-22 22:39:47.000000000 +0100
+++ devscripts-2.11.5/scripts/nmudiff.sh 2012-03-06 11:23:55.586975870 +0100
@@ -42,6 +42,10 @@
--no-conf, --noconf
Don't read devscripts config files;
must be the first option given
+ --non-dd, --nondd
+ Use a message adapted to non-DDs.
+ --template=TEMPLATEFILE
+ Use content of TEMPLATEFILE for message.
--help, -h Show this help information.
--version Show version and copyright information.
@@ -146,6 +150,8 @@
--long sendmail:,from:,new,old,mutt,no-mutt,nomutt \
--long delay:,no-delay,nodelay \
--long no-conf,noconf \
+ --long non-dd,nondd \
+ --long template: \
--long help,version -n "$PROGNAME" -- "$@") || (usage >&2; exit 1)
eval set -- $TEMP
@@ -201,6 +207,21 @@
--no-conf|--noconf)
echo "$PROGNAME: $1 is only acceptable as the first command-line option!" >&2
exit 1 ;;
+ --non-dd|--nondd)
+ NMUDIFF_NONDD=yes ;;
+ --template)
+ shift
+ case "$1" in
+ "") echo "$PROGNAME: TEMPLATEFILE cannot be empty, using default" >&2
+ ;;
+ *) if [ -f "$1" ]; then
+ NMUDIFF_TEMPLATE="$1"
+ else
+ echo "$PROGNAME: TEMPLATEFILE must exist, using default" >&2
+ fi
+ ;;
+ esac
+ ;;
--help|-h) usage; exit 0 ;;
--version) version; exit 0 ;;
--) shift; break ;;
@@ -325,7 +346,7 @@
TAGS="$TAGS
tags $b + patch"
fi
- if [ "$NMUDIFF_DELAY" != "0" ] && [ "`bts select bugs:$b tag:pending`" != "$b" ]; then
+ if [ "$NMUDIFF_DELAY" != "0" ] && [ "`bts select bugs:$b tag:pending`" != "$b" ] && [ "$NMUDIFF_NONDD" != "yes" ]; then
TAGS="$TAGS
tags $b + pending"
fi
@@ -342,20 +363,33 @@
TMPNAM="$( tempfile )"
-if [ "$NMUDIFF_DELAY" = "XX" ]; then
+if [ "$NMUDIFF_DELAY" = "XX" ] && [ "$NMUDIFF_NONDD" != "yes" ] && [ "$NMUDIFF_TEMPLATE" = "" ]; then
DELAY_HEADER="
[Replace XX with correct value]"
fi
-if [ "$NMUDIFF_DELAY" = "0" ]; then
- BODY="$(printf "%s\n%s\n" \
+if [ "$NMUDIFF_TEMPLATE" != "" ]; then
+ BODY=$(cat "$NMUDIFF_TEMPLATE")
+elif [ "$NMUDIFF_NONDD" = "yes" ]; then
+ BODY="$(printf "%s\n\n%s\n%s\n\n%s\n" \
+"Dear maintainer," \
"I've prepared an NMU for $SOURCE (versioned as $VERSION). The diff" \
-"is attached to this message.")"
+"is attached to this message. I've not uploaded this NMU as I'm not a DD
+but I hope it is useful for you." \
+"Regards.")"
+elif [ "$NMUDIFF_DELAY" = "0" ]; then
+ BODY="$(printf "%s\n\n%s\n%s\n\n%s\n" \
+"Dear maintainer," \
+"I've prepared an NMU for $SOURCE (versioned as $VERSION). The diff" \
+"is attached to this message." \
+"Regards.")"
else
- BODY="$(printf "%s\n%s\n%s\n" \
+ BODY="$(printf "%s\n\n%s\n%s\n%s\n\n%s\n" \
+"Dear maintainer," \
"I've prepared an NMU for $SOURCE (versioned as $VERSION) and" \
"uploaded it to DELAYED/$NMUDIFF_DELAY. Please feel free to tell me if I" \
-"should delay it longer.")"
+"should delay it longer." \
+"Regards.")"
fi
if [ "$NMUDIFF_MUTT" = no ]; then
@@ -370,11 +404,7 @@
$TAGS
$DELAY_HEADER
-Dear maintainer,
-
$BODY
-
-Regards.
EOF
cat ../${SOURCE}-${VERSION_NO_EPOCH}-nmu.diff >> "$TMPNAM"
@@ -409,11 +439,7 @@
cat <<EOF > "$TMPNAM"
$TAGS
$DELAY_HEADER
-Dear maintainer,
-
$BODY
-
-Regards.
EOF
mutt -s "$SOURCE: diff for NMU version $VERSION" -i "$TMPNAM" \
signature.asc
Description: This is a digitally signed message part
--- End Message ---
--- Begin Message ---
Source: devscripts
Source-Version: 2.18.2
We believe that the bug you reported is fixed in the latest version of
devscripts, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Mattia Rizzolo <[email protected]> (supplier of updated devscripts package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Mon, 23 Apr 2018 00:33:07 +0200
Source: devscripts
Binary: devscripts
Architecture: source
Version: 2.18.2
Distribution: unstable
Urgency: medium
Maintainer: Devscripts Maintainers <[email protected]>
Changed-By: Mattia Rizzolo <[email protected]>
Description:
devscripts - scripts to make the life of a Debian Package maintainer easier
Closes: 555863 662794 808574 823624 858287 859617 884177
Changes:
devscripts (2.18.2) unstable; urgency=medium
.
[ Daniel Kahn Gillmor ]
* uscan:
+ Add short archive extensions (tbz, txz, tgz) in the @ARCHIVE_EXT@
regexp. Closes: #823624
.
[ Ben Finney ]
* suspicious-source:
+ Correct "preferred form of the work for making modifications to it".
Closes: #859617
.
[ Nish Aravamudan ]
* dep3changelog:
+ Make parsing less strict about blank lines.
Closes: #858287; LP: #1673292
.
[ Ben Wiederhake ]
* wrap-and-sort:
+ Add a dry-run option. Closes: #808574
.
[ Hilko Bengen ]
* debsnap:
+ Complain about existing destdir only when it is created.
Closes: #884177
.
[ Mònica Ramírez Arceda ]
* nmudiff:
+ Add a template argument to provide a different email from the one in the
script. Closes: #555863
.
[ Pierre-Elliott Bécue ]
* d/control:
+ Add myself to uploaders.
* wrap-and-sort:
+ Tweak the way files are handled, and print the modified file list in
also in non-dry-run-mode when verbosity is enabled.
+ Remove empty lines at the beginning of a file.
* nmudiff:
+ Add a no-pending option to not add the pending tag if needed.
+ Add a non-dd option to ask for a sponsor in the email.
Closes: #662794
.
[ Mattia Rizzolo ]
* mk-origtargz:
+ Deal with Hurd where `getconf ARG_MAX` returns "undefined".
* Fix some pylint issues that are reported only by stretch's pylint.
* d/control:
+ Bump Standards-Version to 4.1.4, no changes needed.
* test_package_lifecycle:
+ Don't depend on /usr/share/doc being available on the build host.
* sadt:
+ Fixup the check_depends() caching functionality. MR: !9
.
[ Adam D. Barratt ]
* debdiff:
+ Sort shlibs files before comparing. The order of entries is not
significant.
.
[ Paul Wise ]
* chdist, cowpoke:
+ Default to deb.debian.org instead.
.
[ Antonio Terceiro ]
* uscan:
+ Redirect Alioth's gemwatch to gemwatch.debian.net. MR: !2
* debrepro:
+ Vary between timezones that are more than 1 day apart. MR: !3
+ Add a --before-second-build option, to inject extra command before
the second build runs. MR: !4
+ Add a testcase. MR: !8
.
[ Chris Lamb ]
* debsign:
+ To prevent collision attacks, refuse to sign with short key IDs (eg.
0xCAFEBABE) and warn when not using full GPG fingerprint. MR: !1
.
[ Dmitry Shachnev ]
* sadt:
+ Set AUTOPKGTEST_TMP environment variable. MR: !5
.
[ Sean Whitton ]
* git-deborig: MR: !7
+ New --just-print option.
- Add recommends and build-depends on libstring-shellquote-perl.
+ New --version option.
+ New --force alias for -f.
+ Correct terminology ref->committish (see gitglossary(7)).
+ Add to the manpage details about gitattributes(5) manipulation.
Checksums-Sha1:
289ab46a972caef539f129608dbde51721e71829 2702 devscripts_2.18.2.dsc
5ce0115ae109e408d4dbfc19fc7a645a790dfc0c 729456 devscripts_2.18.2.tar.xz
591d12355622652ad720936dd03bcffb7af25e9c 10419
devscripts_2.18.2_amd64.buildinfo
Checksums-Sha256:
f9bd3862af4864c1954c4845c2dc828de16ef0710b414389f9b332ca979d7de4 2702
devscripts_2.18.2.dsc
645b5814be7a9d1f4f3df1931f6d9c645e1fd75071ddafabd798f9459277d435 729456
devscripts_2.18.2.tar.xz
8d15987e5e8eb63faf1be2ba4b2a0c6750c8eae7656bc6ee9355498815003d7d 10419
devscripts_2.18.2_amd64.buildinfo
Files:
ce07c5208b659fe01761e32c57340415 2702 devel optional devscripts_2.18.2.dsc
a63bc7e383b116ba8766313482aefaee 729456 devel optional devscripts_2.18.2.tar.xz
d86011c8064e772a85867604c3a73349 10419 devel optional
devscripts_2.18.2_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEi3hoeGwz5cZMTQpICBa54Yx2K60FAlrdDsUACgkQCBa54Yx2
K63hchAAgUGNPZZ9LGS/fSYsh+vqB+rMh06cn4dfluxA/aKmCbYKf+yguFmu/4zR
Qn8vjF2i3WZA9MSvAJG9FBvoTzEv5eExc1r8T6gRsuS0A9F6oKceqJVyI3Il/EXO
b1pp7E2S0oJ/nIzVwCSLp0i/tBOVlzy1HjmnGHqtBl1QbJJYGnV9JChGW5DUMUsI
0bESyR/fjbw7w/2P8FhIIE+gjMswOVA7gT9oNO5x6KGbGeGaxPe43TqoTzIIjQlN
GwhADN7YePDvZQEKeveK8cd0ckqtcUl3eEIA9UUYrl9X4rjFKquxe74VYjGanitl
oPL2w8e6DXlT26prN7lucUoJUqsJqVN1mSBhbBY7jqeqpI/el2eZs09UqD+E7nYF
1tdl+50NnNEUjjPa51FSQ4qpN3iRnVl9YOpZSyVdip+RUHlvTRK/INCb1JeL+rFf
KZG8RXeIrCrLuxGXpscLMuExpPZIEibHhq6AxQ4Yu9YEll3DkQxhY1DPY+CRG4gT
WfuqUSjXCcw3hZ3vhfmqEQXESR8keZEb0kHll775iqAKPnMQykbnYWwmk+7JkOQe
zg1RBVfAFfmN1sqJ8y/9WeKaxK0ouBfJXdwB+A5uXwnq1kEiuWyJYSOtYgFPtF9a
Rx3ns0p1WL2A7RuCfjN6Y3KWTYRvLG7l5Z8f9rgjvWf0BfECCSM=
=h4s7
-----END PGP SIGNATURE-----
--- End Message ---
