Package: devscripts Version: 2.10.59 Severity: wishlist Tags: patch
The following patch is against SVN r2052 2009-12-27: - Simplifies the OPTIONS section by presenting the positive and negative options in on statement. An example: --[no-]auto-ver-sort - Presents OPTIONS, CONFIGURATION VARIABLES and SEE ALSO sections in alphabetical order (Cf. GNU cp, mv, OpenSSH etc.) -- Package-specific info: --- /etc/devscripts.conf --- --- ~/.devscripts --- Not present -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.30-2-amd64 (SMP w/2 CPU cores) Locale: LANG=en_DK.UTF-8, LC_CTYPE=en_DK.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages devscripts depends on: ii dpkg-dev 1.15.5.4 Debian package development tools ii libc6 2.10.2-2 GNU C Library: Shared libraries ii perl 5.10.1-8 Larry Wall's Practical Extraction Versions of packages devscripts recommends: ii at 3.1.12-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.2-1 easy to use distributed version co ii curl 7.19.7-1 Get a file from an HTTP, HTTPS or ii cvs 1:1.12.13-12 Concurrent Versions System ii dctrl-tools 2.14 Command-line tools to process Debi ii debian-keyring [de 2009.11.04 GnuPG (and obsolete PGP) keys of D ii dillo [www-browser 2.0-1 Small and fast web browser ii dput 0.9.5.1 Debian package upload tool ii elinks [www-browse 0.12~pre5-1 advanced text-mode WWW browser ii epiphany-browser [ 2.29.3-1 Intuitive GNOME web browser ii equivs 2.0.7-0.1 Circumvent Debian package dependen ii fakeroot 1.14.4-1 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.5-1 lightweight web browser based on M ii konqueror [www-bro 4:4.3.2-1 KDE 4's advanced file manager, web ii libauthen-sasl-per 2.13-1 Authen::SASL - SASL Authentication 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.10-1 Perl implementation of a SOAP clie ii libterm-size-perl 0.2-4+b1 Perl extension for retrieving term ii libtimedate-perl 1.1900-1 Time and date functions for Perl ii liburi-perl 1.50-1 module to manipulate and access UR ii libwww-perl 5.834-1 Perl HTTP/WWW client/server librar ii libyaml-syck-perl 1.07-1 fast, lightweight YAML loader and ii links [www-browser 2.2-1+b1 Web browser running in text mode ii lintian 2.2.18 Debian package checker ii lsb-release 3.2-23 Linux Standard Base version report ii lynx-cur [www-brow 2.8.8dev.1-1 Text-mode WWW Browser with NLS sup ii lzma 4.43-14 Compression method of 7z format in ii mailx 1:20081101-2 Transitional package for mailx ren ii man-db 2.5.6-4 on-line manual pager ii mercurial 1.4.1-1 scalable distributed version contr ii midori [www-browse 0.1.8-1 fast, lightweight graphical web br ii openssh-client [ss 1:5.1p1-8 secure shell client, an rlogin/rsh ii opera [www-browser 10.10.4742.gcc4.qt3 The Opera Web Browser ii patch 2.6-2 Apply a diff file to an original ii patchutils 0.3.1-2 Utilities to work with patches ii sensible-utils 0.0.2 Utilities for sensible alternative ii strace 4.5.19-1 A system call tracer ii subversion 1.6.3dfsg-1 Advanced version control system ii unzip 6.0-1 De-archiver for .zip files ii w3m [www-browser] 0.5.2-2.1 WWW browsable pager with excellent ii wdiff 0.5-19 Compares two files word by word ii wget 1.12-1.1 retrieves files from the web ii xemacs21-mule [www 21.4.22-2 highly customizable text editor -- 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 31.3 Emacs wrappers for the commands in pn gnuplot <none> (no description available) ii libfile-desktopentry-perl 0.04-2 Perl module to handle freedesktop ii libnet-smtp-ssl-perl 1.01-2 SSL support for Net::SMTP ii mutt 1.5.20-5 text-based mailreader supporting M ii svn-buildpackage 0.7.0 helper programs to maintain Debian ii w3m 0.5.2-2.1 WWW browsable pager with excellent -- no debconf information
>From 89fafb186a32a32917d55b44c1dbf4cf1174cbc0 Mon Sep 17 00:00:00 2001 From: Jari Aalto <jari.aa...@cante.net> Date: Sun, 27 Dec 2009 13:47:13 +0200 Subject: [PATCH] scripts/debdiff.1: (OPTIONS, CONFIGURATION VARIABLES, SEE ALSO): order aplhabetically Signed-off-by: Jari Aalto <jari.aa...@cante.net> --- scripts/debdiff.1 | 186 +++++++++++++++++++++++------------------------------ 1 files changed, 81 insertions(+), 105 deletions(-) diff --git a/scripts/debdiff.1 b/scripts/debdiff.1 index b6d65b0..fe6aa8f 100644 --- a/scripts/debdiff.1 +++ b/scripts/debdiff.1 @@ -49,121 +49,98 @@ files if this program is available on the system, otherwise a \fBdiff\fR will be performed between the two source trees. .SH OPTIONS .TP -.BR \-\-dirs ", " \-d +.B \-\-[no\-]auto\-ver\-sort +With \-\-auto\-ver\-sort, when comparing source packages, do so in +version order. With \-\-no\-auto\-ver\-sort, compare source packages in +the order they were passed on the command-line, even if that means +comparing a package with a higher version against one with a lower +version. This is the default behaviour. +.TP +.B \-\-[no]control +with \-\-control, compare the respective control files using +\fBwdiff\fR(1); this is the default. +.TP +.BI \-\-controlfiles " FILE,FILE,..." +Specify which control files to compare; by default this is just +\fIcontrol\fR, but could include \fIpostinst\fR, \fIconfig\fR and so +on. Files will only be compared if they are present in both +\fI.debs\fR being compared. The special value \fIALL\fR compares all +control files present in both packages, except for md5sums. This +option can be used to override a configuration file setting. +.TP +.B \-\-[no\-]diffstat +Include or exclude the result of \fBdiffstat\fR before the generated diff. +The default is \-\-no\-diffstat. +.TP +.BR \-\-[no]dirs ", " \-d The default mode of operation is to ignore directory names which -appear in the file list, but they, too, will be considered if this -option is given. +appear in the file list. With \-\-dirs the files will be considered. +.TP +.BI \-\-exclude " PATTERN" +Exclude files that match \fIPATTERN\fR. Multiple uses of this option +are permitted. .TP -.B \-\-nodirs -Ignore directory names which appear in the file list. This is the -default and it can be used to override a configuration file setting. +.BR \-\-help ", " \-h +Show a summary of options. +.TP +.BR \-\-ignore\-space ", " \-w +Ignore whitespace in diffs. .TP .BI \-\-move " FROM TO" "\fR,\fP \-m" " FROM TO" It sometimes occurs that various files or directories are moved around -between revisions. This can be handled using this option. There are +between revisions. This can be handled using this option. There are two arguments, the first giving the location of the directory or file -in the first package, and the second in the second. Any files in the +in the first package, and the second in the second. Any files in the first listing whose names begin with the first argument are treated as having that substituted for the second argument when the file lists -are compared. Any number of \fB\-\-move\fR arguments may be given; +are compared. Any number of \fB\-\-move\fR arguments may be given; they are processed in the order in which they appear. .TP .BI \-\-move\-regex " FROM TO" This is the same as \fB\-\-move\fR, except that \fIFROM\fR is treated as a regular expression and the \fBperl\fR substitution command -\fIs/^FROM/TO/\fR is applied to the files. In particular, TO can make +\fIs/^FROM/TO/\fR is applied to the files. In particular, TO can make use of backreferences such as $1. .TP -.B \-\-nocontrol -\fBdebdiff\fR will usually compare the respective control files of the -packages using \fBwdiff\fR(1). This option suppresses this part of -the processing. -.TP -.B \-\-control -Compare the respective control files; this is the default, and it can -be used to override a configuration file setting. -.TP -.BI \-\-controlfiles " FILE,FILE,..." -Specify which control files to compare; by default this is just -\fIcontrol\fR, but could include \fIpostinst\fR, \fIconfig\fR and so -on. Files will only be compared if they are present in both -\fI.debs\fR being compared. The special value \fIALL\fR compares all -control files present in both packages, except for md5sums. This -option can be used to override a configuration file setting. -.TP -.B \-\-wdiff\-source\-control -When processing source packages, compare control files using \fBwdiff\fR. -Equivalent to the \fB\-\-control\fR option for binary packages. -.TP -.B \-\-no\-wdiff\-source\-control -Do not compare control files in source packages using \fBwdfiff\fR. This -is the default. -.TP -.BR \-\-wp ", " \-\-wl ", " \-\-wt -Pass a \fB\-p\fR, \fB\-l\fR or \fB\-t\fR option to \fBwdiff\fR -respectively. (This yields the whole \fBwdiff\fR output rather than -just the lines with any changes.) +\fB\-\-no\-conf\fR, \fB\-\-noconf\fR +Do not read any configuration files. This can only be used as the +first option given on the command-line. .TP -.B \-\-show-moved -If multiple \fI.deb\fR files are specified on the command line, either -using \fI.changes\fR files or the \fB\-\-from\fR/\fB\-\-to\fR syntax, -then this option will also show which files (if any) have moved -between packages. (The package names are simply determined from the -names of the \fI.deb\fR files.) +.B \-\-[no]show-moved +With \-\-show\-moved, if multiple \fI.deb\fR files are specified on the +command line, either using \fI.changes\fR files or the +\fB\-\-from\fR/\fB\-\-to\fR syntax, then this option will also show +which files (if any) have moved between packages. The package names +are simply determined from the names of the \fI.deb\fR files. +The defualt is \-\-noshow\-moved. .TP -.B \-\-noshow-moved -The default behaviour; can be used to override a configuration file -setting. +.BR \-\-quiet ", " \-q +Be quiet if no differences were found. .TP .BI \-\-renamed " FROM TO" If \fB\-\-show-moved\fR is being used and a package has been renamed in the process, this command instructs \fBdebdiff\fR to treat the package in the first list called \fIFROM\fR as if it were called -\fITO\fR. Multiple uses of this option are permitted. -.TP -.BI \-\-exclude " PATTERN" -Exclude files that match \fIPATTERN\fR. Multiple uses of this option -are permitted. -.TP -.B \-\-diffstat -Include the result of \fBdiffstat\fR before the generated diff. +\fITO\fR. Multiple uses of this option are permitted. .TP -.B \-\-no\-diffstat -The default behaviour; can be used to override a configuration file -setting. -.TP -.B \-\-auto\-ver\-sort -When comparing source packages, do so in version order. -.TP -.B \-\-no\-auto\-ver\-sort -Compare source packages in the order they were passed on the -command-line, even if that means comparing a package with a higher -version against one with a lower version. This is the default -behaviour. -.TP -.B \-\-unpack\-tarballs -When comparing source packages, also unpack tarballs found in the top level -source directory to compare their contents along with the other files. -This is the default behaviour. -.TP -.B \-\-no\-unpack\-tarballs -Do not unpack tarballs inside source packages. -.TP -\fB\-\-no-conf\fR, \fB\-\-noconf\fR -Do not read any configuration files. This can only be used as the -first option given on the command-line. -.TP -.BR \-\-help ", " \-h -Show a summary of options. +.B \-\-[no\-]unpack\-tarballs +With \-\-unpack\-tarballs When comparing source packages, also unpack +tarballs found in the top level source directory to compare their +contents along with the other files. This is the default behaviour. .TP .BR \-\-version ", " \-v Show version and copyright information. .TP -.BR \-\-quiet ", " \-q -Be quiet if no differences were found. +.B \-\-[no\-]wdiff\-source\-control +With \-\-wdiff\-source\-control, when processing source packages, +compare control files using \fBwdiff\fR. Equivalent to the +\fB\-\-control\fR option for binary packages. The default is +\-\-no\-wdiff\-source\-control. .TP -.BR \-\-ignore\-space ", " \-w -Ignore whitespace in diffs. +.BR \-\-wp ", " \-\-wl ", " \-\-wt +Pass a \fB\-p\fR, \fB\-l\fR or \fB\-t\fR option to \fBwdiff\fR +respectively. (This yields the whole \fBwdiff\fR output rather than +just the lines with any changes.) .SH "CONFIGURATION VARIABLES" The two configuration files \fI/etc/devscripts.conf\fR and \fI~/.devscripts\fR are sourced by a shell in that order to set @@ -171,9 +148,9 @@ configuration variables. Command line options can be used to override configuration file settings. Environment variable settings are ignored for this purpose. The currently recognised variables are: .TP -.B DEBDIFF_DIRS +.B DEBDIFF_AUTO_VER_SORT If this is set to \fIyes\fR, then it is the same as the -\fB\-\-dirs\fR command line parameter being used. +\fB\-\-auto\-ver\-sort\fR command line parameter being used. .TP .B DEBDIFF_CONTROL If this is set to \fIno\fR, then it is the same as the @@ -185,40 +162,39 @@ Which control files to compare, corresponding to the \fB\-\-controlfiles\fR command line option. The default is \fIcontrol\fR. .TP -.B DEBDIFF_SHOW_MOVED +.B DEBDIFF_DIRS If this is set to \fIyes\fR, then it is the same as the -\fB\-\-show\-moved\fR command line parameter being used. -.TP -.B DEBDIFF_WDIFF_OPT -This option will be passed to \fBwdiff\fR; it should be one of -\fB\-p\fR, \fB\-l\fR or \fB\-t\fR. +\fB\-\-dirs\fR command line parameter being used. .TP .B DEBDIFF_SHOW_DIFFSTAT If this is set to \fIyes\fR, then it is the same as the \fB\-\-diffstat\fR command line parameter being used. .TP -.B DEBDIFF_WDIFF_SOURCE_CONTROL -If this is set to \fIyes\fR, then it is the same as the -\fB\-\-wdiff\-source\-control\fR command line parameter being used. -.TP -.B DEBDIFF_AUTO_VER_SORT +.B DEBDIFF_SHOW_MOVED If this is set to \fIyes\fR, then it is the same as the -\fB\-\-auto\-ver\-sort\fR command line parameter being used. +\fB\-\-show\-moved\fR command line parameter being used. .TP .B DEBDIFF_UNPACK_TARBALLS If this is set to \fIno\fR, then it is the same as the \fB\-\-no\-unpack\-tarballs\fR command line parameter being used. +.TP +.B DEBDIFF_WDIFF_OPT +This option will be passed to \fBwdiff\fR; it should be one of +\fB\-p\fR, \fB\-l\fR or \fB\-t\fR. +.TP +.B DEBDIFF_WDIFF_SOURCE_CONTROL +If this is set to \fIyes\fR, then it is the same as the +\fB\-\-wdiff\-source\-control\fR command line parameter being used. .SH "EXIT VALUES" Normally the exit value will be 0 if no differences are reported and 1 if any are reported. If there is some fatal error, the exit code will be 255. .SH "SEE ALSO" +.BR devscripts.conf (5), +.BR diffstat (1), .BR dpkg-deb (1), -.BR wdiff (1), .BR interdiff (1), -.BR diffstat (1) -and -.BR devscripts.conf (5). +.BR wdiff (1) .SH AUTHOR \fBdebdiff\fR was originally written as a shell script by Yann Dirson <dir...@debian.org> and rewritten in Perl with many more features by -- 1.6.5
