diff options
| author | Josh Soref <jsoref@gmail.com> | 2017-02-26 22:14:52 +0000 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2017-05-06 17:49:12 +0200 |
| commit | b46c8ba6504ab341d74e61f003124d772a3f3875 (patch) | |
| tree | dae22bc641a6ea6278096919164aa875b34e9fa8 | |
| parent | 4137592923011e34c865d34d202a02871c3840aa (diff) | |
| download | dpkg-b46c8ba6504ab341d74e61f003124d772a3f3875.tar.gz | |
doc: Spelling fixes
Signed-off-by: Guillem Jover <guillem@debian.org>
48 files changed, 163 insertions, 161 deletions
diff --git a/ChangeLog.old b/ChangeLog.old index 6a55e2699..10704a381 100644 --- a/ChangeLog.old +++ b/ChangeLog.old @@ -209,7 +209,7 @@ * scripts/update-alternatives.pl: Rewrite it entirely in a more object-oriented way. The only behaviour changes concern --config: - the output is nicer and sorted, it accets a path as well as the + the output is nicer and sorted, it accepts a path as well as the index of the choice. * scripts/t/900_update_alternatives.t: Test suite adjusted to the --config change. @@ -1127,7 +1127,7 @@ * src/archives.c (tarobject): Move a 'continue' inside a conditional checking if the conffile to take over was obsolete on the other - package by adding missing bracese. + package by adding missing braces. 2008-12-01 Raphaël Hertzog <hertzog@debian.org> @@ -1135,7 +1135,7 @@ directory in the current directory but in the parent directory of the target directory. Otherwise the code would fail when called from a non-writable dir and rename could fail due to filesystem - boundaries beetwen the current dir and the target one. + boundaries between the current dir and the target one. 2008-12-01 Modestas Vainius <modestas@vainius.eu> @@ -2671,7 +2671,7 @@ trigger statuses. (dependencies_ok): Handle packages which can be fixed by means of processing their triggers. - * src/processarc.c (process_archive): Ensure file triggers intersts. + * src/processarc.c (process_archive): Ensure file triggers interests. Activate trigger package processing. Parse package triggers control file before reading the conffiles. Treat trigger statuses the same way as installed. Activate trigger package processing for the package @@ -2749,7 +2749,7 @@ * scripts/dpkg-buildpackage.pl: If the user request a cross-compilation, then define PKG_CONFIG_LIBDIR so that it will look in directories - specidic to the target architecture. + specific to the target architecture. * man/dpkg-buildpackage.1: Document this change and also the -t option. 2008-03-28 Raphaël Hertzog <hertzog@debian.org> @@ -2953,7 +2953,7 @@ * scripts/t/200_Dpkg_Shlibs.t: Fix test suite to handle the recent addition of the "objid" field to symbol hash returned - by Dpkg::Shlibs::Objump::Object->get_symbol(). + by Dpkg::Shlibs::Objdump::Object->get_symbol(). 2008-03-22 Ian Jackson <ian@davenant.greenend.org.uk> @@ -3104,11 +3104,11 @@ * lib/Makefile.am (libdpkg_a_SOURCES): Add 'dpkg-def.h'. * lib/dpkg.h: Include 'dpkg-def.h'. - (CONSTANT, PRINTFFORMAT, NONRETURNING, UNUSED): Move defninitions + (CONSTANT, PRINTFFORMAT, NONRETURNING, UNUSED): Move definitions to ... * lib/dpkg-def.h: ... here. New file. * utils/start-stop-daemon.c: Include 'dpkg-def.h'. - (CONSTANT, PRINTFFORMAT, NONRETURNING, UNUSED): Remove defninitions. + (CONSTANT, PRINTFFORMAT, NONRETURNING, UNUSED): Remove definitions. 2008-03-11 Ian Jackson <ian@davenant.greenend.org.uk> @@ -3352,7 +3352,7 @@ * scripts/Dpkg/Shlibs/SymbolFile.pm: Replace has_new_libs(), has_lost_libs(), has_new_symbols() and has_lost_symbols() by corresponding get_* functions. - * scripts/dpkg-gensymbsols.pl: Display list of new/lost libs. Also + * scripts/dpkg-gensymbols.pl: Display list of new/lost libs. Also display list of lost symbols when wildcards symbols have been used. * scripts/t/200_Dpkg_Shlibs.t: Adjust test suite to API change. @@ -3441,7 +3441,7 @@ * lib/myopt.c (myfileopt): Likewise. * dpkg-deb/build.c (getfi): Likewise. * src/configure.c (md5hash): Likewise. - * src/help.c (vbuildarglist): Likewis. + * src/help.c (vbuildarglist): Likewise. * src/main.c (execbackend): Likewise. (commandfd): Likewise. @@ -4484,7 +4484,7 @@ * scripts/dpkg-gencontrol.pl: Unify parsing of Section and Priority fields with Homepage. - (%spvalue, %spdefault): Remove unued variables. + (%spvalue, %spdefault): Remove unused variables. (spfileslistvalue): Use %f instead of %spvalue. 2007-11-29 Guillem Jover <guillem@debian.org> @@ -5388,7 +5388,7 @@ Breaks needs to be implemented. * src/depcon.c (depisok): Likewise. Remove return at the beginning of the function checking for a Breaks dependency, that was - efectively making it a no-op in that case. + effectively making it a no-op in that case. * src/processarc.c (process_archive): Fix indentation. Split calls in deconfigure code to printf and maintainer_script_installed depending on the removing variable. @@ -5748,7 +5748,7 @@ 2007-05-15 Kurt B. Kaiser <kbk@shore.net> * man/install-info.8: Add missing commas, and information on the - behaviour when no '--section' option is specifyied. + behaviour when no '--section' option is specified. 2007-05-14 Guillem Jover <guillem@debian.org> @@ -6148,7 +6148,7 @@ 2007-03-06 Guillem Jover <guillem@debian.org> - * scripts/dpkg-scanpackages.pl (usage): Documemt that the override + * scripts/dpkg-scanpackages.pl (usage): Document that the override file is now optional. (load_override): New function, refactored. Handle the case where '$override' is undefined. @@ -6248,7 +6248,7 @@ 2007-02-13 Guillem Jover <guillem@debian.org> * src/archives.c (MAXCONFLICTORS): New macro. - (conflictor): Use MAXCONFLICTORS instad of hardcoded value '20', and + (conflictor): Use MAXCONFLICTORS instead of hardcoded value '20', and remove non-matching comments. (check_conflict): Exit with an error instead of an assert. Move part of the comment to the error message, remove the rest as non-matching. @@ -6774,7 +6774,7 @@ output. (version): New function. * scripts/dpkg-scansources.pl (Version): Rename variable to ... - (version): ... this (so it will be automaitcally updated by the + (version): ... this (so it will be automatically updated by the Makefile). (Option_spec): Pass \&usage to help option and \&version to version. (Usage): Remove variable. @@ -7117,7 +7117,7 @@ * src/main.h (clearselections): New prototype. * src/main.c (usage): Print '--clear-selections' option description. - (cmdinfos): Add clear-selectons action. + (cmdinfos): Add clear-selections action. * src/select.c (clearselections): New function. * man/C/dpkg.1: Document the new '--clear-selections' option. @@ -7679,7 +7679,7 @@ instead of the hardcoded checks. * scripts/dpkg-gencontrol.pl: Likewise. * scripts/dpkg-source.pl: Likewise. Use dpkg_arch_expand to fill - the Architecture field with the legacy Debian architecures. + the Architecture field with the legacy Debian architectures. * scripts/Makefile.am: New rule to generate .pl from .pl.in files. * man/C/dpkg-architecture.1: Update. Add new options, and few words about the format of the wildcards. @@ -7807,7 +7807,7 @@ * src/processarc.c (process_archive): When copying the forward dependency tree, blank the version field of unversioned dependencies - rather than leaving them uninitialised. + rather than leaving them uninitialized. 2005-08-17 Scott James Remnant <scott@netsplit.com> @@ -8315,7 +8315,7 @@ packages, sort that (rather than the complete list) and use that when calling list1package. This means we only expand to the longest field in the result, not the database. Hopefully the - speed gain of only sorting a filtered list outweights the slighty + speed gain of only sorting a filtered list outweighs the slighty extra computation time. 2005-03-18 Scott James Remnant <scott@netsplit.com> @@ -9506,7 +9506,7 @@ Mon Jul 19 20:17:09 BST 2004 Scott James Remnant <scott@netsplit.com> Sat Jun 26 18:38:34 CEST 2004 David Weinehall <tao@debian.org> - * scripts/dpkg-buildpackge.sh, scripts/dpkg-name.sh, methods/disk.update, + * scripts/dpkg-buildpackage.sh, scripts/dpkg-name.sh, methods/disk.update, methods/disk.setup: Change non-POSIX -a and -o test options to shell && and || for portability. @@ -9756,7 +9756,7 @@ Thu May 6 23:52:28 BST 2004 Daniel Kobras <kobras@debian.org> Thu May 6 23:50:17 BST 2004 Daniel Kobras <kobras@debian.org> - * main/enquiry.c: Remove dereference of unitialised and unused pointer + * main/enquiry.c: Remove dereference of uninitialized and unused pointer variable, fixing segfault on when "gcc -dumpmachine" returns a non-matching triplet. @@ -10022,7 +10022,7 @@ Sun Feb 29 21:56:25 GMT 2004 Scott James Remnant <scott@netsplit.com> * scripts/dpkg-checkbuilddeps.pl: Push build-conflicts errors into @conflicts instead of @unmet, this looks like an accidental error - introduced by bad copy&pasteing. + introduced by bad copy&pasting. Mon Mar 8 17:26:06 GMT 2004 Scott James Remnant <scott@netsplit.com> @@ -10155,7 +10155,7 @@ Sat Sep 20 20:42:35 CDT 2003 Adam Heath <doogie@debian.org> * po/pl.po: * Updated. * Fix translation of 'conflicts with' - * po/ja.po: Fix typo in translation of dpkg --force-help; dowgrade -> + * po/ja.po: Fix typo in translation of dpkg --force-help; downgrade -> downgrade * po/fr.po: * Fix translation when listing files, and the file is diverted. @@ -10457,7 +10457,7 @@ Sat Sep 13 13:55:25 CDT 2003 Adam Heath <doogie@debian.org> Fri, 12 Sep 2003 17:15:33 +0200 Wichert Akkerman <wichert@deephackmode.org> - * srcipts/dpkg-source.pl: allow ~ in version numbers + * scripts/dpkg-source.pl: allow ~ in version numbers Sat Apr 26 15:10:24 CDT 2003 Adam Heath <doogie@debian.org> @@ -11059,7 +11059,7 @@ Sun Apr 14 16:13:16 CEST 2002 Wichert Akkerman <wichert@deephackmode.org> Sun Apr 14 00:49:09 CEST 2002 Wichert Akkerman <wichert@deephackmode.org> - * scripts/controlllib.pl: accept multilpe consecutive empty lines + * scripts/controlllib.pl: accept multiple consecutive empty lines Sat Apr 13 22:59:25 CEST 2002 Wichert Akkerman <wichert@deephackmode.org> @@ -11390,7 +11390,7 @@ Mon Oct 8 19:48:28 CDT 2001 Adam Heath <doogie@debian.org> Sun Oct 7 22:23:54 CDT 2001 Adam Heath <doogie@debian.org> - * Makefile.in: Remove dulicate inclusion of utils in SUBDIRS. + * Makefile.in: Remove duplicate inclusion of utils in SUBDIRS. Sun Oct 7 19:38:56 CDT 2001 Adam Heath <doogie@debian.org> @@ -11605,7 +11605,7 @@ Mon Jul 16 17:19:21 CEST 2001 Wichert Akkerman <wakkerma@debian.org> * dselect/basecmds.cc, dselect/dselect.h: + add checksearch and matchsearch functions to abstract searching algorithm + add displayerror member function - * dselect/baselist.cc: use new checkserach and matchsearch functions to + * dselect/baselist.cc: use new checksearch and matchsearch functions to do the real search/matching * dselect/pkglist.cc, dselect/pkglist.h: implement checksearch and matchsearch using regular expressions @@ -11785,7 +11785,7 @@ Wed Jun 20 11:28:25 CDT 2001 Adam Heath <doogie@debian.org> Set ARCH correctly to host architecture, rather than build arch. + scripts/dpkg-gencontrol.pl: Error if an illegal package name is used. + scripts/cl-debian.pl: Change list of allowed urgencies to: low, medium, - high, and critcial. + high, and critical. + scripts/dpkg-scanpackages.pl: warn instead of die when find returns an error(which happens if there is a dangling symlink, because we use -follow). @@ -12328,7 +12328,7 @@ Sun Apr 22 01:45:25 CEST 2001 Wichert Akkerman <wakkerma@debian.org> Sat Apr 21 18:00:31 CDT 2001 Adam Heath <doogie@debian.org> * main/main.c: reworked \\ parsing in commandfd. - * lib/dbmodify.c: fix non-full initalizer. + * lib/dbmodify.c: fix non-full initializer. Sun Apr 22 00:48:18 CEST 2001 Wichert Akkerman <wakkerma@debian.org> @@ -12535,7 +12535,7 @@ Fri Mar 2 17:29:02 CET 2001 Wichert Akkerman <wakkerma@debian.org> * configure.in: use AC_C_INLINE instead of our own test * lib/nfmalloc, include/dpkg-db.h: remove HAVE_INLINE tests, use extern inline directly - * lib/varbuf.c: add inline keyowrd to varbufaddc + * lib/varbuf.c: add inline keyword to varbufaddc * optlib/Makefile.in: undo earlier patch and build libopt.a again * lib/Makefile.in: use libopt.a again, and a rule to build it * Makefile.in: build optlib before lib @@ -12688,7 +12688,7 @@ Sun Jan 14 23:37:30 EST 2001 Ben Collins <bcollins@debian.org> * include/dpkg-db.h: redeclare nfmalloc(), remove obstack definitions * lib/dbmodify.c (modstatdb_init): remove obstack init * lib/nfmalloc.c: redefine nfmalloc to be an inline function. It now checks - to make sure db_obs is initliazed. + to make sure db_obs is initialized. * main/archives.c (tarobject): declare our own obstack, and use it instead (cu_fileslist) just call obstack_free * main/processarc.c: correct calling of cu_fileslist @@ -13146,7 +13146,7 @@ Mon Dec 4 14:42:01 CET 2000 Wichert Akkerman <wakkerma@debian.org> * scripts/dpkg-statoverride.pl, main/filesdb.c: merge patch from Robert Luberda <robert@pingu.ii.uj.edu.pl> to fix statoverrides using numerical [ug]ids - * Merge updats from the v17 branch: + * Merge updates from the v17 branch: + scripts/dpkg-buildpackage.sh: Quote test options for usepause + scripts/dpkg-shlibdeps.pl: resolve library paths using a combination of the libc major version, and ldconfig -p output. Solves problems @@ -13700,11 +13700,11 @@ Sun Feb 13 01:06:46 CET 2000 Wichert Akkerman <wakkerma@debian.org> * scripts/dpkg-buildpackage.sh: we know that dpkg-architecture is installed since we provide it, so don't test for its existence - * More updates from Marcus Brinkman: + * More updates from Marcus Brinkmann: + archtable: Change first column format from CPU to CPU-OS. Add entry for i386-gnu. Update comment. + configure.in: Check Debian architecture revamped: - More appropriate check title. Check for CPU-OS in arhctable (instead + More appropriate check title. Check for CPU-OS in archtable (instead just CPU). Enclose result message in [...] (because of the comma character). After the test, $dpkg_archset can't be empty, so remove following test which is always true. @@ -13912,7 +13912,7 @@ Wed Dec 22 12:07:40 CET 1999 Wichert Akkerman <wakkerma@debian.org> Tue Dec 21 15:59:35 CET 1999 Wichert Akkerman <wakkerma@debian.org> - * scripts/dpkg-scansoures.pl: don't use \z since that is perl5.005-specific. + * scripts/dpkg-scansources.pl: don't use \z since that is perl5.005-specific. Patch from Roderick Schertler <roderick@argon.org> * debian/rules: fix typo so cleanup-info.8 actually gets installed @@ -14068,7 +14068,7 @@ Thu Nov 18 10:27:35 EST 1999 Ben Collins <bcollins@debian.org> Fri Nov 12 21:21:21 CET 1999 Wichert Akkerman <wakkerma@debian.org> - * Rename japanses translation to just jp + * Rename Japanese translation to just jp Thu Nov 11 20:14:02 EST 1999 Ben Collins <bcollins@debian.org> @@ -14076,7 +14076,7 @@ Thu Nov 11 20:14:02 EST 1999 Ben Collins <bcollins@debian.org> Fri Nov 12 01:47:24 CET 1999 Wichert Akkerman <wakkerma@debian.org> - * Correct names for build-depency names according to Bug# 49792 + * Correct names for build-dependency names according to Bug# 49792 * .. and for dpkg-source.pl as well Mon Nov 8 17:45:50 CET 1999 Wichert Akkerman <wakkerma@debian.org> @@ -14174,7 +14174,7 @@ Mon Oct 25 06:50:17 EDT 1999 Ben Collins <bcollins.debian.org> * main/processarc.c: fixes calculation of package filename display (the ".../foo.deb" one) where it was showing the full path if the basename was longer than 30 chars. Now shows just the basename if it can't - squeez the full path to < 30 chars (even if the basename is > than 30 + squeeze the full path to < 30 chars (even if the basename is > than 30 chars) Mon Oct 25 02:27:49 CEST 1999 Wichert Akkerman <wakkerma@debian.org> @@ -14330,7 +14330,7 @@ Mon Oct 18 09:25:30 EDT 1999 Ben Collins <bcollins.debian.org> * Add mipseb to the archtable too, since mips and mipseb are both viable names for the mips big endian arch - * Update dpkg-architecure's archtable + * Update dpkg-architecture's archtable * Removed the maintainer-configure portion in debian/rules, since we should be shipping the source with all the auto* stuff already generated anyway @@ -14448,7 +14448,7 @@ Mon Oct 11 15:47:18 CEST 1999 Wichert Akkerman <wakkerma@debian.org> * Preparation to move start-stop-daemon from scripts to utils * Merge patches from Ben Collins <bcollins@debian.org>: - + modify remove_buld to remove conffiles when purging a package before we + + modify removal_bulk to remove conffiles when purging a package before we remove its directories. + check if we violate conflicts/depends/pre-depends of other packages when processing an archive. @@ -14467,7 +14467,7 @@ Wed Oct 6 14:40:33 CEST 1999 Wichert Akkerman <wakkerma@debian.org> * Lock complete lockfile for database: it's empty anyway, and Hurd doesn't support partial locks currently - * Don't use PATH_MAX but allocate necessay memory in checkpath(). + * Don't use PATH_MAX but allocate necessary memory in checkpath(). Useful for system that don't have PATH_MAX (like Hurd) Tue Oct 5 19:16:38 CEST 1999 Wichert Akkerman <wakkerma@debian.org> @@ -14852,7 +14852,7 @@ dpkg (1.4.0.22) frozen unstable; urgency=medium * Minor fixes in the programmer's manual (Bug#6206) * Always create readable status and available files (Bug#9869,11887,14636,15786,19146) - * Make dpkg-gencontrol honour -DArchtecture=xxxx (Bug#9893) + * Make dpkg-gencontrol honour -DArchitecture=xxxx (Bug#9893) * Allow different archs for the same binary in debian/files (Bug#9894) * Added workaround in /usr/lib/dpkg/methods/disk/setup to avoid bash warning (Bug#10111,10131) @@ -14875,7 +14875,7 @@ dpkg (1.4.0.21) unstable; urgency=low * Non-maintainer release to include a new update-rc.d * Fixed date on files in the archive from 2017 and 2018 by running touch foo; find . -newer foo | xargs -r touch; rm foo - * Changed start-stop-deamon message "No <program> found; none killed." to + * Changed start-stop-daemon message "No <program> found; none killed." to "No <program> found running; none killed." -- Miquel van Smoorenburg <miquels@cistron.nl> Thu, 5 Mar 1998 14:19:46 +0100 @@ -15129,7 +15129,7 @@ dpkg (1.4.0.2) unstable; urgency=medium * dpkg-buildpackage.sh: reverted the quoting change -- (you should use super, sudo, really, but not su. Or write a wrapper around su) - * dpkg-buildpackge.sh: passing -m, -C, -v options to dpkg-genchanges + * dpkg-buildpackage.sh: passing -m, -C, -v options to dpkg-genchanges more the way Ian likes ;-) * dpkg-source.pl: new function deoctify() as replacement for eval() (turn \ddd into the corresponding character) [rem: probably better @@ -15152,7 +15152,7 @@ dpkg (1.4.0.1) unstable; urgency=medium * dpkg-source: doesn't get screwed up from `unprintable' characters in file names (e.g. from the kbd package) * controllib.pl: $varlistvile -> $varlistfile (thanx Karl Sackett) - * dpkg-buildpackge: quoting for $rootcommand (thanx Michael Meskes) + * dpkg-buildpackage: quoting for $rootcommand (thanx Michael Meskes) and `eval' as default $rootcommand * dpkg-*, controllib.pl: created debian/files and debian/substvars are chown'ed to `getlogin()' and its group @@ -15348,7 +15348,7 @@ dpkg (1.3.3) experimental; urgency=low * Programmers' & policy manuals in source tree; HTML in /usr/doc/dpkg. * Old guidelines.info and text files in /usr/doc/dpkg removed. - * dpkg-source sets permissions on extracted debianised source tree + * dpkg-source sets permissions on extracted debianized source tree and does not copy ownerships out of archive even if running as root. * Emacs mode `dpkg changelog' renamed to `Debian changelog'. @@ -15531,7 +15531,7 @@ dpkg (1.2.4); priority=MEDIUM * dpkg-scanpackages allows many old maintainers (`//'-separated). * `Version' field is now mandatory (some operations already - wouldn't work right anyway if it was't there). + wouldn't work right anyway if it wasn't there). * update-rc.d(8) now says you must remove the script. (Bug#3215.) * dpkg --force-help says that --force-overwrite is on by default. @@ -15855,7 +15855,7 @@ dpkg (1.0.10); priority=MEDIUM dpkg (1.0.9); priority=MEDIUM - * dselect uninitialised variable coredump fixed (thanks Carl). + * dselect uninitialized variable coredump fixed (thanks Carl). * version numbers printed by --version fixed. (Bug#2115.) * disk method problem with missing Packages files fixed. (Bug#2114.) @@ -16395,7 +16395,7 @@ dpkg (0.93.42.1) BETA; priority=HIGH esp. for new installations dpkg (0.93.42) BETA; priority=LOW; HIGH for dselect users - * Fix unitialised variable reference bug in dselect (#890). + * Fix uninitialized variable reference bug in dselect (#890). * Fix problem with wordwrapping package and method descriptions. * Create /var/lib/dpkg/methods/mnt. @@ -16525,7 +16525,7 @@ dpkg (0.93.33) BETA; priority=LOW (HIGH for dselect users) * dselect now has a main menu. - * Fixed nasty uninitialised data bug in dselect. + * Fixed nasty uninitialized data bug in dselect. * dselect now locks and unlocks the packages database. @@ -28,7 +28,7 @@ TODO - Do more unused header include removal. - Add needed includes to all header files. - Get rid of useless "unsigned" modifiers. - - Use internerr instead of assert, and print more meaninful messages. + - Use internerr instead of assert, and print more meaningful messages. - Use enums for currently hardcoded literals (replacingfilesandsaid, filetriggers_edited, etc). - Do not use nfmalloc (and friends) for non in-core db memory. @@ -101,9 +101,9 @@ dpkg Fix: <joeyh_> package a conflicted with old versions of package b. package b - conficted with old versions of package a. I had the old versions of both + conflicted with old versions of package a. I had the old versions of both installed, and told dpkg to install the new versions of a and b - simulantaneously. It refused. + simultaneously. It refused. dselect: * support Enhances diff --git a/debian/changelog b/debian/changelog index 4ee70122b..d80973832 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ dpkg (1.18.24) UNRELEASED; urgency=medium - * + [ Guillem Jover ] + * Documentation: + - Many spelling fixes. Thanks to Josh Soref <jsoref@gmail.com>. [ Updated programs translations ] * Czech (Miroslav Kure). @@ -794,7 +796,7 @@ dpkg (1.18.8) unstable; urgency=medium defined. Based on a patch by Jérémy Bobbio <lunar@debian.org>. Closes: #759999 * Do not use the debian/rules build target fallback when building both - architecture independent and dependent packages in dpkg-buipdpackage. + architecture independent and dependent packages in dpkg-buildpackage. * Use architecture «all» as part of the .changes filename when building architecture independent binaries and no architecture dependent binaries. Closes: #826161 @@ -1218,7 +1220,7 @@ dpkg (1.18.4) unstable; urgency=medium ‘-A’ option to the TERMS section. Closes: #799046 - Clarify that the md5sum check on «dpkg --verify» is performed on the file contents, and failures denote changed content. Closes: #760248 - - Document that dpkg-buildpacakge -nc -S implies -d. + - Document that dpkg-buildpackage -nc -S implies -d. - Clarify role of Build-Depends in deb-src-control(5). Prompted by Johannes Schauer <j.schauer@email.de>. - Document supported feature areas. @@ -2823,7 +2825,7 @@ dpkg (1.17.2) unstable; urgency=low the link group is broken, just print a notice that the alternative is being updated due to the changes. * Add a new «dpkg --verify» command to check the integrity of packages - installed files. Add a --verify-format option to excplicitly select the + installed files. Add a --verify-format option to explicitly select the output format, currently only rpm compatible output is supported, but the default might change in the future. Closes: #187019 * Improve dpkg “Preparing to replace” and “Unpacking” progress messages. @@ -3120,7 +3122,7 @@ dpkg (1.16.10) unstable; urgency=low [ Updated programs translations ] * Esperanto (Felipe Castro). * Spanish (Javier Fernández-Sanguino). - * Vietnamesea (Trần Ngọc Quân). Closes: #692100 + * Vietnamese (Trần Ngọc Quân). Closes: #692100 [ Updated scripts translations ] * Fix mistranslation in French translation of scripts. @@ -3341,7 +3343,7 @@ dpkg (1.16.5) unstable; urgency=low large member sizes. Closes: #678933 * Add new dpkg-query --control-list and --control-show commands, which replace the now deprecated --control-path. - * Print master and slave alternarive link names in update-alternatives + * Print master and slave alternative link names in update-alternatives --query and always print alternative link in --config. Closes: #679010 * Cleanup and clarify buffer I/O error reporting. Closes: #621763 * Avoid full stop and double newline at the end of errors and warnings. @@ -3966,7 +3968,7 @@ dpkg (1.16.1) unstable; urgency=low Closes: #640298 * Reduce dpkg-trigger binary size by refactoring libdpkg modules so that it does not end up pulling triglib. - * Reduce dpkg-deb binary size by refectoring libdpkg modules so that it + * Reduce dpkg-deb binary size by refactoring libdpkg modules so that it does not end up pulling triglib. * Do not fail on --compare-version when generating parse warnings. Existing packages with invalid versions should not fail on their @@ -4039,7 +4041,7 @@ dpkg (1.16.0) unstable; urgency=low a program needed for dpkg correct operation. * Fix dpkg -GEO options on multiple versions of the same packages. Closes: #31141 - * Propagate --admindir to programs run from maintainer scritpts. + * Propagate --admindir to programs run from maintainer scripts. Closes: #97076 * Do not fail when trying to remove the root directory. This will only happen either on distributions where dpkg is a foreign package manager, @@ -4634,7 +4636,7 @@ dpkg (1.15.7) unstable; urgency=low supposed to be. * Introduce a new script called dpkg-buildflags: its purpose is to retrieve compilation flags and it should be used within debian/rules to pass - the right compilation flags to the build process. dpkg-builpackage still + the right compilation flags to the build process. dpkg-buildpackage still exports them to not break packages currently relying on them but packages should now start using dpkg-buildflags instead. Closes: #560070 * For Ubuntu set default value of LDFLAGS to -Wl,-Bsymbolic-functions. @@ -4819,7 +4821,7 @@ dpkg (1.15.6) experimental; urgency=low * Refer to “half configured” instead of “failed config” in «dpkg-query -l» header and dselect package status printing for consistency. * Make “dpkg-statoverride --quiet” actually do something, and quiesce - most of the inoquous warning messages. Closes: #403211 + most of the innocuous warning messages. Closes: #403211 * Make “dpkg-statoverride --update --add” fail if it cannot update the mode and owner of the file. This would fail later on when dpkg itself applies the overrides, so better to signal this earlier. @@ -5094,7 +5096,7 @@ dpkg (1.15.5) unstable; urgency=low memory usage when handling lots of symlinks, and be slightly faster. * Rework varbuf API to avoid increasing buffers indefinitely when adding content to them, regardless of space being already available. - * Fix build macros to allow start-stop-deaemon to use TIOCNOTTY. + * Fix build macros to allow start-stop-daemon to use TIOCNOTTY. * Generate the autoconf version from git to make it easier to see when a snapshot version is being used. * Add infrastructure for doxygen, for now not installed anywhere. @@ -6228,7 +6230,7 @@ dpkg (1.14.17) experimental; urgency=low * Use functions from libcompat when those are not provided by the system. - Add strnlen to libcompat. - Link programs against libcompat which provides obstack. Closes: #142042 - * Change dpkg-gencontrol to not output the Homapage field on udeb. + * Change dpkg-gencontrol to not output the Homepage field on udeb. * Reintroduce 'no-debsig' back in dpkg.cfg to avoid failing to install any package when debsig-verify is installed. Closes: #311843 * Fix some small memory leaks. Closes: #469520 @@ -7485,7 +7487,7 @@ dpkg (1.13.20) unstable; urgency=low Closes: #366351 * Properly check and report lock file existence in install-info. Based on patch by Ben Pfaff. Closes: #368874 - * Correct default info directory for '--infodir' in intall-info man + * Correct default info directory for '--infodir' in install-info man page (Ben Pfaff). Closes: #368875 * Print the bogus version and prefix the error message with 'dpkg: ' when using '--compare-versions'. Closes: #369177 @@ -7600,7 +7602,7 @@ dpkg (1.13.18) unstable; urgency=low * Spanish (Javier Fernández-Sanguino Peña). Closes: #357912 * Danish (Claus Hindsgaul). Closes: #356188 * Polish (Robert Luberda). - * Russian (Yuri Kowlov). Closes: #361415 + * Russian (Yuri Kozlov). Closes: #361415 [ Updated man pages translations ] * Typos corrected in French dpkg-source man page @@ -7639,7 +7641,7 @@ dpkg (1.13.18) unstable; urgency=low dpkg (1.13.17) unstable; urgency=low [ Frank Lichtenheld ] - * Fix handling of -DArchitecure=foo in dpkg-gencontrol. Closes: #251911 + * Fix handling of -DArchitecture=foo in dpkg-gencontrol. Closes: #251911 * Handle architectures in all dependency fields in debian/control, even those of binary packages. Closes: #252657, #324741, #347819 * More dpkg-scanpackages fixes (--arch option handling). Closes: #353506 @@ -7799,7 +7801,7 @@ dpkg (1.13.14) experimental; urgency=low - Galician (Jacobo Tarrio): 1002t. Closes: #351795 - Basque (Piarres Beobide): 1002t. Closes: #351845 - Slovak (Peter Mann): 1002t. Closes: #352087, #352311 - - Vietnamese (Clytie Siddal): 1011t. Closes: #352307 + - Vietnamese (Clytie Siddall): 1011t. Closes: #352307 -- Frank Lichtenheld <djpig@debian.org> Sun, 12 Feb 2006 02:32:12 +0100 @@ -7915,7 +7917,7 @@ dpkg (1.13.12) experimental; urgency=low - Czech (Miroslav Kure). Closes: #345347 * Fixed broken translation: - Brazilian Portuguese (James Troup). Closes: #332872 - * Fix Russian man page for start-stop-deamon(8) + * Fix Russian man page for start-stop-daemon(8) Closes: #325804 * Fix German man page for update-alternatives(8) Closes: #329908 @@ -8554,7 +8556,7 @@ dpkg (1.10.21) unstable; urgency=low * New Translations: - Japanese dpkg-source manpage (KISE Hiroshi). Closes: #239000. - Norwegian Nynorsk (Gaute Hvoslef Kvalnes). Closes: #233614. - - Portguese (Miguel Figueiredo). Closes: #240081. + - Portuguese (Miguel Figueiredo). Closes: #240081. - Spanish dpkg-source manpage (Ruben Porras). Closes: #171489. -- Scott James Remnant <scott@netsplit.com> Sun, 25 Apr 2004 18:55:10 +0100 @@ -8672,7 +8674,7 @@ dpkg (1.10.16) unstable; urgency=low Fix missing space in French translation of: "%s - warning: downgrading %.250s from %.250s to %.250s.\n" Closes: #149142 * Hidetaka Iwai <tyuyu@sings.jp>: - Fix typo in Japanese translation of dpkg --force-help; dowgrade -> + Fix typo in Japanese translation of dpkg --force-help; downgrade -> downgrade: Closes: #157819 * Martin Quinson <mquinson@ens-lyon.fr>: Fix French translation when listing files, and the file is diverted. @@ -8900,7 +8902,7 @@ dpkg (1.10.10) unstable; urgency=low #184239. * Modified to use autotools-dev. Closes: #179656. * Add netbsd support. Closes: #179658, #179659. - * Support hyphenated values in dpkg-architeture. Closes: #179661 + * Support hyphenated values in dpkg-architecture. Closes: #179661 * No longer managed the /usr/doc symlinks. -- Adam Heath <doogie@debian.org> Sat, 26 Apr 2003 15:10:24 -0500 @@ -9023,7 +9025,7 @@ dpkg (1.10) unstable; urgency=low * When a package is set to hold, and a reinstallation is requested, -E will not properly skip it. Closes: #45787. * Make dpkg-checkbuilddeps use dpkg-architecture. Closes: Bug#104230 - * Improve dpkg-archtecture documentation. Closes: Bug#104232 + * Improve dpkg-architecture documentation. Closes: Bug#104232 * Update German translation. Closes: Bug#97239 * Update Polish translation. Closes: Bug#115783 * Update French translation. @@ -9281,7 +9283,7 @@ dpkg (1.9.11) unstable; urgency=low * warn instead of die when find returns an error(which happens if there is a dangling symlink, because we use -follow). Closes: #51479. * Change list of allowed urgencies in debian/changelog to: low, medium, - high, and critcial. Closes: #94475. + high, and critical. Closes: #94475. * Error out if an illegal package name is used in dpkg-gencontrol.pl. Closes: #61211 * Apply patch from Marcus Brinkmann to dpkg-buildpackage: Closes: @@ -9389,7 +9391,7 @@ dpkg (1.9.0) unstable; urgency=low * various other speedups. * Removed all --smallmem code, as smallmem and largemem now actually use about the same amount of memory, and largemem is faster. Both - --largemem and --smallmem are now obselete options, and will print + --largemem and --smallmem are now obsolete options, and will print a warning if used. Closes: Bug#84905, #67528 * Initialize uninitialized variables. This should solve several segfaults. Closes: Bug#25317(plus 9 others, thru the beauty of @@ -9471,7 +9473,7 @@ dpkg (1.9.0) unstable; urgency=low Closes: Bug#89409 * Give a syntax error when we get an unexpected PGP signature in control files. Closes: Bug#75562 - * Change dpkg manpage to reflect that --force-statoveride is no enabled + * Change dpkg manpage to reflect that --force-statoverride is no enabled by default. Closes: Bug#95023 * Handle dangling symlinks, by ignoring error code 1 from find, when processing --recursive. Closes: Bug#4784 @@ -9496,7 +9498,7 @@ dpkg (1.8.3.1) unstable; urgency=low dpkg (1.8.3) unstable; urgency=low * Do chown before chmod in dpkg-statoverride, Closes: Bug#81943 - * Fix recusion in dpkg-shlibdeps, Closes: Bug#81322 + * Fix recursion in dpkg-shlibdeps, Closes: Bug#81322 * Really completely revert dpkg-source patches which broke backwards compatibility @@ -9562,7 +9564,7 @@ dpkg (1.8.0) unstable; urgency=low * Fix two memory leaks, and lesson the memory foot print a tad. Hints taken from 74259. * Fix some things perl5.6 complains about. Closes: Bug#77337 - * Fix referenes to dpkg-deb manpage. Closes: Bug#77855 + * Fix references to dpkg-deb manpage. Closes: Bug#77855 * Update Galish translation * Add new --import option to dpkg-statoverride to make it easy to import suidmanager settings. @@ -9574,7 +9576,7 @@ dpkg (1.8.0) unstable; urgency=low * Add gettext to build-depends * Fix warning when trying to remove a non-existing statoverride. Closes: Bug#79352 - * Be more paranoid with file permissions when extracing files + * Be more paranoid with file permissions when extracting files * Apply statoverrides to more then just files * Update update-alternatives manpage to use FHS instead of FSSTND. Closes: Bug#80237 @@ -9604,7 +9606,7 @@ dpkg (1.7.2) unstable; urgency=low dpkg (1.7.1) unstable; urgency=medium - * Fix a typo in the dpkg-statoveride manpage + * Fix a typo in the dpkg-statoverride manpage * dpkg-statoverride reads and writes the right file now * Make update-alternatives use the right dir for alternatives again @@ -9889,7 +9891,7 @@ dpkg (1.4.1.17) unstable; urgency=low a different uid when starting a process * Add mipseb and mipsel to the archtable too, since mips and mipseb are both viable names for the mips big endian arch, and mipsel is also needed - * Update dpkg-architecure's archtable + * Update dpkg-architecture's archtable * Added --config option to update-alternatives to allow easy changing of the registered alternatives for a specific name * Updated the deb-control(5) man page with all the current fields @@ -10352,7 +10354,7 @@ dpkg (1.4.0.22) frozen unstable; urgency=medium * Minor fixes in the programmer's manual (Bug#6206) * Always create readable status and available files (Bug#9869,11887,14636,15786,19146) - * Make dpkg-gencontrol honour -DArchtecture=xxxx (Bug#9893) + * Make dpkg-gencontrol honour -DArchitecture=xxxx (Bug#9893) * Allow different archs for the same binary in debian/files (Bug#9894) * Added workaround in /usr/lib/dpkg/methods/disk/setup to avoid bash warning (Bug#10111,10131) @@ -10375,7 +10377,7 @@ dpkg (1.4.0.21) unstable; urgency=low * Non-maintainer release to include a new update-rc.d * Fixed date on files in the archive from 2017 and 2018 by running touch foo; find . -newer foo | xargs -r touch; rm foo - * Changed start-stop-deamon message "No <program> found; none killed." to + * Changed start-stop-daemon message "No <program> found; none killed." to "No <program> found running; none killed." -- Miquel van Smoorenburg <miquels@cistron.nl> Thu, 5 Mar 1998 14:19:46 +0100 @@ -10629,7 +10631,7 @@ dpkg (1.4.0.2) unstable; urgency=medium * dpkg-buildpackage.sh: reverted the quoting change -- (you should use super, sudo, really, but not su. Or write a wrapper around su) - * dpkg-buildpackge.sh: passing -m, -C, -v options to dpkg-genchanges + * dpkg-buildpackage.sh: passing -m, -C, -v options to dpkg-genchanges more the way Ian likes ;-) * dpkg-source.pl: new function deoctify() as replacement for eval() (turn \ddd into the corresponding character) [rem: probably better @@ -10652,7 +10654,7 @@ dpkg (1.4.0.1) unstable; urgency=medium * dpkg-source: doesn't get screwed up from `unprintable' characters in file names (e.g. from the kbd package) * controllib.pl: $varlistvile -> $varlistfile (thanx Karl Sackett) - * dpkg-buildpackge: quoting for $rootcommand (thanx Michael Meskes) + * dpkg-buildpackage: quoting for $rootcommand (thanx Michael Meskes) and `eval' as default $rootcommand * dpkg-*, controllib.pl: created debian/files and debian/substvars are chown'ed to `getlogin()' and its group @@ -10848,7 +10850,7 @@ dpkg (1.3.3) experimental; urgency=low * Programmers' & policy manuals in source tree; HTML in /usr/doc/dpkg. * Old guidelines.info and text files in /usr/doc/dpkg removed. - * dpkg-source sets permissions on extracted debianised source tree + * dpkg-source sets permissions on extracted debianized source tree and does not copy ownerships out of archive even if running as root. * Emacs mode `dpkg changelog' renamed to `Debian changelog'. @@ -11031,7 +11033,7 @@ dpkg (1.2.4); priority=MEDIUM * dpkg-scanpackages allows many old maintainers (`//'-separated). * `Version' field is now mandatory (some operations already - wouldn't work right anyway if it was't there). + wouldn't work right anyway if it wasn't there). * update-rc.d(8) now says you must remove the script. (Bug#3215.) * dpkg --force-help says that --force-overwrite is on by default. @@ -11355,7 +11357,7 @@ dpkg (1.0.10); priority=MEDIUM dpkg (1.0.9); priority=MEDIUM - * dselect uninitialised variable coredump fixed (thanks Carl). + * dselect uninitialized variable coredump fixed (thanks Carl). * version numbers printed by --version fixed. (Bug#2115.) * disk method problem with missing Packages files fixed. (Bug#2114.) @@ -11895,7 +11897,7 @@ dpkg (0.93.42.1) BETA; priority=HIGH esp. for new installations dpkg (0.93.42) BETA; priority=LOW; HIGH for dselect users - * Fix unitialised variable reference bug in dselect (#890). + * Fix uninitialized variable reference bug in dselect (#890). * Fix problem with wordwrapping package and method descriptions. * Create /var/lib/dpkg/methods/mnt. @@ -12025,7 +12027,7 @@ dpkg (0.93.33) BETA; priority=LOW (HIGH for dselect users) * dselect now has a main menu. - * Fixed nasty uninitialised data bug in dselect. + * Fixed nasty uninitialized data bug in dselect. * dselect now locks and unlocks the packages database. diff --git a/doc/README.api b/doc/README.api index 13f1b9646..8d72f6359 100644 --- a/doc/README.api +++ b/doc/README.api @@ -30,6 +30,6 @@ Description: What: custom changelog parsers as Dpkg::Changelog derived modules Status: stable Description: - Since dpkg 1.18.8, custome changelog parsers are supported as modules + Since dpkg 1.18.8, custom changelog parsers are supported as modules derived from the Dpkg::Changelog module. The derived modules need to implement all required documented methods. diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c index 5edba2dbe..b1d66ee15 100644 --- a/dpkg-deb/extract.c +++ b/dpkg-deb/extract.c @@ -244,7 +244,7 @@ extracthalf(const char *debar, const char *dir, read_fail(r, debar, _("archive control member size")); if (sscanf(ctrllenbuf, "%jd%c%d", (intmax_t *)&ctrllennum, &nlc, &dummy) != 2 || nlc != '\n') - ohshit(_("archive has malformatted control member size '%s'"), ctrllenbuf); + ohshit(_("archive has malformed control member size '%s'"), ctrllenbuf); if (admininfo) { memberlen = ctrllennum; diff --git a/dselect/basecmds.cc b/dselect/basecmds.cc index 44ce64def..6af099ed7 100644 --- a/dselect/basecmds.cc +++ b/dselect/basecmds.cc @@ -107,7 +107,7 @@ baselist::matchsearch(int index) name = itemname(index); if (!name) - return false; /* Skip things without a name (seperators). */ + return false; /* Skip things without a name (separators). */ searchlen=strlen(searchstring); lendiff = strlen(name) - searchlen; diff --git a/dselect/methods/floppy/update b/dselect/methods/floppy/update index 463f82050..890ea1519 100755 --- a/dselect/methods/floppy/update +++ b/dselect/methods/floppy/update @@ -84,6 +84,6 @@ Insert a disk containing a Packages file, or type q to quit. ' done echo ' -OK, continuting with installation.' +OK, continuing with installation.' xit=0 diff --git a/dselect/methods/ftp/install.pl b/dselect/methods/ftp/install.pl index 1dddb602c..2eb9f16a8 100755 --- a/dselect/methods/ftp/install.pl +++ b/dselect/methods/ftp/install.pl @@ -217,7 +217,7 @@ sub md5sum($) { # construct list of files to get # hash of filenames => size of downloaded part -# query user for each paritial file +# query user for each partial file print "\nConstructing list of files to get...\n"; my %downloads; my ($dir, @info, @files, $csize, $size); diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc index e3d2dc4bb..87886ffb6 100644 --- a/dselect/pkgdepcon.cc +++ b/dselect/pkgdepcon.cc @@ -78,7 +78,7 @@ int packagelist::checkdependers(pkginfo *pkg, int changemade) { int packagelist::resolvesuggest() { // We continually go around looking for things to change, but we may // only change the ‘suggested’ value if we also increase the ‘priority’ - // Return 2 if we made a change due to a Recommended, Depends or Conficts, + // Return 2 if we made a change due to a Recommended, Depends or Conflicts, // or 1 if we offered or made a change because of an Optional line. debug(dbg_general, "packagelist[%p]::resolvesuggest()", this); int changemade, maxchangemade; diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc index 823e754a8..105f3c1aa 100644 --- a/dselect/pkglist.cc +++ b/dselect/pkglist.cc @@ -547,7 +547,7 @@ packagelist::matchsearch(int index) name = itemname(index); if (!name) - return false; /* Skip things without a name (seperators) */ + return false; /* Skip things without a name (separators) */ if (regexec(&searchfsm, name, 0, nullptr, 0) == 0) return true; diff --git a/lib/compat/obstack.c b/lib/compat/obstack.c index 85a3be8c1..136fd33b5 100644 --- a/lib/compat/obstack.c +++ b/lib/compat/obstack.c @@ -87,7 +87,7 @@ enum /* The functions allocating more room by calling `obstack_chunk_alloc' jump to the handler pointed to by `obstack_alloc_failed_handler'. This can be set to a user defined function which should either - abort gracefully or use longjump - but shouldn't return. This + abort gracefully or use longjmp - but shouldn't return. This variable by default points to the internal function `print_and_abort'. */ static void print_and_abort (void); diff --git a/lib/compat/obstack.h b/lib/compat/obstack.h index a33d5108a..a676d314d 100644 --- a/lib/compat/obstack.h +++ b/lib/compat/obstack.h @@ -196,7 +196,7 @@ extern void __obstack_free (struct obstack *obstack, void *block); /* Error handler called when `obstack_chunk_alloc' failed to allocate more memory. This can be set to a user defined function which - should either abort gracefully or use longjump - but shouldn't + should either abort gracefully or use longjmp - but shouldn't return. The default action is to print a message and abort. */ extern void (*obstack_alloc_failed_handler) (void); diff --git a/lib/dpkg/dbdir.c b/lib/dpkg/dbdir.c index beaf073b4..2a0eefad8 100644 --- a/lib/dpkg/dbdir.c +++ b/lib/dpkg/dbdir.c @@ -38,7 +38,7 @@ static const char *db_dir = ADMINDIR; * is NULL. For the latter the order is, value from environment variable * DPKG_ADMINDIR, and then the built-in default ADMINDIR, * - * @param dir The new databse directory, or NULL to set to default. + * @param dir The new database directory, or NULL to set to default. * * @return The new database directory. */ @@ -77,7 +77,7 @@ dpkg_db_get_dir(void) * This function returns an allocated string, which should be freed with * free(2). * - * @param pathpart The pathpart to append to the new pathnme. + * @param pathpart The pathpart to append to the new pathname. * * @return The newly allocated pathname. */ diff --git a/lib/dpkg/debug.c b/lib/dpkg/debug.c index 5fac2fffa..ddbd394c9 100644 --- a/lib/dpkg/debug.c +++ b/lib/dpkg/debug.c @@ -3,7 +3,7 @@ * debug.c - debugging support * * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk> - * Copyright © 2011 Guillem Jover <guillem@debian.orgian> + * Copyright © 2011 Guillem Jover <guillem@debian.org> * * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/dpkg/debug.h b/lib/dpkg/debug.h index a4ff29c6f..3f98ac78a 100644 --- a/lib/dpkg/debug.h +++ b/lib/dpkg/debug.h @@ -2,7 +2,7 @@ * libdpkg - Debian packaging suite library routines * debug.h - debugging support * - * Copyright © 2011 Guillem Jover <guillem@debian.orgian> + * Copyright © 2011 Guillem Jover <guillem@debian.org> * * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/lib/dpkg/fields.c b/lib/dpkg/fields.c index 6d13edc50..aeb22b46c 100644 --- a/lib/dpkg/fields.c +++ b/lib/dpkg/fields.c @@ -326,7 +326,7 @@ static void conffvalue_lastword(const char *value, const char *from, malformed: parse_error(ps, - _("value for '%s' field has malformatted line '%.*s'"), + _("value for '%s' field has malformed line '%.*s'"), "Conffiles", (int)min(endent - value, 250), value); } @@ -483,7 +483,7 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin, fip->name, depname.buf, arch.buf, emsg); } else if (fip->integer == dep_conflicts || fip->integer == dep_breaks || fip->integer == dep_replaces) { - /* Conflics/Breaks/Replaces get an implicit "any" arch qualifier. */ + /* Conflicts/Breaks/Replaces get an implicit "any" arch qualifier. */ dop->arch_is_implicit = true; dop->arch = dpkg_arch_get(DPKG_ARCH_WILDCARD); } else { diff --git a/lib/dpkg/report.c b/lib/dpkg/report.c index cbd8ecf65..58df60006 100644 --- a/lib/dpkg/report.c +++ b/lib/dpkg/report.c @@ -1,6 +1,6 @@ /* * libdpkg - Debian packaging suite library routines - * reoport.c - message reporting + * report.c - message reporting * * Copyright © 2004-2005 Scott James Remnant <scott@netsplit.com> * Copyright © 2008-2013 Guillem Jover <guillem@debian.org> diff --git a/lib/dpkg/t/c-trigdeferred.c b/lib/dpkg/t/c-trigdeferred.c index 5c3494967..6c7ad187e 100644 --- a/lib/dpkg/t/c-trigdeferred.c +++ b/lib/dpkg/t/c-trigdeferred.c @@ -1,6 +1,6 @@ /* * libdpkg - Debian packaging suite library routines - * c-trigdeferred.c - test triggerd deferred file parser + * c-trigdeferred.c - test triggered deferred file parser * * Copyright © 2016 Guillem Jover <guillem@debian.org> * diff --git a/lib/dpkg/t/t-ehandle.c b/lib/dpkg/t/t-ehandle.c index a4e2cd49d..5904bfae1 100644 --- a/lib/dpkg/t/t-ehandle.c +++ b/lib/dpkg/t/t-ehandle.c @@ -104,7 +104,7 @@ test_cleanup_error(void) pop_error_context(ehflag_bombout); /* We should have recovered from the cleanup handler failing, - * and arrived here corerctly. */ + * and arrived here correctly. */ pass = true; } diff --git a/lib/dpkg/t/t-tarextract.t b/lib/dpkg/t/t-tarextract.t index 0f868c8b2..25916bb8d 100755 --- a/lib/dpkg/t/t-tarextract.t +++ b/lib/dpkg/t/t-tarextract.t @@ -64,7 +64,7 @@ sub tar_create_tree { my $long_e = 'e' x 29; my $long_f = 'f' x 22; - # Popullate tar hierarchy + # Populate tar hierarchy create('file'); link 'file', 'hardlink'; diff --git a/lib/dpkg/t/t-treewalk.t b/lib/dpkg/t/t-treewalk.t index 253868101..dcde7901e 100755 --- a/lib/dpkg/t/t-treewalk.t +++ b/lib/dpkg/t/t-treewalk.t @@ -42,7 +42,7 @@ sub make_file { close $fh; } -# Popullate the tree hierarchy. +# Populate the tree hierarchy. sub make_tree { my ($dirtree) = @_; my $cwd = cwd(); @@ -66,7 +66,7 @@ sub make_tree { make_file('bbbb/wwwwz'); make_file('bbbb/zzzzz'); - # Popullated tree. + # Populated tree. make_path('cccc/aa/aa/aa/'); make_path('cccc/aa/aa/bb/aa/'); make_file('cccc/aa/aa/bb/aa/file-a'); diff --git a/m4/dpkg-arch.m4 b/m4/dpkg-arch.m4 index 3744abc4d..ec25d95e5 100644 --- a/m4/dpkg-arch.m4 +++ b/m4/dpkg-arch.m4 @@ -9,7 +9,7 @@ AC_DEFUN([_DPKG_ARCHITECTURE], [ AC_REQUIRE([DPKG_PROG_PERL])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl $2=$(PERL=$PERL $srcdir/run-script scripts/dpkg-architecture.pl -t$host -q$1 2>/dev/null) -])# _DPKG_ARCHITECURE +])# _DPKG_ARCHITECTURE # DPKG_CPU_TYPE # ------------- diff --git a/man/deb-buildinfo.man b/man/deb-buildinfo.man index 0be010e6c..60109baf8 100644 --- a/man/deb-buildinfo.man +++ b/man/deb-buildinfo.man @@ -140,7 +140,7 @@ The absolute build path, which correspond to the unpacked source tree. This field is only going to be present if the vendor has whitelisted it via some pattern match to avoid leaking possibly sensitive information. -On Debian and derivaties only build paths starting with \fI/build/\fP +On Debian and derivatives only build paths starting with \fI/build/\fP will emit this field. .TP .BR Installed\-Build\-Depends: " (required)" diff --git a/man/deb-version.man b/man/deb-version.man index 96d9543dd..a4bf22c37 100644 --- a/man/deb-version.man +++ b/man/deb-version.man @@ -76,7 +76,7 @@ It is optional; if it isn't present then the \fIupstream-version\fP may not contain a hyphen. This format represents the case where a piece of software was written specifically to be turned into a -Debian package, and so there is only one “debianisation” +Debian package, and so there is only one “debianization” of it and therefore no revision indication is required. .IP It is conventional to restart the diff --git a/man/dpkg-source.man b/man/dpkg-source.man index 544e8d032..f393ae0e0 100644 --- a/man/dpkg-source.man +++ b/man/dpkg-source.man @@ -320,7 +320,7 @@ regenerating the \fB.diff.gz\fP by comparing the source package If a second non-option argument is supplied it should be the name of the original source directory or tarfile or the empty string if the package is -a Debian-specific one and so has no debianisation diffs. If no second +a Debian-specific one and so has no debianization diffs. If no second argument is supplied then .B dpkg\-source will look for the original source tarfile @@ -375,7 +375,7 @@ not match a bad source archive will be generated. Specifies to not look for any original source, and to not generate a diff. The second argument, if supplied, must be the empty string. This is used for Debian-specific packages which do not have a separate -upstream source and therefore have no debianisation diffs. +upstream source and therefore have no debianization diffs. .TP .BR \-sa " or " \-sA Specifies to look for the original source archive as a tarfile or as a @@ -389,7 +389,7 @@ if a directory is found it will pack it to create the original source and remove it afterwards (this is equivalent to .BR \-sr ); if neither is found it will assume that the package has no -debianisation diffs, only a straightforward source archive (this is +debianization diffs, only a straightforward source archive (this is equivalent to .BR \-sn ). If both are found then \fBdpkg\-source\fP will ignore the directory, diff --git a/man/dpkg.man b/man/dpkg.man index 38f2fa872..de2a07188 100644 --- a/man/dpkg.man +++ b/man/dpkg.man @@ -489,7 +489,7 @@ option will cause automatic deconfiguration of the package which depended on the removed package. .TP \fB\-D\fIoctal\fP, \fB\-\-debug=\fP\fIoctal\fP -Switch debugging on. \fIoctal\fP is formed by bitwise-orring desired +Switch debugging on. \fIoctal\fP is formed by bitwise-oring desired values together from the list below (note that these values may change in future releases). \fB\-Dh\fP or \fB\-\-debug=help\fP display these debugging values. diff --git a/man/po/ChangeLog.old b/man/po/ChangeLog.old index 70395ec27..a0541caf8 100644 --- a/man/po/ChangeLog.old +++ b/man/po/ChangeLog.old @@ -74,7 +74,7 @@ 2008-06-07 Wiktor Wandachowicz <siryes@gmail.com> * po/pl.po: Ack typo fix. - * po/pl.add: Add conents. + * po/pl.add: Add contents. 2008-06-06 Wiktor Wandachowicz <siryes@gmail.com> diff --git a/po/ChangeLog.old b/po/ChangeLog.old index 38807b139..3433ddb01 100644 --- a/po/ChangeLog.old +++ b/po/ChangeLog.old @@ -1150,7 +1150,7 @@ 2006-05-15 Eddy Petrişor <eddy.petrisor@gmail.com> - * ro.po: Fixed some consitency issues; + * ro.po: Fixed some consistency issues; "conffiles" is no longer translated; doublechecked for existence of writings without diacritics; translation still at 742t. @@ -1178,7 +1178,7 @@ 2006-05-06 Eddy Petrişor <eddy.petrisor@gmail.com> * ro.po: Unified quotation marks; using Romanian quotes - even more than before; removed (hopefuly) the rest of + even more than before; removed (hopefully) the rest of first person messages (now dpkg message should be impersonal). Improved consistency of translation of "failed"/"unable"/"couldn't"; minor spelling corrections. diff --git a/scripts/Dpkg/Control/HashCore.pm b/scripts/Dpkg/Control/HashCore.pm index 21b74916c..774974fcc 100644 --- a/scripts/Dpkg/Control/HashCore.pm +++ b/scripts/Dpkg/Control/HashCore.pm @@ -109,7 +109,7 @@ sub new { my $class = ref($this) || $this; # Object is a scalar reference and not a hash ref to avoid - # infinite recursion due to overloading hash-derefencing + # infinite recursion due to overloading hash-dereferencing my $self = \{ in_order => [], out_order => [], diff --git a/scripts/Dpkg/Shlibs/Symbol.pm b/scripts/Dpkg/Shlibs/Symbol.pm index 56bf17783..019e77e99 100644 --- a/scripts/Dpkg/Shlibs/Symbol.pm +++ b/scripts/Dpkg/Shlibs/Symbol.pm @@ -473,7 +473,7 @@ sub mark_not_found_in_library { if ($self->{deprecated}) { # Bump deprecated if the symbol is optional so that it - # keeps reappering in the diff while it's missing + # keeps reappearing in the diff while it's missing $self->{deprecated} = $minver if $self->is_optional(); } elsif (version_compare($minver, $self->{minver}) > 0) { $self->{deprecated} = $minver; diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm index a76784661..9a9daea78 100644 --- a/scripts/Dpkg/Source/Package.pm +++ b/scripts/Dpkg/Source/Package.pm @@ -599,7 +599,7 @@ sub do_build { sub can_build { my ($self, $dir) = @_; - return (0, 'can_build() has not been overriden'); + return (0, 'can_build() has not been overridden'); } sub add_file { diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl index 2eea20391..dd17abb25 100755 --- a/scripts/dpkg-buildpackage.pl +++ b/scripts/dpkg-buildpackage.pl @@ -375,17 +375,17 @@ if (@rootcommand and not find_command($rootcommand[0])) { 'package, specify a command with the -r option, ' . 'or run this as root')); } else { - error(g_("gain-root-commmand '%s' not found"), $rootcommand[0]); + error(g_("gain-root-command '%s' not found"), $rootcommand[0]); } } if ($check_command and not find_command($check_command)) { - error(g_("check-commmand '%s' not found"), $check_command); + error(g_("check-command '%s' not found"), $check_command); } if ($signcommand) { if (!find_command($signcommand)) { - error(g_("sign-commmand '%s' not found"), $signcommand); + error(g_("sign-command '%s' not found"), $signcommand); } } elsif (($ENV{GNUPGHOME} && -e $ENV{GNUPGHOME}) || ($ENV{HOME} && -e "$ENV{HOME}/.gnupg")) { diff --git a/scripts/dpkg-maintscript-helper.sh b/scripts/dpkg-maintscript-helper.sh index 2366dcbdb..1a0459f75 100755 --- a/scripts/dpkg-maintscript-helper.sh +++ b/scripts/dpkg-maintscript-helper.sh @@ -127,7 +127,7 @@ abort_rm_conffile() { mv "$CONFFILE.dpkg-remove" "$CONFFILE" fi if [ -e "$CONFFILE.dpkg-backup" ]; then - echo "Reinstalling $CONFFILE that was backupped" + echo "Reinstalling $CONFFILE that was backed-up" mv "$CONFFILE.dpkg-backup" "$CONFFILE" fi } diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl index 8e8cb99d7..0978f33b9 100755 --- a/scripts/dpkg-shlibdeps.pl +++ b/scripts/dpkg-shlibdeps.pl @@ -166,7 +166,7 @@ error(g_('error occurred while parsing %s'), 'Build-Depends/Build-Depends-Arch') my %dependencies; -# Statictics on soname seen in the whole run (with multiple analysis of +# Statistics on soname seen in the whole run (with multiple analysis of # binaries) my %global_soname_notfound; my %global_soname_used; diff --git a/scripts/t/Dpkg_Changelog.t b/scripts/t/Dpkg_Changelog.t index 7535e24de..1369aeff3 100644 --- a/scripts/t/Dpkg_Changelog.t +++ b/scripts/t/Dpkg_Changelog.t @@ -94,7 +94,7 @@ foreach my $file ("$datadir/countme", "$datadir/shadow", "$datadir/fields", check_options( $changes, \@data, { count => 3, offset => 2 }, 3, '1:2.0~rc2-2/1:2.0~rc2-1sarge3/1:2.0~rc2-1sarge2', - 'positve count + positive offset' ); + 'positive count + positive offset' ); check_options( $changes, \@data, { count => -3, offset => 4 }, 3, '1:2.0~rc2-3/1:2.0~rc2-2/1:2.0~rc2-1sarge3', @@ -103,7 +103,7 @@ foreach my $file ("$datadir/countme", "$datadir/shadow", "$datadir/fields", check_options( $changes, \@data, { count => 4, offset => 5 }, 2, '1:2.0~rc2-1sarge1/1.5-1', - 'positve count + positive offset (>max)' ); + 'positive count + positive offset (>max)' ); check_options( $changes, \@data, { count => -4, offset => 2 }, 2, '2:2.0-1/1:2.0~rc2-3', @@ -112,7 +112,7 @@ foreach my $file ("$datadir/countme", "$datadir/shadow", "$datadir/fields", check_options( $changes, \@data, { count => 3, offset => -4 }, 3, '1:2.0~rc2-1sarge3/1:2.0~rc2-1sarge2/1:2.0~rc2-1sarge1', - 'positve count + negative offset' ); + 'positive count + negative offset' ); check_options( $changes, \@data, { count => -3, offset => -3 }, 3, '1:2.0~rc2-3/1:2.0~rc2-2/1:2.0~rc2-1sarge3', @@ -121,7 +121,7 @@ foreach my $file ("$datadir/countme", "$datadir/shadow", "$datadir/fields", check_options( $changes, \@data, { count => 5, offset => -2 }, 2, '1:2.0~rc2-1sarge1/1.5-1', - 'positve count + negative offset (>max)' ); + 'positive count + negative offset (>max)' ); check_options( $changes, \@data, { count => -5, offset => -4 }, 3, '2:2.0-1/1:2.0~rc2-3/1:2.0~rc2-2', diff --git a/scripts/t/Dpkg_Changelog/shadow b/scripts/t/Dpkg_Changelog/shadow index f212bc6db..f9b2236f5 100644 --- a/scripts/t/Dpkg_Changelog/shadow +++ b/scripts/t/Dpkg_Changelog/shadow @@ -198,7 +198,7 @@ shadow (1:4.0.3-35) unstable; urgency=low Closes: #308662 - 124_ru: Russian updated by Yuri Kozlov Closes: #308839 - - 129_ru: Romanian updated by Sorin Bataruc + - 129_ru: Romanian updated by Sorin Batariuc Closes: #308921 - 130_zh_TW: Tradition Chinese updated by Tetralet Closes: #311588 @@ -689,7 +689,7 @@ shadow (1:4.0.3-28.1) unstable; urgency=high shadow (1:4.0.3-28) unstable; urgency=low - * Fix login and passwd in preinst to avoid promts on woody upgrade, + * Fix login and passwd in preinst to avoid prompts on woody upgrade, Closes: #243099 * Fix login and passwd configuration file to support common-passwd * Apply NMU patch from Christian Perrier, Closes: #241438 @@ -705,7 +705,7 @@ shadow (1:4.0.3-27) unstable; urgency=low shadow (1:4.0.3-26.1) unstable; urgency=low - * NMU for Debian Installe rneeds + * NMU for Debian Installer needs * Translation updates: - Debconf: - French. Closes: #241438 @@ -793,7 +793,7 @@ shadow (1:4.0.3-20) unstable; urgency=low shadow (1:4.0.3-19) unstable; urgency=low - * When creating a user account in psaswd.config, ask for full name + * When creating a user account in passwd.config, ask for full name first, and make up a default username. Closes: #235386 * "No really, assume md5 passwords". Closes: #223664 @@ -953,7 +953,7 @@ shadow (1:4.0.3-7) unstable; urgency=low * When relocating a user's home directory, don't fail and remove the new home directory if we can't remove the old home directory for some - reason; the results can be spectularly poort if, for instance, only + reason; the results can be spectacularly poor if, for instance, only the rmdir() fails. closes: #166369 * run dh_installdebconf so base-config will work. *sigh*. closes: #166788 @@ -1001,7 +1001,7 @@ shadow (1:4.0.3-3) unstable; urgency=low closes: #162181, #162199, #162228 * fix vipw symlink brain-damage: closes: #162218 * fix package description brain damage, closes: #139563 - * install cp{pw,gr} brain damge + * install cp{pw,gr} brain damage -- Karl Ramm <kcr@debian.org> Wed, 25 Sep 2002 01:21:35 -0400 @@ -1117,7 +1117,7 @@ shadow (20000902-7) unstable; urgency=low config scripts, but that's not getting fixed in woody.] * Amend reference to /usr/doc in shadowconfig.8. Closes: #102804 * su should set $USER. Closes: #102995 - * userdel now deletes user groups from /etc/gshdow as well as + * userdel now deletes user groups from /etc/gshadow as well as /etc/group. Closes: #99442 * grpck now has an (otherwise undocumented) -p option, so that shadowconfig can clean up the results of the above, so the config @@ -1206,7 +1206,7 @@ shadow (20000902-2) unstable frozen; urgency=low doing something right. closes: #78186 * login.pam.d: made pam_nologin.so requisite. closes: #80111 * su to root seems pretty quick to me, closes: #64756 - * xmalloc.c: remove decleration of malloc, which was causing system + * xmalloc.c: remove declaration of malloc, which was causing system * header conflicts. closes: #80398 -- Ben Collins <bcollins@debian.org> Sun, 31 Dec 2000 14:33:47 -0500 @@ -1290,7 +1290,7 @@ shadow (19990827-17) unstable; urgency=low * logoutd.init.d: Check for /etc/security/time.conf, closes: #54900 * login.defs: Added note about the MAIL env option, closes: #54768 * login.pam.d,passwd.pam.d: Use new options in pam_unix.so to enable - obsure password checks. This mimics the old behavior in pre-PAM + obscure password checks. This mimics the old behavior in pre-PAM shadow, closes: #58203 * Use patch from Topi Miettinen <tom@pluto.nic.fi> to add pam session ability to su, closes: #57526, #55873, #57532 @@ -1555,7 +1555,7 @@ shadow (19990827-1) unstable; urgency=low - Sorry, but su (all su's) invoke the shell with -c "cmd". This is documented, not a bug, it's a standard interface that su expects, go fix sash's bug for not supporting it, closes: #14551 - - Acknoledged NMU: closes: #20058 + - Acknowledged NMU: closes: #20058 - More "Fixed" bugs getting closed...CLOSED AT LAST, closes: #17593 closes: #20057, #12689 * Switched to a new build setup (dbs) diff --git a/scripts/t/Dpkg_Checksums.t b/scripts/t/Dpkg_Checksums.t index 6c7dc80a8..e549e640e 100644 --- a/scripts/t/Dpkg_Checksums.t +++ b/scripts/t/Dpkg_Checksums.t @@ -94,7 +94,7 @@ foreach my $c (@expected_checksums) { my $ck = Dpkg::Checksums->new(); -is(scalar $ck->get_files(), 0, 'No checkums recorded'); +is(scalar $ck->get_files(), 0, 'No checksums recorded'); # Check add_from_file() diff --git a/scripts/t/Dpkg_Dist_Files.t b/scripts/t/Dpkg_Dist_Files.t index d43c2245e..b29973d38 100644 --- a/scripts/t/Dpkg_Dist_Files.t +++ b/scripts/t/Dpkg_Dist_Files.t @@ -178,7 +178,7 @@ FILES $dist->reset(); $dist->load("$datadir/files-byhand") or error('cannot parse file'); $dist->filter(remove => sub { $_[0]->{priority} eq 'optional' }); -is($dist->output(), $expected, 'Filter remove piority optional'); +is($dist->output(), $expected, 'Filter remove priority optional'); $expected = <<'FILES'; BY-HAND-file webdocs optional diff --git a/scripts/t/Dpkg_Shlibs.t b/scripts/t/Dpkg_Shlibs.t index 578e4e4a3..775d15eeb 100644 --- a/scripts/t/Dpkg_Shlibs.t +++ b/scripts/t/Dpkg_Shlibs.t @@ -63,8 +63,8 @@ chdir($cwd); @librarypaths = Dpkg::Shlibs::get_library_paths(); is_deeply(\@librarypaths, - [ qw(/nonexistant32 /nonexistant/lib64 - /usr/local/lib /nonexistant/lib128) ], 'parsed library paths'); + [ qw(/nonexistent32 /nonexistent/lib64 + /usr/local/lib /nonexistent/lib128) ], 'parsed library paths'); use_ok('Dpkg::Shlibs::Objdump'); @@ -499,7 +499,7 @@ is_deeply($sym, Dpkg::Shlibs::Symbol->new(symbol => 'symbol11_optional@Base', symbol_templ => 'symbol11_optional@Base', minver => '1.1', dep_id => 1, deprecated => 0, tags => { optional => undef }, tagorder => [ 'optional' ]), - 'reappered optional symbol gets undeprecated + minver'); + 'reappeared optional symbol gets undeprecated + minver'); is( scalar($sym_file->get_lost_symbols($sym_file_dup) + $sym_file->get_new_symbols($sym_file_dup)), 0, 'reappeared optional symbol: neither NEW nor LOST'); diff --git a/scripts/t/Dpkg_Shlibs/ld.so.conf b/scripts/t/Dpkg_Shlibs/ld.so.conf index 7f0a4aafe..cb7a19cc2 100644 --- a/scripts/t/Dpkg_Shlibs/ld.so.conf +++ b/scripts/t/Dpkg_Shlibs/ld.so.conf @@ -1,9 +1,9 @@ # Comment and empty line # Paths -/nonexistant32 -/nonexistant/lib64 +/nonexistent32 +/nonexistent/lib64 -include /nonexistant/*.conf +include /nonexistent/*.conf include t/Dpkg_Shlibs/ld.so.conf.d/*.conf diff --git a/scripts/t/Dpkg_Shlibs/ld.so.conf_2 b/scripts/t/Dpkg_Shlibs/ld.so.conf_2 index 4a36fea14..8afcaa57d 100644 --- a/scripts/t/Dpkg_Shlibs/ld.so.conf_2 +++ b/scripts/t/Dpkg_Shlibs/ld.so.conf_2 @@ -1 +1 @@ -/nonexistant/lib128 +/nonexistent/lib128 diff --git a/scripts/t/dpkg_buildpackage.t b/scripts/t/dpkg_buildpackage.t index faae2cba4..2b4345539 100644 --- a/scripts/t/dpkg_buildpackage.t +++ b/scripts/t/dpkg_buildpackage.t @@ -38,7 +38,7 @@ my $tmpdir = 't.tmp/dpkg_buildpackage'; $ENV{$_} = rel2abs($ENV{$_}) foreach qw(DPKG_DATADIR DPKG_ORIGINS_DIR); -# Any paralellization from the parent should be ignored, we are testing +# Any parallelization from the parent should be ignored, we are testing # the makefiles serially anyway. delete $ENV{MAKEFLAGS}; diff --git a/scripts/t/mk.t b/scripts/t/mk.t index 01ce0fa37..95ccedf82 100644 --- a/scripts/t/mk.t +++ b/scripts/t/mk.t @@ -31,7 +31,7 @@ my $datadir = "$srcdir/t/mk"; # directory with «make -C». $ENV{$_} = rel2abs($ENV{$_}) foreach qw(srcdir DPKG_DATADIR DPKG_ORIGINS_DIR); -# Any paralellization from the parent should be ignored, we are testing +# Any parallelization from the parent should be ignored, we are testing # the makefiles serially anyway. delete $ENV{MAKEFLAGS}; diff --git a/src/archives.c b/src/archives.c index d91a07588..074f9142b 100644 --- a/src/archives.c +++ b/src/archives.c @@ -857,7 +857,7 @@ tarobject(void *ctx, struct tar_entry *ti) } /* Is the package with the conflicting file in the “config files only” - * state? If so it must be a config file and we can silenty take it + * state? If so it must be a config file and we can silently take it * over. */ if (otherpkg->status == PKG_STAT_CONFIGFILES) continue; diff --git a/src/configure.c b/src/configure.c index 9b388d98c..c57292ae7 100644 --- a/src/configure.c +++ b/src/configure.c @@ -117,7 +117,7 @@ show_prompt(const char *cfgfile, const char *realold, const char *realnew, _(" Version in package is the same as at last installation.\n")); } - /* No --force-confdef but a forcible situtation. */ + /* No --force-confdef but a forcible situation. */ /* TODO: check if this condition can not be simplified to * just !fc_conff_def */ if (!(fc_conff_def && (what & (CFOF_INSTALL | CFOF_KEEP)))) { diff --git a/src/main.c b/src/main.c index fb97d6fe4..af9c96f1c 100644 --- a/src/main.c +++ b/src/main.c @@ -773,7 +773,7 @@ execbackend(const char *const *argv) command_add_arg(&cmd, cipaction->arg_ptr); command_add_arg(&cmd, str_fmt("--%s", cipaction->olong)); - /* Exlicitely separate arguments from options as any user-supplied + /* Explicitly separate arguments from options as any user-supplied * separator got stripped by the option parser */ command_add_arg(&cmd, "--"); command_add_argl(&cmd, (const char **)argv); diff --git a/src/t/dpkg_divert.t b/src/t/dpkg_divert.t index df29202ab..71e3b2422 100644 --- a/src/t/dpkg_divert.t +++ b/src/t/dpkg_divert.t @@ -555,7 +555,7 @@ diversions_eq(''); cleanup(); -note('Corrupted divertions db handling'); +note('Corrupted diversions db handling'); SKIP: { skip 'running as root or similar', 3, if (defined($ENV{FAKEROOTKEY}) or $> == 0); diff --git a/src/trigproc.c b/src/trigproc.c index d442e60e1..b9681a273 100644 --- a/src/trigproc.c +++ b/src/trigproc.c @@ -392,7 +392,7 @@ trigproc(struct pkginfo *pkg, enum trigproc_type type) * cycle detections. */ trigproc_reset_cycle(); - /* When doing opportunistic trigger processig, nothing + /* When doing opportunistic trigger processing, nothing * requires us to be able to make progress; skip the * package and silently ignore the error due to * unsatisfiable dependencies. */ |