[SCM] Git repository for devscripts branch, master, updated. v2.12.0-13-gfbc5e4f

Thu Jul 26 17:11:12 UTC 2012

The following commit has been merged in the master branch:
commit b9d7651ef03fcab33212bbc5683b42716412cce3
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Fri Jun 8 21:04:44 2012 +0300

    Spelling fixes.

diff --git a/README b/README
index a29ee2f..39ea41d 100644
--- a/README
+++ b/README
@@ -84,7 +84,7 @@ And now, in mostly alphabetical order, the scripts:
 
 - debdiff: A program which examines two .deb files or two .changes files and
   reports on any difference found in their file lists.  Useful for ensuring
-  that no files were inadvertantly lost between versions.  Can also examine
+  that no files were inadvertently lost between versions.  Can also examine
   two .dsc files and report on the changes between source versions.
   [wdiff, patchutils]
 
@@ -103,7 +103,7 @@ And now, in mostly alphabetical order, the scripts:
   the system, so this should be done with caution.)  Having debpkg as
   a wrapper for dpkg can be a Good Thing (TM), as it decreases the
   potential for damage by accidental wrong use of commands in
-  superuser mode (e.g., an inadvertant rm -rf * in the wrong directory
+  superuser mode (e.g., an inadvertent rm -rf * in the wrong directory
   is disastrous as many can attest to).
 
 - debrelease: A wrapper around dupload or dput which figures out which
diff --git a/README.newscripts b/README.newscripts
index 67c7676..eed924e 100644
--- a/README.newscripts
+++ b/README.newscripts
@@ -11,7 +11,7 @@ List of things to do when adding a new script to devscripts package:
 5. Add any necessary entries to the Suggests: and Recommends: lines in
    debian/control
 6. Modify conf.default.in and debian/postinst if necessary
-7. Modify debian/copyright if neccessary
+7. Modify debian/copyright if necessary
 8. Make the script executable
    - "svn propset svn:executable '*' scripts/newscript" so that the
      permissions are correct in a copy of the repository
diff --git a/debian/changelog b/debian/changelog
index 928f8fd..e58db71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -686,7 +686,7 @@ devscripts (2.10.69) unstable; urgency=low
   * Update French translation.  (Closes: #599234, #600033)
 
   [ Patrick Schoenfeld ]
-  * Replace occurences of old FSF address with the FSF recommendation
+  * Replace occurrences of old FSF address with the FSF recommendation
     what should be written inside of source files.
     (Closes: #502512)
 
diff --git a/examples/debian.procmail b/examples/debian.procmail
index b700197..a120ca0 100644
--- a/examples/debian.procmail
+++ b/examples/debian.procmail
@@ -74,7 +74,7 @@ $DDC_DIR/$MATCH
 
 # Sort debian mailing lists into mailboxes under $DEBIANDIR. This dynamic
 # style means when subscribing to new Debian mailing lists no changes need be
-# made to this file. Even as yet none existant mailing lists are catered for.
+# made to this file. Even as yet none existent mailing lists are catered for.
 
 :0:
 * ^X-Mailing-List: <debian-.+ at lists.debian.org>
diff --git a/examples/master.procmail b/examples/master.procmail
index a5c3879..c0615df 100644
--- a/examples/master.procmail
+++ b/examples/master.procmail
@@ -35,7 +35,7 @@
 
 # 1. Subscribe to debian-devel-changes and/or debian-changes using your Debian
 #    e-mail address so that mail goes to your account on master.
-# 2. Change the enviroment variables below to specify the:
+# 2. Change the environment variables below to specify the:
 #      a) e-mail address that you want mail to be forwarded to
 #      b) the architectures you are NOT interested in
 #      c) the packages you are interested in
@@ -63,7 +63,7 @@ FORWARD=edward at hairnet.demon.co.uk
 # listed here until you add it to this line.
 ARCHS=alpha|arm|powerpc|sparc|m68k
 
-# Packages changes on other architectures of interest. This is basicly a list
+# Packages changes on other architectures of interest. This is basically a list
 # of the binary packages that I maintain. As far as I see it most developers
 # will just want to change this to a list of packages that they maintain.
 PACKAGES=colortail|esh|vh|x2vnc|sniffit	# Packages on other archs of interest
diff --git a/scripts/chdist.pl b/scripts/chdist.pl
index e7b8fa5..1588765 100755
--- a/scripts/chdist.pl
+++ b/scripts/chdist.pl
@@ -403,7 +403,7 @@ sub dist_compare(\@$$) {
   my ($dists, $do_compare, $type) = @_;
   type_check($type);
 
-  # Get the list of dists from the referrence
+  # Get the list of dists from the reference
   my @dists = @$dists;
   map { dist_check($_) } @dists;
 
diff --git a/scripts/checkbashisms.pl b/scripts/checkbashisms.pl
index 3c92700..479e782 100755
--- a/scripts/checkbashisms.pl
+++ b/scripts/checkbashisms.pl
@@ -373,7 +373,7 @@ foreach my $filename (@ARGV) {
 	    $line =~ s/(^|[^\\\"](?:\\\\)*)\'(?:\\.|[^\\\'])+\'/$1''/g;
 
 	    # As above, with the exception that we don't remove the string
-	    # if the quote is immediately preceeded by a < or a -, so we
+	    # if the quote is immediately preceded by a < or a -, so we
 	    # can match "foo <<-?'xyz'" as a heredoc later
 	    # The check is a little more greedy than we'd like, but the
 	    # heredoc test itself will weed out any false positives
diff --git a/scripts/cvs-debi.sh b/scripts/cvs-debi.sh
index 123f4b4..08ba45b 100755
--- a/scripts/cvs-debi.sh
+++ b/scripts/cvs-debi.sh
@@ -186,7 +186,7 @@ fi
 
 # Command line, env variable, config file, or default
 # This anomalous position is in case we need to check out the changelog
-# below (anaomalous since we ahve not loaded the config file yet)
+# below (anomalous since we have not loaded the config file yet)
 if [ ! "x$opt_prefix" = "x" ]; then
     prefix="$opt_prefix"
 elif [ ! "x$CVSDEB_PREFIX" = "x" ]; then
diff --git a/scripts/cvs-debrelease.sh b/scripts/cvs-debrelease.sh
index 34c16c8..63c3868 100755
--- a/scripts/cvs-debrelease.sh
+++ b/scripts/cvs-debrelease.sh
@@ -193,7 +193,7 @@ fi
 
 # Command line, env variable, config file, or default
 # This anomalous position is in case we need to check out the changelog
-# below (anaomalous since we ahve not loaded the config file yet)
+# below (anomalous since we have not loaded the config file yet)
 if [ ! "x$opt_prefix" = "x" ]; then
     prefix="$opt_prefix"
 elif [ ! "x$CVSDEB_PREFIX" = "x" ]; then
diff --git a/scripts/edit-patch.sh b/scripts/edit-patch.sh
index 9c4c65b..871ea0c 100755
--- a/scripts/edit-patch.sh
+++ b/scripts/edit-patch.sh
@@ -213,7 +213,7 @@ add_changelog() {
 }
 
 add_patch_tagging() {
-    # check if we have a descripton already
+    # check if we have a description already
     if grep "## Description:" $PREFIX/$1; then
         return
     fi
diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 7e130ca..abac7b7 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -83,7 +83,7 @@ Also display copyright text found within the file
 Displays the information in a machine readable way, i.e. in the form
 <file><tab><license>[<tab><copyright>] so that it can be easily sorted
 and/or filtered, e.g. with the F<awk> and F<sort> commands.
-Note that using the B<--verbose> option will kill the readibility.
+Note that using the B<--verbose> option will kill the readability.
 
 =item B<--no-conf>, B<--noconf>
 
diff --git a/scripts/uupdate.sh b/scripts/uupdate.sh
index 76be6d9..c2faa83 100755
--- a/scripts/uupdate.sh
+++ b/scripts/uupdate.sh
@@ -475,7 +475,7 @@ if [ "$PATCH" ]; then
 	exit 1
     fi
 else
-# This is an orginal sourcearchive
+# This is an original sourcearchive
     if [ "$ARCHIVE" = "" ]; then
 	echo "$PROGNAME: upstream source archive not specified" >&2
 	exit 1

-- 
Git repository for devscripts

