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
