[devscripts] 01/01: Fix typos
Jakub Wilk
jwilk at moszumanska.debian.org
Wed Jun 29 09:02:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
jwilk pushed a commit to branch master
in repository devscripts.
commit a375b8425411fc7cf974d4a7251b7c433927115d
Author: Jakub Wilk <jwilk at debian.org>
Date: Wed Jun 29 10:59:42 2016 +0200
Fix typos
---
debian/changelog | 7 +++++++
scripts/debcommit.pl | 2 +-
scripts/debdiff.1 | 2 +-
scripts/uscan.pl | 4 ++--
scripts/who-permits-upload.pl | 2 +-
5 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5549117..0e230aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,8 +37,15 @@ devscripts (2.16.6) UNRELEASED; urgency=medium
+ Fix watch file examples around pgpmode=none.
[ Jakub Wilk ]
+ * debcommit:
+ + Fix typo in the manual page.
+ * debdiff:
+ + Fix typo in the manual page.
* uscan:
+ Fix gpgv existence check.
+ + Fix typos in the manual page.
+ * who-permits-upload:
+ + Fix typo in the manual page.
-- James McCoy <jamessan at debian.org> Sat, 04 Jun 2016 13:46:07 -0400
diff --git a/scripts/debcommit.pl b/scripts/debcommit.pl
index 46009e7..ce22100 100755
--- a/scripts/debcommit.pl
+++ b/scripts/debcommit.pl
@@ -36,7 +36,7 @@ repository.
=item B<-R>, B<--release-use-changelog>
-When used in conjunction with B<--release>, if there are uncommited
+When used in conjunction with B<--release>, if there are uncommitted
changes to the changelog then derive the commit message from those
changes rather than using the default message.
diff --git a/scripts/debdiff.1 b/scripts/debdiff.1
index 3c7340f..bf3c77f 100644
--- a/scripts/debdiff.1
+++ b/scripts/debdiff.1
@@ -99,7 +99,7 @@ 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
+Do not compare control files in source packages using \fBwdiff\fR. This
is the default.
.TP
.BR \-\-wp ", " \-\-wl ", " \-\-wt
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index e011bc8..9403ba6 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -830,7 +830,7 @@ signature file extensions.
version=4
opts="pgpmode=next" http://example.com/DL/ \
files/(?:\d+)/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian
- opts="pgpmode=prevous" http://example.com/DL/ \
+ opts="pgpmode=previous" http://example.com/DL/ \
files/(?:\d+)/@PACKAGE@@ANY_VERSION@@SIGNATURE_EXT@ \
previous uupdate
@@ -1536,7 +1536,7 @@ The optional I<script> parameter in F<debian/watch> means to execute I<script>
with options after processing this line if specified.
For compatibility with other tools such as B<git-buildpackage>, it may not be
-wise to create custom scripts with rondom behavior. In general, B<uupdate> is
+wise to create custom scripts with random behavior. In general, B<uupdate> is
the best choice for the non-native package and custom scripts, if created,
should behave as if B<uupdate>. For possible use case, see
L<http://bugs.debian.org/748474> as an example.
diff --git a/scripts/who-permits-upload.pl b/scripts/who-permits-upload.pl
index d88be48..999c732 100755
--- a/scripts/who-permits-upload.pl
+++ b/scripts/who-permits-upload.pl
@@ -65,7 +65,7 @@ present, the default value I<https://ftp-master.debian.org/dm.txt> is used.
=item B<--help>, B<-h>
-Display an usage summary and exit.
+Display a usage summary and exit.
=item B<--keyring=>I<keyring>, B<-s> I<keyring>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git
More information about the devscripts-devel
mailing list