From a320ae5ba5536510934beaaf08f463a58ff36c65 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Sat, 19 May 2012 13:45:56 +0200 Subject: [PATCH] debhelper: Fix minor source comment typos. --- Debian/Debhelper/Buildsystem/makefile.pm | 2 +- Debian/Debhelper/Buildsystem/python_distutils.pm | 2 +- dh | 4 ++-- dh_compress | 2 +- dh_fixperms | 2 +- dh_installmime | 4 ++-- dh_makeshlibs | 4 ++-- dh_movefiles | 6 +++--- dh_strip | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Debian/Debhelper/Buildsystem/makefile.pm b/Debian/Debhelper/Buildsystem/makefile.pm index 1eb4b5b..c63b58e 100644 --- a/Debian/Debhelper/Buildsystem/makefile.pm +++ b/Debian/Debhelper/Buildsystem/makefile.pm @@ -74,7 +74,7 @@ sub check_auto_buildable { -e $this->get_buildpath("GNUmakefile")) { # This is always called in the source directory, but generally - # Makefiles are created (or live) in the the build directory. + # Makefiles are created (or live) in the build directory. return 1; } elsif ($step eq "clean" && defined $this->get_builddir() && $this->check_auto_buildable("configure")) diff --git a/Debian/Debhelper/Buildsystem/python_distutils.pm b/Debian/Debhelper/Buildsystem/python_distutils.pm index 5115a8a..ad473a3 100644 --- a/Debian/Debhelper/Buildsystem/python_distutils.pm +++ b/Debian/Debhelper/Buildsystem/python_distutils.pm @@ -24,7 +24,7 @@ sub DEFAULT_BUILD_DIRECTORY { sub new { my $class=shift; my $this=$class->SUPER::new(@_); - # Out of source tree building is prefered. + # Out of source tree building is preferred. $this->prefer_out_of_source_building(@_); return $this; } diff --git a/dh b/dh index 4d4e31e..3e6ccf4 100755 --- a/dh +++ b/dh @@ -331,7 +331,7 @@ if (! defined $sequence) { error "specify a sequence to run"; } # make -B causes the rules file to be run as a target. -# Also support completly empty override targets. +# Also support completely empty override targets. # Note: it's not safe to use rules_explicit_target before this check, # since it causes dh to be run. my $dummy_target="debhelper-fail-me"; @@ -819,7 +819,7 @@ sub rules_explicit_target { } else { if (!$not_a_target && /^([^#:]+)::?\s*(.*)$/) { - # Target is defined. NOTE: if it is a depenency of + # Target is defined. NOTE: if it is a dependency of # .PHONY it will be defined too but that's ok. # $2 contains target dependencies if any. $current_target = $1; diff --git a/dh_compress b/dh_compress index ff98cb9..85cf2c8 100755 --- a/dh_compress +++ b/dh_compress @@ -99,7 +99,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { } else { # Note that all the excludes of odd things like _z - # are because gzip refuses to compress such files, assumming + # are because gzip refuses to compress such files, assuming # they are zip files. I looked at the gzip source to get the # complete list of such extensions: ".gz", ".z", ".taz", # ".tgz", "-gz", "-z", "_z" diff --git a/dh_fixperms b/dh_fixperms index d6e237b..a99a134 100755 --- a/dh_fixperms +++ b/dh_fixperms @@ -58,7 +58,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { complex_doit("find $tmp ! -type l $find_options -print0", "2>/dev/null | xargs -0r chmod go=rX,u+rw,a-s"); - # Fix up premissions in usr/share/doc, setting everything to not + # Fix up permissions in usr/share/doc, setting everything to not # executable by default, but leave examples directories alone. complex_doit("find $tmp/usr/share/doc -type f $find_options ! -regex '$tmp/usr/share/doc/[^/]*/examples/.*' -print0 2>/dev/null", "| xargs -0r chmod 644"); diff --git a/dh_installmime b/dh_installmime index 0ac46c7..998d6ba 100755 --- a/dh_installmime +++ b/dh_installmime @@ -68,7 +68,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { } doit("install","-p","-m644",$mime,"$tmp/usr/lib/mime/packages/$package"); } - # Check wether we have to call update-mime (either upstream already + # Check whether we have to call update-mime (either upstream already # installs a MIME information file or Debian provides one) if ((! $dh{NOSCRIPTS}) && (-d "$tmp/usr/lib/mime/packages")) { autoscript($package,"postinst","postinst-mime"); @@ -83,7 +83,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { } doit("install", "-p", "-m644", $sharedmimeinfo, "$tmp/usr/share/mime/packages/$package.xml"); } - # check wether we have to call update-mime-database (either upstream + # check whether we have to call update-mime-database (either upstream # already installs a shared MIME information file or Debian provides # one) if ((! $dh{NOSCRIPTS}) && (-d "$tmp/usr/share/mime/packages")) { diff --git a/dh_makeshlibs b/dh_makeshlibs index 860637a..66e8b96 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -142,7 +142,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { # So, we look for files or links to existing files with names that # match "*.so.*". And we only look at real files not - # symlinks, so we don't accidentually add shlibs data to -dev + # symlinks, so we don't accidentally add shlibs data to -dev # packages. This may have a few false positives, which is ok, # because only if we can get a library name and a major number from # objdump is anything actually added. @@ -183,7 +183,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { $deps=$dh{V_FLAG}; } else { - # Call isnative becuase it sets $dh{VERSION} + # Call isnative because it sets $dh{VERSION} # as a side effect. isnative($package); my $version = $dh{VERSION}; diff --git a/dh_movefiles b/dh_movefiles index 3f59d9e..e9439bd 100755 --- a/dh_movefiles +++ b/dh_movefiles @@ -112,7 +112,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { # Now we need to expand wildcards in @tomove. # This is only necessary in pre-v3 land -- as of v3, the - # expension is automatically done by filearray(). + # expansion is automatically done by filearray(). if (@tomove && compat(2)) { my @filelist=(); foreach (@tomove) { @@ -158,12 +158,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) { } } -# If $ret is set, we wern't actually able to find some +# If $ret is set, we weren't actually able to find some # files that were specified to be moved, and we should # exit with the code in $ret. This program puts off # exiting with an error until all files have been tried # to be moved, because this makes it easier for some -# packages that arn't always sure exactly which files need +# packages that aren't always sure exactly which files need # to be moved. exit $ret; diff --git a/dh_strip b/dh_strip index 57c45f5..ea5315a 100755 --- a/dh_strip +++ b/dh_strip @@ -221,7 +221,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { foreach (@shared_libs) { my $debug_path = make_debug($_, $tmp, $debugtmp) if $keep_debug; # Note that all calls to strip on shared libs - # *must* inclde the --strip-unneeded. + # *must* include the --strip-unneeded. doit($strip,"--remove-section=.comment", "--remove-section=.note","--strip-unneeded",$_); attach_debug($_, $debug_path) if defined $debug_path; -- 2.39.2