Your message dated Sat, 03 May 2008 16:47:04 +0000 with message-id <[EMAIL PROTECTED]> and subject line Bug#478667: fixed in devscripts 2.10.27 has caused the Debian Bug report #478667, regarding [debcommit] bzr diff broken 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.) -- 478667: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=478667 Debian Bug Tracking System Contact [EMAIL PROTECTED] with problems
--- Begin Message ---Package: devscripts Version: 2.10.26 Severity: important Tags: patch User: [EMAIL PROTECTED] Usertags: origin-ubuntu ubuntu-patch intrepid The change to use 'bzr diff --using /usr/bin/diff --diff-options -wu' broke bzr commit message detection. <[EMAIL PROTECTED] ~/src/ubuntu/base-installer/base-installer>$ debcommit debcommit: unable to determine commit message using bzr Try using the -m flag. <[EMAIL PROTECTED] ~/src/ubuntu/base-installer/base-installer>$ bzr di debian/changelog === modified file 'debian/changelog' --- debian/changelog 2008-02-19 10:26:56 +0000 +++ debian/changelog 2008-04-30 08:02:17 +0000 @@ -1,3 +1,9 @@ +base-installer (1.86ubuntu3) UNRELEASED; urgency=low + + * Use powerpc64-smp kernel on PS3/Cell (LP: #221647). + + -- Colin Watson <[EMAIL PROTECTED]> Wed, 30 Apr 2008 09:02:03 +0100 + base-installer (1.86ubuntu2) hardy; urgency=low [ Colin Watson ] <[EMAIL PROTECTED] ~/src/ubuntu/base-installer/base-installer>$ bzr diff --using /usr/bin/diff --diff-options -wu debian/changelog === modified file 'debian/changelog' 0a1,6 > base-installer (1.86ubuntu3) UNRELEASED; urgency=low > > * Use powerpc64-smp kernel on PS3/Cell (LP: #221647). > > -- Colin Watson <[EMAIL PROTECTED]> Wed, 30 Apr 2008 09:02:03 +0100 > <[EMAIL PROTECTED] ~/src/ubuntu/base-installer/base-installer>$ bzr diff --diff-options=-wu debian/changelog === modified file 'debian/changelog' --- debian/changelog 2008-02-19 10:26:56 +0000 +++ debian/changelog 2008-04-30 08:02:17 +0000 @@ -1,3 +1,9 @@ +base-installer (1.86ubuntu3) UNRELEASED; urgency=low + + * Use powerpc64-smp kernel on PS3/Cell (LP: #221647). + + -- Colin Watson <[EMAIL PROTECTED]> Wed, 30 Apr 2008 09:02:03 +0100 + base-installer (1.86ubuntu2) hardy; urgency=low [ Colin Watson ] In other words, the --using option specifies the whole command line, and --diff-options is ignored. The fix is simply to drop --using since bzr already knows to use an external diff program if you supply --diff-options. Patch attached. Thanks, -- Colin Watson [EMAIL PROTECTED]Index: scripts/debcommit.pl =================================================================== --- scripts/debcommit.pl (revision 1410) +++ scripts/debcommit.pl (working copy) @@ -576,7 +576,7 @@ } elsif ($prog eq 'baz') { @diffcmd = ($prog, 'file-diff'); } elsif ($prog eq 'bzr') { - @diffcmd = ($prog, 'diff', '--using', '/usr/bin/diff', '--diff-options', '-wu'); + @diffcmd = ($prog, 'diff', '--diff-options', '-wu'); } elsif ($prog eq 'git') { if ($all) { @diffcmd = ('git', 'diff', '-w', '--no-color');
--- End Message ---
--- Begin Message ---Source: devscripts Source-Version: 2.10.27 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.27.dsc to pool/main/d/devscripts/devscripts_2.10.27.dsc devscripts_2.10.27.tar.gz to pool/main/d/devscripts/devscripts_2.10.27.tar.gz devscripts_2.10.27_amd64.deb to pool/main/d/devscripts/devscripts_2.10.27_amd64.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. Adam D. Barratt <[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.8 Date: Sat, 03 May 2008 17:30:46 +0100 Source: devscripts Binary: devscripts Architecture: source amd64 Version: 2.10.27 Distribution: unstable Urgency: low Maintainer: Devscripts Devel Team <[EMAIL PROTECTED]> Changed-By: Adam D. Barratt <[EMAIL PROTECTED]> Description: devscripts - scripts to make the life of a Debian Package maintainer easier Closes: 477386 477398 477742 477922 478014 478172 478667 478829 Changes: devscripts (2.10.27) unstable; urgency=low . * bts: + When reassigning bugs, CC the maintainer of the new package(s) (Closes: #478014) + Fix an uninitialised value warning when using claim and unclaim with no claim specified and $EMAIL and $DEBEMAIL unset * chdist: Add armel to the list of architectures in the bash completion * checkbashisms: + When rebuilding the list of bashisms to check, ensure it is based on whether the current file is a makefile, rather than whether the previous file was. Thanks to Raphael Geissert for the brown paper bag. + Match use of "SHELL=bash" as well as "SHELL=/bin/bash" in makefile mode + Improve heredoc detection to avoid triggering on "foo bar << x" whilst still matching 'cat <<"xyz"' + Add a variant on the "[ a == b ]" test + Enhance the "echo -e" test to also catch "echo -ne" + Add checks for "type", "time", "dirs" and $UID + Make several of the checks less prone to false positives + Re-enable the check for "complete" * dcmd: + Preserve a leading "./" on .dsc and .changes filenames (Closes: #478172) + Correctly handle packages with a section of "component/section" (Closes: #478829) * debchange: + Correctly handle the BTS returning no bugs for a package when --closes is used (either because the package doesn't exist in the archive or it has no open bugs) (Closes: #477398) + Add intrepid (ibex) to the list of Ubuntu distributions + Skip auto-NMU detection if -e was used or when editing an UNRELEASED changelog and using the "changelog" release heuristic * debcheckout: + Use the Vcs-* headers from the highest available version rather than the first returned by "apt-get source" (Closes: #477386) + Allow the Vcs-* headers from any of the available package versions to be used * debcommit: + Ignore --confirm and --edit when combined with --diff + Fix commit message detection for bzr; thanks Colin Watson (Closes: #478667) + Remove trailing newlines after editing the commit message + Don't attempt to commit if an editor was spawned (either via --edit or automatically) and the user quit without updating and saving the message * licensecheck: Correctly detect LGPLv3+ (Closes: #477742) * tagpending: Use option bundling (so that e.g. "tagpending -ni" works) * transition-check: New script to determine whether a set of source packages is involved in a transition for which uploads to unstable are currently blocked (Closes: #477922) * debian/control: + Add transition-check + Recommend libyaml-syck-perl (for transition-check) + Move build-essential back to Suggests as it's only required by dpkg-depcheck and dpkg-genbuilddeps and will be installed in a build environment anyway + Fix a typo in the Suggests field (svn-buildpacakge) + Move libfile-desktopentry-perl back to Suggests + Remove libdigest-md5-perl from Recommends as it's Provided by perl since sarge + Re-order the "dupload | dput" recommendation to favour dput and remove the version constraint from dupload as it refers to a version older than that in oldstable + Remove the versioned conflicts on debmake, dupload and suidmanager, as they all referred to versions of those packages older than those in oldstable + Remove the version constraints from the perl build-dependency, the perl dependency and the gnupg recommendation, as the referenced versions are all satisfied in oldstable and above + Remove the dependencies on debianutils and sed. Both are essential and the version constraints in the dependencies are satisfied in oldstable and above * README: Add transition-check Checksums-Sha1: 07704e98662be86ffbe98704494126f83b9fde93 1385 devscripts_2.10.27.dsc 6bbb366a0282f911ef206e7d6467d117b08700aa 559297 devscripts_2.10.27.tar.gz 070b3494d94c9f5d3e966fe55fe3c79b7124a7eb 481672 devscripts_2.10.27_amd64.deb Checksums-Sha256: f5a682237e79f7ed58f0756820a751f0eec3a2040a20b9c5c92ab8a05a5654c3 1385 devscripts_2.10.27.dsc d7343fac5d8c451ef3bf5e1d8374559a63f9de7a1024f82426e73229a1f39fd1 559297 devscripts_2.10.27.tar.gz 62790fddb73e57f2b68e0073668fc1fd6910628b5383cdcdae966e07a8e1cd28 481672 devscripts_2.10.27_amd64.deb Files: 65526c398d35a39dcbeff00dd0de6096 1385 devel optional devscripts_2.10.27.dsc 3c27f921dd4f4675704411e432a2d83f 559297 devel optional devscripts_2.10.27.tar.gz 4e58c44bf7feb7aefb73de0fcefaa15a 481672 devel optional devscripts_2.10.27_amd64.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFIHJTOokcE1TReOoURAo6JAKCPIAE5pGawacYRGjgoH5atOc9HywCfQE/E WzwqNFbmqj0Y0I8xKW3Hr78= =CWYj -----END PGP SIGNATURE-----
--- End Message ---
