Author: adam-guest
Date: 2008-03-06 20:23:52 +0000 (Thu, 06 Mar 2008)
New Revision: 1108
Modified:
trunk/debian/changelog
trunk/scripts/cvs-debi.1
trunk/scripts/dd-list.1
trunk/scripts/debchange.1
trunk/scripts/debi.1
trunk/scripts/debuild.1
trunk/scripts/devscripts.conf.5
trunk/scripts/dpkg-depcheck.1
trunk/scripts/dpkg-genbuilddeps.1
trunk/scripts/nmudiff.1
trunk/scripts/plotchangelog.1
trunk/scripts/uscan.1
Log:
+ Fix an unescaped hyphen in the manpage
* deb[ci]:
+ Allow either package names or filenames to be passed on the
+ Fix an unescaped hyphen in the manpage
* annotate-output.1, cvs-debi.1, dd-list.1, debuild.1, dpkg-depcheck.1,
dpkg-genbuilddeps.1, nmudiff.1, plotchangelog.1, uscan.1,
devscripts.conf.5: Fix unescaped hyphens
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-03-06 19:49:50 UTC (rev 1107)
+++ trunk/debian/changelog 2008-03-06 20:23:52 UTC (rev 1108)
@@ -7,6 +7,7 @@
Thanks to gregor herrmann for pointing the obvious solution out.
+ Don't complain about the package version changing from native to
non-native if --nmu or --security was used
+ + Fix an unescaped hyphen in the manpage
* checkbashisms:
+ Use Getopt::Long for option parsing
+ Add an option to force checking of scripts that would normally be
@@ -26,9 +27,13 @@
+ Fix an unescaped hyphen in the manpage
* bts: Allow the sendmail command to begin with a ~ (Closes: #469207)
* debcommit: Set $SVKDIFF before calling "svk diff" (Closes: #469238)
- * deb[ci]: Allow either package names or filenames to be passed on the
- command line (Closes: #469663)
- * annotate-output.1: Correctly escape a hyphen
+ * deb[ci]:
+ + Allow either package names or filenames to be passed on the
+ command line (Closes: #469663)
+ + Fix an unescaped hyphen in the manpage
+ * annotate-output.1, cvs-debi.1, dd-list.1, debuild.1, dpkg-depcheck.1,
+ dpkg-genbuilddeps.1, nmudiff.1, plotchangelog.1, uscan.1,
+ devscripts.conf.5: Fix unescaped hyphens
-- Adam D. Barratt <[EMAIL PROTECTED]> Sat, 01 Mar 2008 11:42:02 +0000
Modified: trunk/scripts/cvs-debi.1
===================================================================
--- trunk/scripts/cvs-debi.1 2008-03-06 19:49:50 UTC (rev 1107)
+++ trunk/scripts/cvs-debi.1 2008-03-06 20:23:52 UTC (rev 1108)
@@ -7,7 +7,7 @@
\fBcvs-debi\fR is run from the CVS working directory after
\fBcvs-buildpackage\fR or \fBcvs-debuild\fR. It uses the
\fBcvs-buildpackage\fR system to locate the \fI.changes\fR file
-generated in that run. It then runs \fBdebpkg -i\fR on
+generated in that run. It then runs \fBdebpkg \-i\fR on
every \fI.deb\fR archive listed in the \fI.changes\fR file to install
them, assuming that all of the \fI.deb\fR archives live in the same
directory as the \fI.changes\fR file. Note that you probably don't
Modified: trunk/scripts/dd-list.1
===================================================================
--- trunk/scripts/dd-list.1 2008-03-06 19:49:50 UTC (rev 1107)
+++ trunk/scripts/dd-list.1 2008-03-06 20:23:52 UTC (rev 1108)
@@ -76,7 +76,7 @@
.TP
.BR \-u , \-\-uploaders
Also list developers who are named as uploaders of packages, not only
-the maintainers; this is the default behaviour, use --nouploaders to
+the maintainers; this is the default behaviour, use \-\-nouploaders to
prevent it. Uploaders are indicated with "(U)" appended to the package name.
.TP
.BR \-nou , \-\-nouploaders
Modified: trunk/scripts/debchange.1
===================================================================
--- trunk/scripts/debchange.1 2008-03-06 19:49:50 UTC (rev 1107)
+++ trunk/scripts/debchange.1 2008-03-06 20:23:52 UTC (rev 1108)
@@ -359,7 +359,7 @@
.TP
.BR DEBCHANGE_TZ
Use this timezone for changelog entries. Default is the user/system
-timezone as shown by `date -R`.
+timezone as shown by `date \-R`.
.SH ENVIRONMENT
.TP
.BR DEBEMAIL ", " EMAIL ", " DEBFULLNAME ", " NAME
Modified: trunk/scripts/debi.1
===================================================================
--- trunk/scripts/debi.1 2008-03-06 19:49:50 UTC (rev 1107)
+++ trunk/scripts/debi.1 2008-03-06 20:23:52 UTC (rev 1108)
@@ -12,7 +12,7 @@
it will look for the \fI.changes\fR file corresponding to the current
package version (by determining the name and version number from the
changelog, and the architecture in the same way as
-\fBdpkg-buildpackage\fR(1) does). It then runs \fBdebpkg -i\fR on
+\fBdpkg-buildpackage\fR(1) does). It then runs \fBdebpkg \-i\fR on
every \fI.deb\fR archive listed in the \fI.changes\fR file to install
them, assuming that all of the \fI.deb\fR archives live in the same
directory as the \fI.changes\fR file. Note that you probably don't
Modified: trunk/scripts/debuild.1
===================================================================
--- trunk/scripts/debuild.1 2008-03-06 19:49:50 UTC (rev 1107)
+++ trunk/scripts/debuild.1 2008-03-06 20:23:52 UTC (rev 1108)
@@ -105,8 +105,8 @@
being broken, as it will not be able to be built on standard systems.
.PP
It is also possible to avoid having to type something like
-\fIFOO\fB=\fIbar \fBdebuild -e \fIFOO\fR by writing \fBdebuild -e
-\fIFOO\fB=\fIbar\fR or the long form \fBdebuild --set-envvar
+\fIFOO\fB=\fIbar \fBdebuild \-e \fIFOO\fR by writing \fBdebuild \-e
+\fIFOO\fB=\fIbar\fR or the long form \fBdebuild \-\-set\-envvar
\fIFOO\fB=\fIbar\fR.
.SH "SUPERUSER REQUIREMENTS"
\fBdebuild\fR needs to be run as superuser to function properly.
@@ -149,12 +149,12 @@
.TP
clean-hook
Run before dpkg-buildpackage runs debian/rules clean to clean the
-source tree. (Run even if the tree is not being cleaned because -nc
+source tree. (Run even if the tree is not being cleaned because \-nc
is used.)
.TP
dpkg-source-hook
Run after cleaning the tree and before running dpkg-source. (Run even
-if dpkg-source is not being called because -b or -B is used.)
+if dpkg-source is not being called because \-b or \-B is used.)
.TP
dpkg-build-hook
Run after dpkg-source and before calling debian/rules build. (Run
@@ -196,7 +196,7 @@
to be run and 0 if not). Then it will be handed to the shell to deal
with, so it can include redirections and stuff. For example, to only
run the dpkg-source hook if dpkg-source is to be run, the hook could
-be something like: "if [ %a -eq 1 ]; then ...; fi".
+be something like: "if [ %a \-eq 1 ]; then ...; fi".
.PP
\fBPlease take care with hooks\fR, as misuse of them can lead to
packages which FTBFS (fail to build from source). They can be useful
@@ -315,7 +315,7 @@
sponsored uploads, the config file might contain the line:
.IP
.nf
-DEBUILD_DPKG_BUILDPACKAGE_OPTS="-k'Julian Gilbey <[EMAIL PROTECTED]>' -sa"
+DEBUILD_DPKG_BUILDPACKAGE_OPTS="-k'Julian Gilbey <[EMAIL PROTECTED]>' \-sa"
.fi
.IP
which gives precisely two options. Without the extra single quotes,
@@ -366,16 +366,16 @@
without signing the .changes file (or the non-existent .dsc file):
.IP
.nf
-debuild -i -us -uc -b
+debuild \-i \-us \-uc \-b
.fi
.PP
-Change the "-b" to "-S" to build only a source package.
+Change the "\-b" to "\-S" to build only a source package.
.PP
An example using both \fBlintian\fR and \fBlinda\fR to check the
resulting packages, and also passing options to them both:
.IP
.nf
-debuild --linda -i -tc --lintian-opts -i --linda-opts -i
+debuild \-\-linda \-i \-tc \-\-lintian-opts \-i \-\-linda-opts \-i
.fi
.PP
Note the order of options here: the \fBdebuild\fR options come first,
@@ -390,9 +390,9 @@
like the following commands:
.IP
.nf
-dpkg-source -x foobar_1.0-1.dsc
+dpkg-source \-x foobar_1.0-1.dsc
cd foobar-1.0
-debuild -k0x12345678
+debuild \-k0x12345678
.fi
.PP
where 0x12345678 is replaced by your GPG key ID or other key
Modified: trunk/scripts/devscripts.conf.5
===================================================================
--- trunk/scripts/devscripts.conf.5 2008-03-06 19:49:50 UTC (rev 1107)
+++ trunk/scripts/devscripts.conf.5 2008-03-06 20:23:52 UTC (rev 1108)
@@ -11,7 +11,7 @@
from these configuration files describes the specific settings
recognised in its own manpage. (For a list of the scripts, either see
\fI/usr/share/doc/devscripts/README.gz\fR or look at the output of
-\fIdpkg -L devscripts | grep /usr/bin\fR.)
+\fIdpkg \-L devscripts | grep /usr/bin\fR.)
.PP
The two configuration files are \fI/etc/devscripts.conf\fR for
system-wide defaults and \fI~/.devscripts\fR for per-user settings.
Modified: trunk/scripts/dpkg-depcheck.1
===================================================================
--- trunk/scripts/dpkg-depcheck.1 2008-03-06 19:49:50 UTC (rev 1107)
+++ trunk/scripts/dpkg-depcheck.1 2008-03-06 20:23:52 UTC (rev 1108)
@@ -110,7 +110,7 @@
These are options which are parsed before the command-line options.
For example,
.IP
-DPKG_DEPCHECK_OPTIONS="-b -f-catch-alternatives"
+DPKG_DEPCHECK_OPTIONS="\-b \-f-catch-alternatives"
.IP
which passes these options to \fBdpkg-depcheck\fR before any
command-line options are processed. You are advised not to try tricky
Modified: trunk/scripts/dpkg-genbuilddeps.1
===================================================================
--- trunk/scripts/dpkg-genbuilddeps.1 2008-03-06 19:49:50 UTC (rev 1107)
+++ trunk/scripts/dpkg-genbuilddeps.1 2008-03-06 20:23:52 UTC (rev 1108)
@@ -15,17 +15,17 @@
dependent parts, not does it attempt to determine which versions of
packages are required. It should be able to run under \fBfakeroot\fR
rather than being run as root, as \fBfakeroot dpkg-genbuilddeps\fR, or
-\fBdpkg-genbuilddeps -rfakeroot\fR.
+\fBdpkg-genbuilddeps \-rfakeroot\fR.
.PP
This program requires the build-essential package to be installed. If
it is not, please use \fBdpkg-depcheck\fR directly, with a command
such as
.nf
- dpkg-depcheck --all dpkg-buildpackage -us -uc -b -rfakeroot ...
+ dpkg-depcheck \-\-all dpkg-buildpackage \-us \-uc \-b \-rfakeroot ...
.fi
All this program itself does is essentially to run the command:
.nf
- dpkg-depcheck -b dpkg-buildpackage -us -uc -b -rfakeroot [arg ...]
+ dpkg-depcheck \-b dpkg-buildpackage \-us \-uc \-b \-rfakeroot [arg ...]
.fi
.SH "SEE ALSO"
.B The Debian Policy Manual,
Modified: trunk/scripts/nmudiff.1
===================================================================
--- trunk/scripts/nmudiff.1 2008-03-06 19:49:50 UTC (rev 1107)
+++ trunk/scripts/nmudiff.1 2008-03-06 20:23:52 UTC (rev 1108)
@@ -46,7 +46,7 @@
added if the command is \fI/usr/sbin/sendmail\fR or
\fI/usr/sbin/exim*\fR. For other mailers, if they require a \fI\-t\fR
option, this must be included in the \fISENDMAILCMD\fR, for example:
-\-\-sendmail="/usr/sbin/mymailer -t". This can also be set using the
+\-\-sendmail="/usr/sbin/mymailer \-t". This can also be set using the
devscripts configuration files; see below.
.TP
\fB\-\-from\fR \fIEMAIL\fR
@@ -88,7 +88,7 @@
.TP
.B BTS_SENDMAIL_COMMAND
If this is set, specifies a sendmail command to use instead of
-/usr/sbin/sendmail. Same as the --sendmail command line option.
+/usr/sbin/sendmail. Same as the \-\-sendmail command line option.
.SH "SEE ALSO"
.BR debdiff (1),
.BR sensible-editor (1)
Modified: trunk/scripts/plotchangelog.1
===================================================================
--- trunk/scripts/plotchangelog.1 2008-03-06 19:49:50 UTC (rev 1107)
+++ trunk/scripts/plotchangelog.1 2008-03-06 20:23:52 UTC (rev 1108)
@@ -88,7 +88,7 @@
program in arbitrary ways. You can also use things like
"set terminal png color"
to change the output file type, which is useful in conjunction with
-the -s option.
+the \-s option.
.TP
.B \-\-help
Show a usage summary.
@@ -113,8 +113,8 @@
.TP
.B PLOTCHANGELOG_OPTIONS
This is a space-separated list of options to always use, for example
-"-l -b". Do not include "-g" or "--gnuplot" among this list as it may
-be ignored; see the next variable instead.
+"\-l \-b". Do not include "\-g" or "\-\-gnuplot" among this list as it
+may be ignored; see the next variable instead.
.TP
.B PLOTCHANGELOG_GNUPLOT
These are
Modified: trunk/scripts/uscan.1
===================================================================
--- trunk/scripts/uscan.1 2008-03-06 19:49:50 UTC (rev 1107)
+++ trunk/scripts/uscan.1 2008-03-06 20:23:52 UTC (rev 1108)
@@ -169,7 +169,7 @@
number will then be mangled if required by the uversionmangle option
described below. Finally, the file versions are then compared to find
the one with the greatest version number, as determined by \fBdpkg
---compare-versions\fR. Note that if you need Perl groups which are
+\-\-compare-versions\fR. Note that if you need Perl groups which are
not to be used in the version number, either use `(?:...)' or use the
uversionmangle option to clean up the mess!
.PP
@@ -318,10 +318,10 @@
This script will perform a fully automatic upstream update.
.nf
-#!/bin/sh -e
-# called with '--upstream-version' <version> <file>
+#!/bin/sh \-e
+# called with '\-\-upstream-version' <version> <file>
uupdate "$@"
-package=`dpkg-parsechangelog | sed -n 's/^Source: //p'`
+package=`dpkg\-parsechangelog | sed \-n 's/^Source: //p'`
cd ../$package-$2
debuild
.fi
--
To unsubscribe, send mail to [EMAIL PROTECTED]
