This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=a4f0c6f04636ed066eb7e5162403d20a369fceec commit a4f0c6f04636ed066eb7e5162403d20a369fceec Author: Guillem Jover <[email protected]> AuthorDate: Sat Aug 11 03:32:37 2018 +0200 Fix some typos Thanks-to: Niels Thykier <[email protected]> (for typo in dpkg(1)) --- ChangeLog.old | 12 ++++++------ debian/changelog | 4 ++-- debian/control | 2 +- doc/rootless-builds.txt | 2 +- lib/compat/getopt.c | 2 +- lib/dpkg/path-remove.c | 2 +- man/dpkg.man | 2 +- scripts/Dpkg/Source/Functions.pm | 2 +- scripts/dpkg-buildpackage.pl | 4 ++-- scripts/t/Dpkg_Changelog/shadow | 8 ++++---- t/pod-coverage.t | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ChangeLog.old b/ChangeLog.old index 770c9d630..252d901b7 100644 --- a/ChangeLog.old +++ b/ChangeLog.old @@ -1361,7 +1361,7 @@ 2008-08-05 Guillem Jover <[email protected]> - * scripts/dpkg-distaddfile.pl: Use _g() instead of mispelled gettext(). + * scripts/dpkg-distaddfile.pl: Use _g() instead of misspelled gettext(). 2008-08-03 Guillem Jover <[email protected]> @@ -7444,7 +7444,7 @@ 2006-02-08 Guillem Jover <[email protected]> - * debian/contrl (Build-Depends): Depend on version >= 1.28-4 of + * debian/control (Build-Depends): Depend on version >= 1.28-4 of libselinux1-dev as it has pkg-config support. Remove libsepol1-dev, now dragged by libselinux1-dev. Add pkg-config. * m4/libs.m4 (DPKG_LIB_SELINUX): Use pkg-config to get the static @@ -7689,7 +7689,7 @@ 2006-01-23 Bart Martens <[email protected]>, Guillem Jover <[email protected]> - * debian/contrl (Build-Depends): Add libsepol1-dev as a temporary + * debian/control (Build-Depends): Add libsepol1-dev as a temporary workaround until libselinux1-dev has pkg-config support. * m4/libs.m4 (DPKG_LIB_SELINUX): Explicitly statically link against libsepol. @@ -11001,7 +11001,7 @@ Sun May 19 04:09:25 CDT 2002 Adam Heath <[email protected]> * debian/rules: Fix targets, so that if configure fails, but actually succeeds in creating config.status(as might happen if one has a - c-style comment in configure.in, and the shell trys running /foo), then + c-style comment in configure.in, and the shell tries running /foo), then the build will actually fail correctly. Sun May 19 02:31:11 CDT 2002 Adam Heath <[email protected]> @@ -13730,7 +13730,7 @@ Tue Feb 8 21:33:58 EST 2000 Ben Collins <[email protected]> * main/{processarc,archive}.c: Make the conflictor an array of structs and make sure that check_conflicts uses that and increments a global indexs for the array. The reason that multiple conflicts/replaces were getting - borked had something to do with thre first one in the hash not being + borked had something to do with the first one in the hash not being processed. This was the result of bad pointer games, so this makes it a lot cleaner. @@ -16705,7 +16705,7 @@ Changes in dpkg 0.93.15: * Put packages in `purge' state even if `deinstall' requested if they have no postrm and no conffiles. * Version number comparisons fixed. -* insert-version.pl now installes lib.pl filename too. +* insert-version.pl now installs lib.pl filename too. * Strip trailing slashes when reading files from file lists. Changes in dpkg 0.93.14: diff --git a/debian/changelog b/debian/changelog index b42616b84..fd30747c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -485,7 +485,7 @@ dpkg (1.18.24) unstable; urgency=medium on not cleaning the source tree. * Documentation: - Many spelling fixes. Thanks to Josh Soref <[email protected]>. - - Do not include mispellings in changelogs, as that makes detecting them + - Do not include misspellings in changelogs, as that makes detecting them more difficult. * Build system: - Use libexec variable for auxiliary internal programs, and set it to @@ -12719,7 +12719,7 @@ Changes in dpkg 0.93.15: * Put packages in `purge' state even if `deinstall' requested if they have no postrm and no conffiles. * Version number comparisons fixed. -* insert-version.pl now installes lib.pl filename too. +* insert-version.pl now installs lib.pl filename too. * Strip trailing slashes when reading files from file lists. Changes in dpkg 0.93.14: diff --git a/debian/control b/debian/control index 29f9fc5ee..a3f819118 100644 --- a/debian/control +++ b/debian/control @@ -165,7 +165,7 @@ Description: Dpkg perl modules - Dpkg::Build::Info: build information functions - Dpkg::BuildFlags: set, modify and query compilation build flags - Dpkg::BuildOptions: parse and manipulate DEB_BUILD_OPTIONS - - Dpkg::BuildProfile: parse and manipulate build profiles + - Dpkg::BuildProfiles: parse and manipulate build profiles - Dpkg::Changelog: parse changelogs - Dpkg::Changelog::Entry: represents a changelog entry - Dpkg::Changelog::Parse: generic changelog parser for dpkg-parsechangelog diff --git a/doc/rootless-builds.txt b/doc/rootless-builds.txt index 0157879a4..0b6b9d849 100644 --- a/doc/rootless-builds.txt +++ b/doc/rootless-builds.txt @@ -57,7 +57,7 @@ When the builder supports this specification, it MUST notify this fact to the rules file via the "DEB_RULES_REQUIRES_ROOT" environment variable, with the value it has obtained from the Rules-Requires-Root field or some builder specific override mechanism, which will denote the level of support the -builder has choosen to commit to take effect during the build. When set, +builder has chosen to commit to take effect during the build. When set, it MUST be a valid value for the Rules-Requires-Root field. If unset, the build system SHOULD assume that the builder does not recognize the Rules-Requires-Root field at all. diff --git a/lib/compat/getopt.c b/lib/compat/getopt.c index 4c52b8b82..b13f81454 100644 --- a/lib/compat/getopt.c +++ b/lib/compat/getopt.c @@ -88,7 +88,7 @@ USA. */ #endif /* XXX: Disable intl support, because we do not carry the translations anyway - * and this pulls indirectly libintl, wich we do not want to impose. */ + * and this pulls indirectly libintl, which we do not want to impose. */ #ifndef _ #define _(msgid) (msgid) #endif diff --git a/lib/dpkg/path-remove.c b/lib/dpkg/path-remove.c index ef9cde7b5..6afb37607 100644 --- a/lib/dpkg/path-remove.c +++ b/lib/dpkg/path-remove.c @@ -1,6 +1,6 @@ /* * libdpkg - Debian packaging suite library routines - * path-remove.c - path removal functionss + * path-remove.c - path removal functions * * Copyright © 1994-1995 Ian Jackson <[email protected]> * Copyright © 2007-2015 Guillem Jover <[email protected]> diff --git a/man/dpkg.man b/man/dpkg.man index fdaa87b1c..772c1b324 100644 --- a/man/dpkg.man +++ b/man/dpkg.man @@ -623,7 +623,7 @@ any software not doing syncs before atomic renames. losing data, use with care.\fP \fBscript-chrootless\fP: -Run maintainer scrips without \fBchroot\fP(2)ing into \fBinstdir\fP even +Run maintainer scripts without \fBchroot\fP(2)ing into \fBinstdir\fP even if the package does not support this mode of operation (since dpkg 1.18.5). \fIWarning: This can destroy your host system, use with extreme care.\fP diff --git a/scripts/Dpkg/Source/Functions.pm b/scripts/Dpkg/Source/Functions.pm index dcb957e13..262b80ad1 100644 --- a/scripts/Dpkg/Source/Functions.pm +++ b/scripts/Dpkg/Source/Functions.pm @@ -73,7 +73,7 @@ sub fixperms { # Only change the pathname permissions if they differ from the desired. # -# To be able to build a source tree, a user needs write permisions on it, +# To be able to build a source tree, a user needs write permissions on it, # but not necessarily ownership of those files. sub chmod_if_needed { my ($newperms, $pathname) = @_; diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl index 9cc6969d3..c50416580 100755 --- a/scripts/dpkg-buildpackage.pl +++ b/scripts/dpkg-buildpackage.pl @@ -629,7 +629,7 @@ if ($signsource) { error(g_('failed to sign %s file'), '.dsc'); } - # Recompute the checksums as the .dsc have changed now. + # Recompute the checksums as the .dsc has changed now. my $buildinfo = Dpkg::Control->new(type => CTRL_FILE_BUILDINFO); $buildinfo->load("../$pva.buildinfo"); my $checksums = Dpkg::Checksums->new(); @@ -731,7 +731,7 @@ sub parse_rules_requires_root { setup_rootcommand(); } - # Notify the childs we do support R³. + # Notify the children we do support R³. $ENV{DEB_RULES_REQUIRES_ROOT} = join ' ', sort keys %rrr; if ($keywords_base > 1 or $keywords_base and $keywords_impl) { diff --git a/scripts/t/Dpkg_Changelog/shadow b/scripts/t/Dpkg_Changelog/shadow index f9b2236f5..5f4bddb85 100644 --- a/scripts/t/Dpkg_Changelog/shadow +++ b/scripts/t/Dpkg_Changelog/shadow @@ -896,7 +896,7 @@ shadow (1:4.0.3-12) unstable; urgency=low shadow (1:4.0.3-11) unstable; urgency=low * update Japanese debconf translation. closes: #210382 - * update Brazilian Portugese debconf translation. closes: #208122 + * update Brazilian Portuguese debconf translation. closes: #208122 * run pam cleanup code as root. closes: #195048 -- Karl Ramm <[email protected]> Sat, 13 Sep 2003 17:49:29 -0400 @@ -1108,7 +1108,7 @@ shadow (20000902-7) unstable; urgency=low * Cancel login timeout after authentication so that patient people timing out on network directory services can log in with local accounts. Closes: #107148 - * Add Brazillian Portugese debconf template translation for passwd. + * Add Brazillian Portuguese debconf template translation for passwd. Closes: #105292, #93223 * Pull /usr/share/doc/$package/README.shadow-paper.gz. Closes: #98058 * Use getent instead of group to verify existence of shadow group @@ -1382,7 +1382,7 @@ shadow (19990827-9) unstable; urgency=low shadow (19990827-8) unstable; urgency=low - * src/login.c: fixed loggin of username on successful login (was using + * src/login.c: fixed login of username on successful login (was using the normal username, when it should have used pam_user), closes: #47819 * src/login.c: check for hushed login and pass PAM_SILENT if true, @@ -1586,7 +1586,7 @@ shadow (19990827-1) unstable; urgency=low also call pam_fail_delay() with FAIL_DELAY as the arg before authentication. * etc/login.defs.pam.linux: new file, reflects options that PAM takesover * etc/login.defs.pam.hurd: new file, same for Hurd - * debian/passwd.mk: make sure that login.defs.5 get's installed for Hurd + * debian/passwd.mk: make sure that login.defs.5 gets installed for Hurd * pam.d/: Modified defaults for each service to reflect the old style and also added commented options on how to enable obsoleted options from login.defs in the PAM Way(tm). diff --git a/t/pod-coverage.t b/t/pod-coverage.t index 3cecd8b59..113feb264 100644 --- a/t/pod-coverage.t +++ b/t/pod-coverage.t @@ -34,7 +34,7 @@ sub all_pod_modules my $scan_perl_modules = sub { my $module = $File::Find::name; - # Only chack modules, scripts are documented in man pages. + # Only check modules, scripts are documented in man pages. return unless $module =~ s/\.pm$//; my $mod = Module::Metadata->new_from_file($File::Find::name); -- Dpkg.Org's dpkg
