Your message dated Wed, 14 Nov 2007 22:17:03 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#448795: fixed in devscripts 2.10.11
has caused the attached Bug report 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 I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message ---
Package: devscripts
Version: 2.10.10
Severity: normal
Tags: patch
The --mainttrailer behavior is so much nicer for team-maintained
projects, as it avoids many merge conflicts, that I think it should be the
default behavior whenever DEBCHANGE_RELEASE_HEURISTIC=changelog, with a
--nomainttrailer in case there'a a reason to disable it.
(It probably shouldn't be the default for DEBCHANGE_RELEASE_HEURISTIC=log,
because in that mode you don't typically finish off with dch -r, which
is needed to update the trailer line just before release.)
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.22-2-686 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages devscripts depends on:
ii debianutils 2.27 Miscellaneous utilities specific t
ii dpkg-dev 1.14.7 package building tools for Debian
ii libc6 2.6.1-6 GNU C Library: Shared libraries
ii perl 5.8.8-11.1 Larry Wall's Practical Extraction
ii sed 4.1.5-4 The GNU sed stream editor
Versions of packages devscripts recommends:
ii fakeroot 1.8.2 Gives a fake root environment
-- no debconf information
--
see shy jo
Index: debian/changelog
===================================================================
--- debian/changelog (revision 826)
+++ debian/changelog (working copy)
@@ -1,3 +1,10 @@
+devscripts (2.10.11) UNRELEASED; urgency=low
+
+ * Make --mainttrailer default to on when using the "changelog"
+ release heuristic.
+
+ -- Joey Hess <[EMAIL PROTECTED]> Wed, 31 Oct 2007 19:51:14 -0400
+
devscripts (2.10.10) unstable; urgency=low
[ Adam D. Barratt ]
Index: scripts/debchange.1
===================================================================
--- scripts/debchange.1 (revision 826)
+++ scripts/debchange.1 (working copy)
@@ -58,9 +58,10 @@
upload failed. The alternate "changelog" heuristic assumes the package has
been released unless its changelog contains "UNRELEASED" in the
distribution field. If this heuristic is enabled then the distribution will
-default to "UNRELEASED" in new changelog entries. This can be useful if a
-package can be released by different maintainers, or if you do not keep the
-upload logs.
+default to "UNRELEASED" in new changelog entries, and the
+\fB\-\-mainttrailer\fR option described below will be automatically
+enabled. This can be useful if a package can be released by different
+maintainers, or if you do not keep the upload logs.
.PP
If either \fB\-\-increment\fR or \fB\-\-newversion\fR is used, the
name and email for the new version will be determined as follows. If
@@ -161,9 +162,10 @@
version number has changed.
.TP
.BR \-\-edit ", " \-e
-Update the changelog timestamp, and start an editor.
+Edit the changelog in an editor.
.TP
.BR \-\-release ", " \-r
+Finalize the changelog for a release.
Update the changelog timestamp. If the distribution is set to
"UNRELEASED", change it to the distribution from the previous changelog entry
(or another distribution as specified by \fB\-\-distribution\fR). If there are
@@ -265,13 +267,14 @@
multi-maintainer mode is in use; you will probably wish to check the
changelog manually before uploading it in such cases.
.TP
-.BR \-\-mainttrailer ", " \-t
-Do not modify the existing changelog trailer line (i.e. the maintainer and
-date-stamp details). This option differs from \fB\-\-maintmaint\fR in that it
-will use multi-maintainer mode if appropriate, with the exception of editing
-the trailer. This option will be ignored if combined with options that require
-the trailer to be modified (e.g. \fB\-\-create\fR, \fB\-\-release\fR,
-\fB\-i\fR, \fB\-\-qa\fR, etc.)
+.BR \-\-[no]mainttrailer ", " \-t
+If mainttrailer is set, it will avoid modifying the existing changelog
+trailer line (i.e. the maintainer and date-stamp details), unless
+used with options that require the trailer to be modified
+(e.g. \fB\-\-create\fR, \fB\-\-release\fR, \fB\-i\fR, \fB\-\-qa\fR, etc.)
+This option differs from \fB\-\-maintmaint\fR in that it will use
+multi-maintainer mode if appropriate, with the exception of editing the
+trailer.
.TP
\fB\-\-check-dirname-level\fR \fIN\fR
See the above section "Directory name checking" for an explanation of
Index: scripts/debchange.pl
===================================================================
--- scripts/debchange.pl (revision 826)
+++ scripts/debchange.pl (working copy)
@@ -272,7 +272,7 @@
"multimaint!" => \$opt_multimaint,
"multi-maint!" => \$opt_multimaint,
"m|maintmaint" => \$opt_m,
- "t|mainttrailer" => \$opt_t,
+ "t|mainttrailer!" => \$opt_t,
"ignore-dirname" => \$opt_ignore,
"check-dirname-level=s" => \$opt_level,
"check-dirname-regex=s" => \$opt_regex,
@@ -284,6 +284,12 @@
$opt_news = 'debian/NEWS' if defined $opt_news and $opt_news eq '';
+if (! defined $opt_t && $opt_release_heuristic eq 'changelog') {
+print "forced on\n";
+ $opt_t = 1;
+}
+print "t: $opt_t\n";
+
if ($opt_noconf) {
fatal "--no-conf is only acceptable as the first command-line option!";
}
signature.asc
Description: Digital signature
--- End Message ---
--- Begin Message ---
Source: devscripts
Source-Version: 2.10.11
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:
devscripts_2.10.11.dsc
to pool/main/d/devscripts/devscripts_2.10.11.dsc
devscripts_2.10.11.tar.gz
to pool/main/d/devscripts/devscripts_2.10.11.tar.gz
devscripts_2.10.11_i386.deb
to pool/main/d/devscripts/devscripts_2.10.11_i386.deb
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.
Luk Claes <[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: SHA1
Format: 1.7
Date: Wed, 14 Nov 2007 22:53:22 +0100
Source: devscripts
Binary: devscripts
Architecture: source i386
Version: 2.10.11
Distribution: unstable
Urgency: low
Maintainer: Devscripts Devel Team <[EMAIL PROTECTED]>
Changed-By: Luk Claes <[EMAIL PROTECTED]>
Description:
devscripts - Scripts to make the life of a Debian Package maintainer easier
Closes: 419657 420899 438971 439666 439667 448636 448730 448795
Changes:
devscripts (2.10.11) unstable; urgency=low
.
[ Adam D. Barratt ]
* uscan: Correctly parse HTMLised FTP directory listings. Thanks to
Vaclav Ovsik for the patch (Closes: #448636)
* desktop2menu: New script to generate skeleton menu files from
freedesktop.org .desktop files. Thanks to Sune Vuorela (Closes: #448730)
* debchange: Default to using -t / --mainttrailer when using the "changelog"
heuristic. Thanks to Joey Hess for the patch (Closes: #448795)
* debcommit: Automatically include the changelog in the list of files to be
committed (Closes: #419657, again)
* debcommit: Correctly pull the depot path from the output of svk info
.
[ Luk Claes ]
* debdiff: Support tarball in tarball (Closes: #439667).
* debdiff: Support p-u-new use case (Closes: #439666).
* chdist: New script to easily play with several distributions.
Closes: #438971
* debian/control: Add build dependency on libfile-desktopentry-perl and
liburi-perl so perl -c won't fail for desktop2menu and rmadison.
.
[ Joey Hess ]
* debcommit: Avoid svk hang by only running svk if ~/.svk/local exists.
Closes: #420899
* debcommit: Try harder to see if the package is in git. Look for
.git in parent directories too.
Files:
1feb06a8a53daf0aabea721733e3707f 1131 devel optional devscripts_2.10.11.dsc
7d6732241467c628522aa7ad457a7494 483786 devel optional
devscripts_2.10.11.tar.gz
b82e648a41ecf30b04c1bc020cf0ddb4 420650 devel optional
devscripts_2.10.11_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFHO29p5UTeB5t8Mo0RArqpAJ99vTgOjISOnxr8SO5Ux1U74k70qgCfX38i
TyLQJd9qhnm+03PBn9sAJd0=
=iaZh
-----END PGP SIGNATURE-----
--- End Message ---
