Your message dated Tue, 13 Jul 2010 03:32:07 +0000
with message-id <[email protected]>
and subject line Bug#552693: fixed in devscripts 2.10.65
has caused the Debian Bug report #552693,
regarding [diff2patches] Please add information to manpage about patch names
and locations
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.)
--
552693: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=552693
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: devscripts
Version: 2.10.55
Severity: wishlist
Tags: patch
Hi,
At the moment, the diff2patches manpage is sort of sparse. I think it
should document that the debian directory is the default if
debian/patches doesn't exist, and clarify whether the patches are
broken up and how they are named.
I had to go into the source to get this information, and I've attached
a simple patch that I think makes this clearer in the manpage.
Regards,
Daniel
-- Package-specific info:
--- /etc/devscripts.conf ---
--- ~/.devscripts ---
DEBRELEASE_UPLOADER=dput
DEBSIGN_KEYID=D7F1B32A
DEBUILD_DPKG_BUILDPACKAGE_OPTS="-ICVS -I.svn -I.bzr -I.git -I.hg"
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.30-2-amd64 (SMP w/2 CPU cores)
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 dpkg-dev 1.15.4.1 Debian package development tools
ii libc6 2.10.1-2 GNU C Library: Shared libraries
ii perl 5.10.1-5 Larry Wall's Practical Extraction
Versions of packages devscripts recommends:
ii at 3.1.11-1 Delayed job execution and batch pr
ii bsd-mailx [mailx] 8.1.2-0.20090911cvs-2 simple mail user agent
ii bzr 2.0.1-1 easy to use distributed version co
ii curl 7.19.5-1.1 Get a file from an HTTP, HTTPS or
ii cvs 1:1.12.13-12 Concurrent Versions System
ii dctrl-tools 2.13.1 Command-line tools to process Debi
ii debian-keyring [de 2009.08.27 GnuPG (and obsolete PGP) keys of D
ii dput 0.9.5.1 Debian package upload tool
pn equivs <none> (no description available)
ii fakeroot 1.14 Gives a fake root environment
ii git-core 1:1.6.5-1 fast, scalable, distributed revisi
ii gnupg 1.4.10-2 GNU privacy guard - a free PGP rep
ii iceweasel [www-bro 3.5.3-2 lightweight web browser based on M
ii konqueror [www-bro 4:4.3.2-1 KDE 4's advanced file manager, web
pn libauthen-sasl-per <none> (no description available)
ii libcrypt-ssleay-pe 0.57-2 Support for https protocol in LWP
ii libparse-debcontro 2.005-2 Easy OO parsing of Debian control-
ii libsoap-lite-perl 0.710.08-2 Client and server side SOAP implem
pn libterm-size-perl <none> (no description available)
ii libtimedate-perl 1.1900-1 Time and date functions for Perl
ii liburi-perl 1.37+dfsg-1 Manipulates and accesses URI strin
ii libwww-perl 5.833-1 Perl HTTP/WWW client/server librar
pn libyaml-syck-perl <none> (no description available)
ii lintian 2.2.17 Debian package checker
ii lsb-release 3.2-23 Linux Standard Base version report
ii lzma 4.43-14 Compression method of 7z format in
ii man-db 2.5.6-3 on-line manual pager
ii mercurial 1.3.1-1 scalable distributed version contr
ii openssh-client [ss 1:5.1p1-8 secure shell client, an rlogin/rsh
ii patch 2.5.9-5 Apply a diff file to an original
ii patchutils 0.3.1-2 Utilities to work with patches
ii sensible-utils 0.0.1 Utilities for sensible alternative
ii strace 4.5.19-1 A system call tracer
ii subversion 1.6.6dfsg-1 Advanced version control system
ii unzip 6.0-1 De-archiver for .zip files
pn wdiff <none> (no description available)
ii wget 1.12-1 retrieves files from the web
Versions of packages devscripts suggests:
ii build-essential 11.4 Informational list of build-essent
pn cvs-buildpackage <none> (no description available)
ii devscripts-el 30.9-1 Emacs wrappers for the commands in
pn gnuplot <none> (no description available)
pn libfile-desktopentry-perl <none> (no description available)
pn libnet-smtp-ssl-perl <none> (no description available)
pn mutt <none> (no description available)
ii svn-buildpackage 0.6.29 helper programs to maintain Debian
-- no debconf information
Index: scripts/diff2patches.1
===================================================================
--- scripts/diff2patches.1 (revision 2015)
+++ scripts/diff2patches.1 (working copy)
@@ -21,6 +21,9 @@
.TP
\fB\-\-version\fR
Output version information and exit.
+.SH "PATCH NAME CONVENTIONS"
+.LP
+For each file outside the debian/ directory that is modified in the .diff.gz, one patch is created. The name of the patch is the relative path from the base of the source tree to the modified file, with three underscores substituted for each backslash. The new patch names end in '.patch'.
.SH "FILES"
.LP
\fIdebian/control\fP
@@ -28,7 +31,7 @@
.br
\fIdebian/patches\fP
When present and is a directory, patches are extracted in that directory,
-unless \fIDEB_PATCHES\fP is defined (read the "ENVIRONMENT VARIABLES" section below).
+unless \fIDEB_PATCHES\fP is defined (read the "ENVIRONMENT VARIABLES" section below). If \fIdebian/patches\fP doesn't exist, and \fIDEB_PATCHES\fP isn't set, then patches are extracted into the \fIdebian\fP directory.
.SH "ENVIRONMENT VARIABLES"
.TP
\fIDEB_PATCHES\fP
--- End Message ---
--- Begin Message ---
Source: devscripts
Source-Version: 2.10.65
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.65.dsc
to main/d/devscripts/devscripts_2.10.65.dsc
devscripts_2.10.65.tar.gz
to main/d/devscripts/devscripts_2.10.65.tar.gz
devscripts_2.10.65_i386.deb
to main/d/devscripts/devscripts_2.10.65_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.
James Vega <[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: RIPEMD160
Format: 1.8
Date: Mon, 12 Jul 2010 23:22:08 -0400
Source: devscripts
Binary: devscripts
Architecture: source i386
Version: 2.10.65
Distribution: unstable
Urgency: low
Maintainer: Devscripts Devel Team <[email protected]>
Changed-By: James Vega <[email protected]>
Description:
devscripts - scripts to make the life of a Debian Package maintainer easier
Closes: 497489 498898 530581 531327 535368 552693 563390 565889 572006 577564
577998 578118 578167 578334 580600 581224 583067 584734 584735 587217 587265
587517 588502 588714
Changes:
devscripts (2.10.65) unstable; urgency=low
.
[ James Vega ]
* Remove mergechanges from the set of commands which use completion of
package names. (Closes: #578167)
* bts:
+ Use sendmail to send mails with extra headers when $(DEB)EMAIL aren't
present. (Closes: #577564)
+ Document that $(DEB)EMAIL must be in the environment to send email using
either --mutt or --smtp-host. (Closes: #578334)
+ Cleanup the help output and add some options which were only documented
in the man page.
+ Allow specifying multiple tag modifiers (+, -, =) in one tag stanza.
(Closes: #578118)
+ Document the valid values for the status key in the select command.
(Closes: #583067)
* debsnap:
+ Iterate over the list of files listed for a hash until we find one that
matches the requested package. (Closes: #584734)
+ Warn and move on to the next file if no files are present for a given
hash or none match the requested package. (Closes: #587265)
+ Handle error responses from snapshot.debian.org. (Closes: #587217)
+ Use the basename of the file being downloaded as the name under which to
save it. (Closes: #584735)
+ Do not remove the destination directory when --force is given. (Closes:
#587517)
* Remove --ignore-dirname options (and deprecation notices) from all
scripts. 6.5 years is long enough to stop using that option.
* diff2patches: Document the patch naming scheme and use of “debian/” as the
destination directory when “debian/patches/” doesn't exist. (Closes:
#552693)
* mk-build-deps:
+ Add options to build packages which depend on solely Build-Depends or
Build-Depends-Indep. (Closes: #498898)
+ Include build-essential in Depends. (Closes: #565889)
* debi: Use “dpkg -O” instead of parsing dpkg-query's output to upgrade only
packages which are already installed. (Closes: #563390)
* debcheckout: Specifically call out that Debian hosts are already handled
in DEBCHECKOUT_AUTH_URLS' description. Thanks to martin f. krafft for the
suggested wording. (Closes: #530581)
* debchange: When running “dch -r”, use <dist>-backports if a backports
upload is detected. (Closes: #588502)
* uupdate: Use “0ubuntu1” for the Debian revision of the version number when
running uupdate on Ubuntu systems. Based on a patch by Guillaume Martres.
(Closes: #577998)
* Ship French man pages in UTF-8 now that #196762 is fixed.
.
[ Martin Zobel-Helas ]
* Remove svk from Recommends, it is no longer in the archive. (Closes:
#581224)
.
[ Raphael Geissert ]
* checkbashisms:
+ Makefile handling:
- Simplify make variables as shell variables. (Closes: #535368)
- Convert all $$ to $.
- Recognize SHELL setting in Makefile when being set as an override.
- Ignore make's '-' for ignore errors.
- Fix some false positives due to target names.
+ Detect incorrect use of ^ instead of ! for negation in pattern matching
collections. (Closes: #497489)
+ Detect use of {post,pre}{increment,decrement} in arithmetic expansion.
(Closes: #572006)
+ Detect use of Bash's “printf -v var ...” or the %b and %q format
specifiers.
+ Detect use of the Bash's “coproc” keyword.
+ Detect use of Bash's “;;&” and ”;&” operators.
+ Add support for handling line continuations. (Closes: #531327)
+ Fix a false positive with file redirection.
+ Fix handling of indented heredoc delimiters.
+ Fix some parsing of quoted strings.
+ Detect use of exponentiation.
+ Detect use of the 'jobs' built-in.
+ Detect use of command with options other than “-p”.
+ Fix a false positive with redirection to an fd specified via a variable.
+ Detect unexpected EOF for unclosed heredocs, quoted strings, and line
continuations.
.
[ Simon McVittie ]
* mk-build-deps:
+ Build an Arch: any package if any of the Build-Depends have architecture
requirements. (Closes: #580600)
+ Allow specifying for which architecture to build the package.
.
[ Charles Plessy ]
* debchange: Add “--team” support. (Closes: #588714)
Checksums-Sha1:
7a5cef643ff4765dc78ddebd8bf8802ac81c37be 1443 devscripts_2.10.65.dsc
540b4c2cbfcb66b11f0ef2b3dc92a91ffad59a85 694458 devscripts_2.10.65.tar.gz
261b1a008f97f565b59f9456124101b23679195e 596490 devscripts_2.10.65_i386.deb
Checksums-Sha256:
73d71094e5f31c1cce5b0b973152393c27ddd59bb80024f9613179f3933ef24e 1443
devscripts_2.10.65.dsc
be522f5f3aa505e7b7d9d47f8c6a61fc0e237d4329b2337b044344a21603d69c 694458
devscripts_2.10.65.tar.gz
3a5c62ce42058c9674aa46769c1382951a9ca091162b7bf5350dc0f22f220629 596490
devscripts_2.10.65_i386.deb
Files:
20b6efe0127f91ec59ddf4fa5e444063 1443 devel optional devscripts_2.10.65.dsc
6f8943b59841c8cb83db41c5c6f9918f 694458 devel optional
devscripts_2.10.65.tar.gz
ef79ab1e4f44baa88e737a1c563f6346 596490 devel optional
devscripts_2.10.65_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iEYEAREDAAYFAkw73YIACgkQDb3UpmEybUD13QCgnQcZL4wdc7qAzeb1IEEg6y+V
p8sAnjhxcNtccj48HCDy82WGEu/WpaL5
=BgGK
-----END PGP SIGNATURE-----
--- End Message ---
