diff options
39 files changed, 108 insertions, 108 deletions
diff --git a/ChangeLog.old b/ChangeLog.old index ba9d1b371..a20e9acf8 100644 --- a/ChangeLog.old +++ b/ChangeLog.old @@ -297,7 +297,7 @@ 2009-02-06 Raphaël Hertzog <hertzog@debian.org> - * scripts/update-alternatives.pl: Ensure that a non-existant + * scripts/update-alternatives.pl: Ensure that a non-existent alternative result in automatic mode configuration. 2009-02-06 Raphaël Hertzog <hertzog@debian.org> @@ -4901,7 +4901,7 @@ 2007-10-12 Frank Lichtenheld <djpig@debian.org> - * man/dpkg.1 (AUTHORS): Remove some unneccessary markup. + * man/dpkg.1 (AUTHORS): Remove some unnecessary markup. Allows reuse of one more msgid. * man/Makefile.am (update-po): New target to easily @@ -5070,7 +5070,7 @@ * scripts/dpkg-source.pl (handleformat): Include a trailing HT character in the diff labels if - the filename contains spaces. Apparantly this is + the filename contains spaces. Apparently this is standard but undocumented diff behaviour. 2007-09-30 Frank Lichtenheld <djpig@debian.org> @@ -5386,7 +5386,7 @@ maintainer_script_installed depending on the conflictor variable. * src/packages.c (dependencies_ok): Remove comment stating that Breaks needs to be implemented. - * src/depcon.c (depisok): Likewise. Remove return at the beggining + * 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. * src/processarc.c (process_archive): Fix indentation. Split calls @@ -6575,7 +6575,7 @@ * scripts/controllib.pl (usageerr): Do not mark "%s: %s" for translation. * scripts/changelog/debian.pl: Remove "or argument" from the - "unkown option" string to merge it with other similar ones. + "unknown option" string to merge it with other similar ones. * scripts/dpkg-distaddfile.pl: Quote '%s' in the "unknown option" string. * scripts/dpkg-source.pl: Likewise. @@ -7077,7 +7077,7 @@ 2006-04-19 Nicolas Francois <nicolas.francois@centraliens.net> - * man/C/install-info.8: Add a missing quote arround the date. + * man/C/install-info.8: Add a missing quote around the date. * man/C/dpkg-source.1: Add a reference to the Debian Policy Manual for a detailed description of the shlibs format. Thanks to Russ Allbery. @@ -7386,7 +7386,7 @@ and deleted configuration files. Gives and more accurate description to the user and eliminates a warning that was produced when trying to - backup a non-existant file. + backup a non-existent file. * lib/dpkg-db.h (conffile): Add `obsolete' field. * lib/dump.c (w_conffiles): Write "obsolete" at the @@ -7544,7 +7544,7 @@ multiple versions of packages in a single Packages file; use Getopt::Long instead of attempting to parse the command line ourselves and doing it badly; - get rid of unecessary hashes and arrays that aren't used at all; + get rid of unnecessary hashes and arrays that aren't used at all; output help when given the --help/-h/-? options 2006-01-29 maximilian attems <debian@sternwelten.at> @@ -7643,7 +7643,7 @@ of the version in filenames, use (?=[.-]) and (?=\.) instead. \b doesn't work in case the version ends with ~. - * AUTHORS: Updated for new maintainance team + * AUTHORS: Updated for new maintenance team * debian/copyright: Add myself as copyright holder since I also added a note to that effect with my dpkg-shlibdeps patch. @@ -7760,7 +7760,7 @@ * scripts/dpkg-source.pl: If gpg is installed, check the signature of the .dsc file before unpacking. - Allow the unpacking to suceed if the .dsc is unsigned + Allow the unpacking to succeed if the .dsc is unsigned but error out if the signature is bad. If gpg exits with a code >2 (e.g. missing key), show the user the gpg output but continue. @@ -8270,14 +8270,14 @@ name pattern. Document format of file --set-selections takes. * man/C/dpkg-source.1: Remove unnecessary references to policy - and non-existant packaging manual. Refer to dpkg-shlibdeps(1) + and non-existent packaging manual. Refer to dpkg-shlibdeps(1) for shlibs file format. Will need to document changelog format at some point. * man/C/dselect.1: Remove unnecessary reference to policy, refer other reference to the package by name. - * man/C/deb-old.5: Remove reference to non-existant packaging + * man/C/deb-old.5: Remove reference to non-existent packaging manual. - * man/C/deb.5: Remove reference to non-existant packaging + * man/C/deb.5: Remove reference to non-existent packaging manual, will have to document control contents better here later. * man/C/dpkg.1: Fix typo (fileis -> file is). @@ -8388,7 +8388,7 @@ * debian/dpkg.install: Remove md5sum-related files. * debian/copyright: Remove mentions of utils/md5sum.c. * debian/pseudo-tags: Remove md5sum tag; no point filing bugs on - a non-existant program. + a non-existent program. * ostable (netbsd): Restore missing "*" on the end of the regex. @@ -8537,7 +8537,7 @@ (rewrite_gnu): Rewrite along the lines of the code in m4/arch.m4 so they should actually be vaguely consistent now. - * scripts/Makefile.am (do_perl_subst): Replace occurances of + * scripts/Makefile.am (do_perl_subst): Replace occurrences of $pkgdatadir in scripts with the right value. 2005-01-22 Robert Millan <rmh@debian.org> @@ -9809,7 +9809,7 @@ Tue Apr 27 19:47:37 BST 2004 Scott James Remnant <scott@netsplit.com> Tue Apr 27 19:23:01 BST 2004 Scott James Remnant <scott@netsplit.com> - * main/dpkg.8: Correct reference to non-existant --force-reinstreq + * main/dpkg.8: Correct reference to non-existent --force-reinstreq option to --force-remove-reinstreq. Tue Apr 27 19:01:28 BST 2004 Ruben Porras <nahoo82@telefonica.net> @@ -10202,7 +10202,7 @@ Fri Sep 19 12:26:54 CDT 2003 Adam Heath <doogie@debian.org> Some fields may have vars in them, which breaks the validation. * dpkg-gencontrol calls substvars after parsing the control file, and then validates the substituted depends lines. Originally, - substitution occured only during writing of the final output file. + substitution occurred only during writing of the final output file. * Andreas Barth <aba@not.so.argh.org>: Fix bad regex that didn't allow spaces in dependency field parsing. It now directly matches what the c code expects. It previously was @@ -11279,8 +11279,8 @@ Wed Jan 2 16:08:02 CET 2002 Wichert Akkerman <wakkerma@debian.org> Wed Jan 2 15:00:26 CET 2002 Wichert Akkerman <wakkerma@debian.org> - * scripts/dpkg-checkbuilddeps.pl: use space seperated output instead - of comma seperated + * scripts/dpkg-checkbuilddeps.pl: use space separated output instead + of comma separated Tue Jan 1 14:10:55 CET 2002 Wichert Akkerman <wakkerma@debian.org> @@ -12415,7 +12415,7 @@ Fri Apr 20 22:59:39 CEST 2001 Wichert Akkerman <wakkerma@debian.org> Fri Apr 20 14:59:14 CDT 2001 Adam Heath <doogie@debian.org> - * main/main.c: Accidentally commited a debug fprintf stmt in the last ci. + * main/main.c: Accidentally committed a debug fprintf stmt in the last ci. Fri Apr 20 13:42:12 CDT 2001 Adam Heath <doogie@debian.org> @@ -12424,7 +12424,7 @@ Fri Apr 20 13:42:12 CDT 2001 Adam Heath <doogie@debian.org> Fri Apr 20 13:02:23 CDT 2001 Adam Heath <doogie@debian.org> * po/fr.po: Fix typo. - * debian/changelog: Close additional bugs, from other already commited + * debian/changelog: Close additional bugs, from other already committed patches. Thu Apr 19 15:18:05 CEST 2001 Wichert Akkerman <wakkerma@debian.org> @@ -12438,7 +12438,7 @@ Thu Apr 19 13:36:58 CEST 2001 Wichert Akkerman <wakkerma@debian.org> Thu Apr 19 00:14:39 CDT 2001 Adam Heath <doogie@debian.org> - * main/enquiry.c: Errors during dpkg -s(and other similiar commands) are + * main/enquiry.c: Errors during dpkg -s(and other similar commands) are now printed on stderr. Thu Apr 19 00:03:16 CDT 2001 Adam Heath <doogie@debian.org> @@ -12650,7 +12650,7 @@ Sat Feb 3 18:12:18 CET 2001 Wichert Akkerman <wakkerma@debian.org> Fri Feb 2 14:27:47 CET 2001 Wichert Akkerman <wakkerma@debian.org> * scripts/dpkg-statoverride.pl: use -e instead of -f to test - for filesystem object existance + for filesystem object existence * scripts/dpkg-source.pl: swap chdir and open in extracttar to prevent race with source-directory being removed while the sh/grep process is still running. Patch from Colin Watson @@ -13156,7 +13156,7 @@ Mon Dec 4 14:42:01 CET 2000 Wichert Akkerman <wakkerma@debian.org> warning if there is a NEEDED line in the objdump output that we cannot grok. + scripts/update-rc.d.pl: fix typo in regexp for scripts - + debian/rules: remove final occurance of emacs + + debian/rules: remove final occurrence of emacs Mon Dec 4 01:34:57 CET 2000 Wichert Akkerman <wakkerma@debian.org> @@ -13699,7 +13699,7 @@ Tue Feb 15 19:57:45 CET 2000 Wichert Akkerman <wakkerma@debian.org> 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 existance + installed since we provide it, so don't test for its existence * More updates from Marcus Brinkman: + archtable: Change first column format from CPU to CPU-OS. Add entry for i386-gnu. Update comment. @@ -14103,7 +14103,7 @@ Sat Oct 30 03:31:30 CEST 1999 Wichert Akkerman <wakkerma@debian.org> * Make it all build again * retro-actively add this ChangeLog entry * Removed bogus po/dpkg.po file - * No longer translater internal errors.. we want to see the English text + * No longer translate internal errors.. we want to see the English text in bugreports Fri Oct 29 20:16:43 EDT 1999 Ben Collins <bcollins@debian.org> @@ -14158,7 +14158,7 @@ Mon Oct 25 11:55:35 EDT 1999 Ben Collins <bcollins.debian.org> error reporting. Also corrected checks on shlibs.local, which wasn't really being parsed, it now works as advertised. * scripts/{dpkg-gencontrol,dpkg-source,controllib.pl}: fixed references - to old style build dep fields to match current policy ammendment + to old style build dep fields to match current policy amendment Mon Oct 25 17:12:34 CEST 1999 Wichert Akkerman <wakkerma@debian.org> @@ -14235,7 +14235,7 @@ Thu Oct 21 12:57:31 EDT 1999 Ben Collins <bcollins.debian.org> it was already broken when there was no gcc anyway :) * Fixed missing mipseb that was supposed to be in the archtable * Better output in update-alternatives --config, now shows the - current, and the prefered choices. + current, and the preferred choices. * dpkg-name: ignore epoch when getting version * 50dpkg-dev.el: add it as a conffile for dpkg-dev * dpkg-shlibdeps: redirect STDERR to /dev/null for the dpkg fork so we @@ -14338,7 +14338,7 @@ Mon Oct 18 09:25:30 EDT 1999 Ben Collins <bcollins.debian.org> to libtool itself after running configure, much cleaner, and reversible since libtool is a generated file * Use DESTDIR when installing instead of specifying all our - dest dirs seperately in the make line. Also fix some of the + dest dirs separately in the make line. Also fix some of the make files to use DESTDIR when installing files * Regenerated .po files and dpkg.pot. Also added update.sh to the po/ subdir for easier regenerating for cvs only @@ -14805,7 +14805,7 @@ dpkg (1.4.0.24) unstable; urgency=low against libraries it depends on). Code by Richard Braakman <dark@xs4all.nl> and Yann Dirson <dirson@debian.org>. * debian/rules: remove all reference to the packaging manual as it is - now provided by the seperate "packaging-manual" package. [#21581, + now provided by the separate "packaging-manual" package. [#21581, #21186, #22698, #23342] * debian/rules: link dpkg-divert.1.gz to undocumented.7.gz as the lack of a real manpage has been reported in #11093. @@ -14946,7 +14946,7 @@ dpkg (1.4.0.15) experimental; urgency=low * Provide 50dpkg-dev.el for xemacs as well as emacs. * Explicitly provide path for debian-changelog-mode in 50dpkg-dev to use .el file as workaround until xemacs can read emacs19 .elc files. - * Pass top_distdir explicitly to 'make dist' to accomodate bug in + * Pass top_distdir explicitly to 'make dist' to accommodate bug in automake_1.1o-1. * Fix debian/build to make html documentation without including directories in tar archives (fixes #9348). @@ -15127,7 +15127,7 @@ dpkg (1.4.0.3) unstable; urgency=medium dpkg (1.4.0.2) unstable; urgency=medium * dpkg-buildpackage.sh: reverted the quoting change -- (you - should use super, sudo, realy, but not su. Or write a wrapper + 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 more the way Ian likes ;-) @@ -16068,7 +16068,7 @@ dpkg (0.93.73) BETA; priority=LOW * `hold' flag changed to be settable by the user only, and made orthogonal to the `reinstallation required' flag. * dpkg will install by default any packages with priority of - `standard' or better unless they're explictly deselected. + `standard' or better unless they're explicitly deselected. * dselect dependency/conflict resolution will suggest marking absent packages for `purge' rather than `deinstall'. @@ -165,7 +165,7 @@ other stuff unlikely to get done soon * understand Replaces in dselect * diversions list as control archive entry * single maintainer script, and new package getting there first - * local conffiles, aswell as local files that dpkg should check before + * local conffiles, as well as local files that dpkg should check before overwriting * hooks * dselect per-half focus and keybindings improvements. diff --git a/debian/changelog b/debian/changelog index 8a84638f4..9aed1a7e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -284,7 +284,7 @@ dpkg (1.16.0) unstable; urgency=low works at all. Thanks to Ivan Gagis <igagis@gmail.com>. LP: #728708 * Add armhf support to ostable and triplettable. Closes: #594179 * Set the modification time for unpacked symlinks on supported systems. - * Fix undefined value useage in dpkg-genchanges when adding files w/o a + * Fix undefined value usage in dpkg-genchanges when adding files w/o a matching architecture, because they are not present in debian/control, this is most commonly the case due to dpkg-distaddfile. * Terminate immediately on dpkg-divert rename errors instead of propagating @@ -301,7 +301,7 @@ dpkg (1.16.0) unstable; urgency=low - it documents the VCS-* fields too. Closes: #483119 Thanks to Oxan van Leeuwen <oxan@oxanvanleeuwen.nl> who wrote it as part of the Google Code In program. - * Enhance dpkg-shlibdeps to not fail immediatly when a library is not found. + * Enhance dpkg-shlibdeps to not fail immediately when a library is not found. Instead continue and fail after all problems have been reported. Thanks to Chris Baines <cbaines8@gmail.com> for the patch. Closes: #596841 * Fix dpkg-source to not list Debian packaging files as modified @@ -3869,7 +3869,7 @@ dpkg (1.13.17) unstable; urgency=low attributes and other embellishments. * Add dpkg-query(1) in the SEE ALSO section in dpkg(1). Closes: #354643 * Don't try to compile in SELinux support on GNU/kFreeBSD amd64. - * Add new quiet option to dpkg-source to supress warnings. Closes: #355065 + * Add new quiet option to dpkg-source to suppress warnings. Closes: #355065 * Do not expand architecture aliases anymore in .dsc files. * Change start-stop-daemon's --exec behaviour again on GNU/Linux to compare the referred file pointed by the '/proc/<pid>/exe' symlink, stripping @@ -4281,7 +4281,7 @@ dpkg (1.13.9) unstable; urgency=low SELinux support (Manoj Srivastava): * On SELinux-enabled systems, try to set the security context when the package is unpacked. Closes: #193653, #249496, #307139. - * Added build-dependancy on libselinux1-dev. + * Added build-dependency on libselinux1-dev. Improvements to dpkg-source (Brendan O'Dea): * Support unpacking of "Wig And Pen" (Format 2.0) source packages. @@ -4680,7 +4680,7 @@ dpkg (1.10.22) unstable; urgency=low Closes: #120562. - Add --force-bad-verify to dpkg manpage. Closes: #192812. - Correct dpkg manpage to refer to --force-remove-reinstreq instead of - -non-existant --force-reinstreq option. Closes: #232831. + non-existent --force-reinstreq option. Closes: #232831. - Correct documentation of --compare-versions arguments. Closes: #232317. - Correct usage of "et al" to "et al.". Closes: #230751. - Add dpkg-reconfigure(8) to SEE ALSO section of dpkg(8). Closes: #233282. @@ -4750,7 +4750,7 @@ dpkg (1.10.21) unstable; urgency=low * Add --dir-file option to install-info for GNU install-info compatibility. Closes: #179192 * Refer to debian-policy in dpkg-doc's description instead of the - non-existant packaging-manual. Closes: #120970. + non-existent packaging-manual. Closes: #120970. * Remove incorrect mention of build-essential from dpkg-checkbuilddeps manpage. Closes: #219210. * Add a note about diverting shared libraries to the dpkg-divert @@ -4923,7 +4923,7 @@ dpkg (1.10.14) unstable; urgency=low Some fields may have vars in them, which breaks the validation. * dpkg-gencontrol calls substvars after parsing the control file, and then validates the substituted depends lines. Originally, - substitution occured only during writing of the final output file. + substitution occurred only during writing of the final output file. * Andreas Barth <aba@not.so.argh.org>: Fix bad regex that didn't allow spaces in dependency field parsing. It now directly matches what the c code expects. It previously was @@ -5269,7 +5269,7 @@ dpkg (1.10) unstable; urgency=low * dselect now accepts regular expressions when searching for packages and can search in package descriptions as well. Closes: Bug#81009,#83139 - * Move query commands into a seperate dpkg-query command. For the old options + * Move query commands into a separate dpkg-query command. For the old options (-L,-l,-s,-S) dpkg will still call it for you. * Add configurable package listing support to dpkg-query * Handle window resize in dselect main menu. Closes: Bug#98275 @@ -5299,7 +5299,7 @@ dpkg (1.10) unstable; urgency=low Closes: #120924. * Make dpkg-checkbuilddeps always check for build-essential. Closes: Bug#118420. - * Use space seperated output instead of comma seperated in + * Use space separated output instead of comma separated in dpkg-checkbuilddeps * Update default ignore expression in dpkg-source to also match *~ and *.swp in subdirs. Closes: Bug#127458 @@ -5436,7 +5436,7 @@ dpkg (1.9.13) unstable; urgency=medium * Add a -W option to dpkg-source(and the other utils, where it is just passed thru), to turn certain errors into warnings(of which, only - one is changed, namely, the 'tar doesn't contain preceeding directory' + one is changed, namely, the 'tar doesn't contain preceding directory' error). Closes: #101813, and partially 101845. * Don't error out if the files in the tar have leading './', for dpkg-source. (another partial close of 101845). @@ -5677,7 +5677,7 @@ dpkg (1.9.0) unstable; urgency=low segfaults people have been seeing in dpkg. Closes: Bug#90328. * Apply patch from bug#86847, that escapes intl chars in filenames. Closes: Bug#83752, #85040, #86847, #89000. - * Errors during dpkg -s(and other similiar commands) are now printed + * Errors during dpkg -s(and other similar commands) are now printed on stderr. Closes: Bug#88987. * Add a --retry option to start-stop-daemon. Closes: Bug#75139 * Fix regeps to extract Closes magic from a changelog so the # @@ -6058,7 +6058,7 @@ dpkg (1.4.1.19) unstable; urgency=low it was already broken when there was no gcc anyway :) * Fixed missing mipseb that was supposed to be in the archtable * Better output in update-alternatives --config, now shows the - current, and the prefered choices. + current, and the preferred choices. * dpkg-name: ignore epoch when getting version * 50dpkg-dev.el: add it as a conffile for dpkg-dev * internals.sgml: Removed references to the versions of build tools, @@ -6521,7 +6521,7 @@ dpkg (1.4.0.24) unstable; urgency=low against libraries it depends on). Code by Richard Braakman <dark@xs4all.nl> and Yann Dirson <dirson@debian.org>. * debian/rules: remove all reference to the packaging manual as it is - now provided by the seperate "packaging-manual" package. [#21581, + now provided by the separate "packaging-manual" package. [#21581, #21186, #22698, #23342] * debian/rules: link dpkg-divert.1.gz to undocumented.7.gz as the lack of a real manpage has been reported in #11093. @@ -6662,7 +6662,7 @@ dpkg (1.4.0.15) experimental; urgency=low * Provide 50dpkg-dev.el for xemacs as well as emacs. * Explicitly provide path for debian-changelog-mode in 50dpkg-dev to use .el file as workaround until xemacs can read emacs19 .elc files. - * Pass top_distdir explicitly to 'make dist' to accomodate bug in + * Pass top_distdir explicitly to 'make dist' to accommodate bug in automake_1.1o-1. * Fix debian/build to make html documentation without including directories in tar archives (fixes #9348). @@ -6843,7 +6843,7 @@ dpkg (1.4.0.3) unstable; urgency=medium dpkg (1.4.0.2) unstable; urgency=medium * dpkg-buildpackage.sh: reverted the quoting change -- (you - should use super, sudo, realy, but not su. Or write a wrapper + 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 more the way Ian likes ;-) @@ -7784,7 +7784,7 @@ dpkg (0.93.73) BETA; priority=LOW * `hold' flag changed to be settable by the user only, and made orthogonal to the `reinstallation required' flag. * dpkg will install by default any packages with priority of - `standard' or better unless they're explictly deselected. + `standard' or better unless they're explicitly deselected. * dselect dependency/conflict resolution will suggest marking absent packages for `purge' rather than `deinstall'. diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 27be8415f..7a144d7d1 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -282,7 +282,7 @@ TYPEDEF_HIDES_STRUCT = NO # causing a significant performance penality. # If the system has enough physical memory increasing the cache will improve the # performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the +# a logarithmic scale so increasing the size by one will roughly double the # memory usage. The cache size is given by this formula: # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, # corresponding to a cache size of 2^16 = 65536 symbols diff --git a/doc/README.feature-removal-schedule b/doc/README.feature-removal-schedule index 2ce6506a2..a085ac95a 100644 --- a/doc/README.feature-removal-schedule +++ b/doc/README.feature-removal-schedule @@ -7,7 +7,7 @@ Warning: program and lintian (missing-debian-source-format) Why: With the support of multiple source formats, the user should be explicit about the desired source format. The fallback to "1.0" is there only for - backwards compatiblity but will be removed once all packages have the + backwards compatibility but will be removed once all packages have the debian/source/format file. This is unlikely to happen before 1.17.x. What: Source-Version (substvar) diff --git a/doc/coding-style.txt b/doc/coding-style.txt index ca360fa1f..edc5a2500 100644 --- a/doc/coding-style.txt +++ b/doc/coding-style.txt @@ -64,7 +64,7 @@ function(void *ptr, int value) "extra-string"); } -When wrapping, logical operators should be kept on the preceeding line: +When wrapping, logical operators should be kept on the preceding line: if (really_long_variable_to_be_checked_against_a && really_long_variable_to_be_checked_against_b) diff --git a/doc/triggers.txt b/doc/triggers.txt index 75579fa80..2d891ff54 100644 --- a/doc/triggers.txt +++ b/doc/triggers.txt @@ -126,7 +126,7 @@ reasonable states by default. If the `postinst triggered' run fails the package goes to `config-failed', so that the trigger processing will not be attempted -again until explictly requested. +again until explicitly requested. | @@ -175,7 +175,7 @@ that T may automatically go from `triggers-awaited' to `installed'. Or to put it another way, triggered actions are considered irrelevant if the interested package I is not configured. When I's postinst is called with `configure', it must do whatever actions are necessary to -deal with any trigger activations which might have occured while it +deal with any trigger activations which might have occurred while it was not configured, just as if the package was being configured for the first time. @@ -264,7 +264,7 @@ dpkg during package unpack or removal. The pathname must be absolute. File triggers should not generally be used without mutual consent. The use of a file trigger, and the name of the trigger used, should be stated in policy, so that a package which creates a relevant file in a -maintainer script can activate the trigger explictly. +maintainer script can activate the trigger explicitly. File triggers must definitely not be used as an escalation tool in disagreements between different packages as to the desired contents of diff --git a/dselect/methods/ftp/install b/dselect/methods/ftp/install index bcba43c8b..faa113a0c 100755 --- a/dselect/methods/ftp/install +++ b/dselect/methods/ftp/install @@ -431,7 +431,7 @@ if($totsize != 0) { last DOWNLOAD_TRY; } } elsif ($@) { - print "An error occured ($@) : stopping download\n"; + print "An error occurred ($@) : stopping download\n"; } last DOWNLOAD_TRY; } diff --git a/dselect/po/it.po b/dselect/po/it.po index 7b7d5520a..156b8c483 100644 --- a/dselect/po/it.po +++ b/dselect/po/it.po @@ -2,7 +2,7 @@ # Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. # Lele Gaifax <lele@seldati.it>, 2000, 2001, 2002, 2003, 2004. # -# Stefano Canepa <sc@linux.it>, 2004 only for an update becouse Lele was +# Stefano Canepa <sc@linux.it>, 2004 only for an update because Lele was # unreachable and translation needed to be updated # # Stefano Canepa <sc@linux.it>, 2005. diff --git a/lib/dpkg/file.c b/lib/dpkg/file.c index 84dd1a6b1..273f4a1b7 100644 --- a/lib/dpkg/file.c +++ b/lib/dpkg/file.c @@ -121,7 +121,7 @@ file_is_locked(int lockfd, const char *filename) * * @param lockfd The pointer to the lock file descriptor. It must be allocated * statically as its addresses is passed to a cleanup handler. - * @param flags The lock flags specifiying what type of locking to perform. + * @param flags The lock flags specifying what type of locking to perform. * @param filename The name of the file to lock. * @param desc The description of the file to lock. */ diff --git a/lib/dpkg/progname.c b/lib/dpkg/progname.c index 0d4ef37b9..38ec71ea3 100644 --- a/lib/dpkg/progname.c +++ b/lib/dpkg/progname.c @@ -57,7 +57,7 @@ extern const char *__progname; * Get the program name. * * The program name might have been set previously by dpkg_set_progname(), - * but if not this function will try to initialize it by system dependant + * but if not this function will try to initialize it by system dependent * means, so it's half safe to not call dpkg_set_progname() at all. At worst * the function might return NULL in that case. * diff --git a/man/dpkg-source.1 b/man/dpkg-source.1 index c54d095d7..d33930307 100644 --- a/man/dpkg-source.1 +++ b/man/dpkg-source.1 @@ -566,7 +566,7 @@ format but can be used to create source packages with arbitrary files. .B Build options .PP All non-option arguments are taken as files to integrate in the -generated source package. They must exist and are preferrably +generated source package. They must exist and are preferably in the current directory. At least one file must be given. .TP .BI \-\-target\-format= value diff --git a/man/po/de.po b/man/po/de.po index ee5899406..8c6dea094 100644 --- a/man/po/de.po +++ b/man/po/de.po @@ -14288,7 +14288,7 @@ msgstr "" #: dpkg-source.1:571 msgid "" "All non-option arguments are taken as files to integrate in the generated " -"source package. They must exist and are preferrably in the current " +"source package. They must exist and are preferably in the current " "directory. At least one file must be given." msgstr "" "Alle Argumente, die keine Optionen sind, werden als Dateien verstanden, die " diff --git a/man/po/dpkg-man.pot b/man/po/dpkg-man.pot index 259401518..48adea11b 100644 --- a/man/po/dpkg-man.pot +++ b/man/po/dpkg-man.pot @@ -11113,7 +11113,7 @@ msgstr "" #: dpkg-source.1:571 msgid "" "All non-option arguments are taken as files to integrate in the generated " -"source package. They must exist and are preferrably in the current " +"source package. They must exist and are preferably in the current " "directory. At least one file must be given." msgstr "" diff --git a/man/po/es.po b/man/po/es.po index 1f0778f68..a925fa163 100644 --- a/man/po/es.po +++ b/man/po/es.po @@ -14732,7 +14732,7 @@ msgstr "" #: dpkg-source.1:571 msgid "" "All non-option arguments are taken as files to integrate in the generated " -"source package. They must exist and are preferrably in the current " +"source package. They must exist and are preferably in the current " "directory. At least one file must be given." msgstr "" "Todos los argumentos que no son opciones se toman como ficheros a integrar " diff --git a/man/po/fr.po b/man/po/fr.po index 93e60c13c..bebc969d1 100644 --- a/man/po/fr.po +++ b/man/po/fr.po @@ -14775,7 +14775,7 @@ msgstr "" #: dpkg-source.1:571 msgid "" "All non-option arguments are taken as files to integrate in the generated " -"source package. They must exist and are preferrably in the current " +"source package. They must exist and are preferably in the current " "directory. At least one file must be given." msgstr "" "Tous les arguments qui ne sont pas des options sont pris pour des fichiers à " diff --git a/man/po/hu.po b/man/po/hu.po index 76b106637..4ce191669 100644 --- a/man/po/hu.po +++ b/man/po/hu.po @@ -11645,7 +11645,7 @@ msgstr "" #: dpkg-source.1:571 msgid "" "All non-option arguments are taken as files to integrate in the generated " -"source package. They must exist and are preferrably in the current " +"source package. They must exist and are preferably in the current " "directory. At least one file must be given." msgstr "" diff --git a/man/po/ja.po b/man/po/ja.po index e654f90c8..92a2dab46 100644 --- a/man/po/ja.po +++ b/man/po/ja.po @@ -12426,7 +12426,7 @@ msgstr "" #: dpkg-source.1:571 msgid "" "All non-option arguments are taken as files to integrate in the generated " -"source package. They must exist and are preferrably in the current " +"source package. They must exist and are preferably in the current " "directory. At least one file must be given." msgstr "" diff --git a/man/po/pl.po b/man/po/pl.po index 0424ffa21..5aebe4603 100644 --- a/man/po/pl.po +++ b/man/po/pl.po @@ -14312,7 +14312,7 @@ msgstr "" #: dpkg-source.1:571 msgid "" "All non-option arguments are taken as files to integrate in the generated " -"source package. They must exist and are preferrably in the current " +"source package. They must exist and are preferably in the current " "directory. At least one file must be given." msgstr "" "Wszystkie argumenty nie będące opcjami są uważane za pliki, które mają być " diff --git a/man/po/pt_BR.po b/man/po/pt_BR.po index d66ff281a..ce6280feb 100644 --- a/man/po/pt_BR.po +++ b/man/po/pt_BR.po @@ -11680,7 +11680,7 @@ msgstr "" #: dpkg-source.1:571 msgid "" "All non-option arguments are taken as files to integrate in the generated " -"source package. They must exist and are preferrably in the current " +"source package. They must exist and are preferably in the current " "directory. At least one file must be given." msgstr "" diff --git a/man/po/ru.po b/man/po/ru.po index 332fecce8..1ad26e5fa 100644 --- a/man/po/ru.po +++ b/man/po/ru.po @@ -11951,7 +11951,7 @@ msgstr "" #: dpkg-source.1:571 msgid "" "All non-option arguments are taken as files to integrate in the generated " -"source package. They must exist and are preferrably in the current " +"source package. They must exist and are preferably in the current " "directory. At least one file must be given." msgstr "" diff --git a/man/po/sv.po b/man/po/sv.po index 7f77d2b6b..5fd144672 100644 --- a/man/po/sv.po +++ b/man/po/sv.po @@ -14365,7 +14365,7 @@ msgstr "" #: dpkg-source.1:571 msgid "" "All non-option arguments are taken as files to integrate in the generated " -"source package. They must exist and are preferrably in the current " +"source package. They must exist and are preferably in the current " "directory. At least one file must be given." msgstr "" "Alla argument som inte är flaggor tas som filer som skall integreras i det " diff --git a/po/ChangeLog.old b/po/ChangeLog.old index fa8784eda..b3664f8ea 100644 --- a/po/ChangeLog.old +++ b/po/ChangeLog.old @@ -1152,7 +1152,7 @@ * ro.po: Fixed some consitency issues; "conffiles" is no longer translated; - doublechecked for existance of writings without diacritics; + doublechecked for existence of writings without diacritics; translation still at 742t. 2006-05-15 Peter Karlsson <peterk@debian.org> @@ -1715,7 +1715,7 @@ 2005-01-11 Scott James Remnant <scott@netsplit.com> * LINGUAS: Rather than just listing the language codes on one - line, put each on its own line with a preceeding comment giving + line, put each on its own line with a preceding comment giving the English name for the language, the current translator's name in their preferred form and a contact e-mail address. diff --git a/scripts/Dpkg/Changelog.pm b/scripts/Dpkg/Changelog.pm index 4303618df..42f877d42 100644 --- a/scripts/Dpkg/Changelog.pm +++ b/scripts/Dpkg/Changelog.pm @@ -97,7 +97,7 @@ sub set_options { =item $c->reset_parse_errors() -Can be used to delete all information about errors ocurred during +Can be used to delete all information about errors occurred during previous L<parse> runs. =cut diff --git a/scripts/changelog/debian.pl b/scripts/changelog/debian.pl index 128e61cb6..c5fe37de2 100755 --- a/scripts/changelog/debian.pl +++ b/scripts/changelog/debian.pl @@ -133,10 +133,10 @@ my $changes = Dpkg::Changelog::Debian->new(reportfile => $label, range => $range if ($file eq '-') { $changes->parse(\*STDIN, _g("<standard input>")) - or error(_g('fatal error occured while parsing input')); + or error(_g('fatal error occurred while parsing input')); } else { $changes->load($file) - or error(_g('fatal error occured while parsing %s'), $file); + or error(_g('fatal error occurred while parsing %s'), $file); } eval qq{ diff --git a/scripts/po/ca.po b/scripts/po/ca.po index 90587d952..45924c541 100644 --- a/scripts/po/ca.po +++ b/scripts/po/ca.po @@ -1722,12 +1722,12 @@ msgid "<standard input>" msgstr "<entrada estàndard>" #: scripts/changelog/debian.pl:136 -msgid "fatal error occured while parsing input" +msgid "fatal error occurred while parsing input" msgstr "s'ha produït un error fatal en analitzar l'entrada" #: scripts/changelog/debian.pl:139 #, perl-format -msgid "fatal error occured while parsing %s" +msgid "fatal error occurred while parsing %s" msgstr "s'ha produït un error fatal en analitzar %s" #: scripts/Dpkg/Arch.pm:86 diff --git a/scripts/po/de.po b/scripts/po/de.po index 02e4a85e2..8a5c35fc9 100644 --- a/scripts/po/de.po +++ b/scripts/po/de.po @@ -2110,12 +2110,12 @@ msgid "<standard input>" msgstr "<Standardeingabe>" #: scripts/changelog/debian.pl:136 -msgid "fatal error occured while parsing input" +msgid "fatal error occurred while parsing input" msgstr "Fataler Fehler beim Auswerten der Eingabe" #: scripts/changelog/debian.pl:139 #, perl-format -msgid "fatal error occured while parsing %s" +msgid "fatal error occurred while parsing %s" msgstr "Fataler Fehler beim Auswerten von %s" #: scripts/Dpkg/Arch.pm:86 diff --git a/scripts/po/dpkg-dev.pot b/scripts/po/dpkg-dev.pot index fa467b450..d38c06571 100644 --- a/scripts/po/dpkg-dev.pot +++ b/scripts/po/dpkg-dev.pot @@ -1637,12 +1637,12 @@ msgid "<standard input>" msgstr "" #: scripts/changelog/debian.pl:136 -msgid "fatal error occured while parsing input" +msgid "fatal error occurred while parsing input" msgstr "" #: scripts/changelog/debian.pl:139 #, perl-format -msgid "fatal error occured while parsing %s" +msgid "fatal error occurred while parsing %s" msgstr "" #: scripts/Dpkg/Arch.pm:86 diff --git a/scripts/po/es.po b/scripts/po/es.po index 122160add..5c05e7906 100644 --- a/scripts/po/es.po +++ b/scripts/po/es.po @@ -2265,12 +2265,12 @@ msgid "<standard input>" msgstr "<entrada estándar>" #: scripts/changelog/debian.pl:136 -msgid "fatal error occured while parsing input" +msgid "fatal error occurred while parsing input" msgstr "se ha detectado un error fatal al analizar la entrada" #: scripts/changelog/debian.pl:139 #, perl-format -msgid "fatal error occured while parsing %s" +msgid "fatal error occurred while parsing %s" msgstr "se ha detectado un error fatal al analizar %s" #: scripts/Dpkg/Arch.pm:86 diff --git a/scripts/po/fr.po b/scripts/po/fr.po index d9bc20492..5903b9f71 100644 --- a/scripts/po/fr.po +++ b/scripts/po/fr.po @@ -2229,12 +2229,12 @@ msgid "<standard input>" msgstr "<entrée standard>" #: scripts/changelog/debian.pl:136 -msgid "fatal error occured while parsing input" +msgid "fatal error occurred while parsing input" msgstr "erreur fatale rencontrée lors de l'analyse des données" #: scripts/changelog/debian.pl:139 #, perl-format -msgid "fatal error occured while parsing %s" +msgid "fatal error occurred while parsing %s" msgstr "erreur fatale rencontrée lors de l'analyse de %s" #: scripts/Dpkg/Arch.pm:86 diff --git a/scripts/po/pl.po b/scripts/po/pl.po index abe85f4b6..40f1ced69 100644 --- a/scripts/po/pl.po +++ b/scripts/po/pl.po @@ -2097,12 +2097,12 @@ msgid "<standard input>" msgstr "standardowe wejście" #: scripts/changelog/debian.pl:136 -msgid "fatal error occured while parsing input" +msgid "fatal error occurred while parsing input" msgstr "wystąpił fatalny błąd podczas przetwarzania wejścia" #: scripts/changelog/debian.pl:139 #, perl-format -msgid "fatal error occured while parsing %s" +msgid "fatal error occurred while parsing %s" msgstr "wystąpił fatalny błąd podczas przetwarzania %s" #: scripts/Dpkg/Arch.pm:86 diff --git a/scripts/po/ru.po b/scripts/po/ru.po index 1210c002d..58489dcf8 100644 --- a/scripts/po/ru.po +++ b/scripts/po/ru.po @@ -2149,12 +2149,12 @@ msgid "<standard input>" msgstr "<стандартный ввод>" #: scripts/changelog/debian.pl:136 -msgid "fatal error occured while parsing input" +msgid "fatal error occurred while parsing input" msgstr "неустранимая ошибка при анализе входных данных" #: scripts/changelog/debian.pl:139 #, perl-format -msgid "fatal error occured while parsing %s" +msgid "fatal error occurred while parsing %s" msgstr "неустранимая ошибка при анализе %s" #: scripts/Dpkg/Arch.pm:86 diff --git a/scripts/po/sv.po b/scripts/po/sv.po index 209f230db..5c4481c00 100644 --- a/scripts/po/sv.po +++ b/scripts/po/sv.po @@ -2087,12 +2087,12 @@ msgid "<standard input>" msgstr "<standard in>" #: scripts/changelog/debian.pl:136 -msgid "fatal error occured while parsing input" +msgid "fatal error occurred while parsing input" msgstr "ödesdigert fel vid tolkning av indata" #: scripts/changelog/debian.pl:139 #, perl-format -msgid "fatal error occured while parsing %s" +msgid "fatal error occurred while parsing %s" msgstr "ödesdigert fel vid tolkning av %s" #: scripts/Dpkg/Arch.pm:86 diff --git a/scripts/t/190_Dpkg_Shlibs_Cppfilt.t b/scripts/t/190_Dpkg_Shlibs_Cppfilt.t index f7559a370..c8fa6f116 100644 --- a/scripts/t/190_Dpkg_Shlibs_Cppfilt.t +++ b/scripts/t/190_Dpkg_Shlibs_Cppfilt.t @@ -34,7 +34,7 @@ is ( cppfilt_demangle_cpp('FoobarInvalidSymbol'), undef, 'non-demanglable string' ); # Mass C++ demangling. Checking if c++filt does not hang and cppfilt_demangle() -# immediatelly provides a correct answer to the caller (i.e. no buffering). +# immediately provides a correct answer to the caller (i.e. no buffering). my @mangledtext = split(/\n+/s, <<'END'); 0000000000000000 DF *UND* 0000000000000000 GCC_3.0 _Unwind_SetIP 0000000000000000 DF *UND* 0000000000000000 GLIBC_2.2.5 __towlower_l diff --git a/scripts/t/200_Dpkg_Shlibs.t b/scripts/t/200_Dpkg_Shlibs.t index 696627a80..cb8272395 100644 --- a/scripts/t/200_Dpkg_Shlibs.t +++ b/scripts/t/200_Dpkg_Shlibs.t @@ -430,7 +430,7 @@ $sym = $sym_file->lookup_symbol('SYMVER_1@SYMVER_1','libpatterns.so.1'); is ( $sym->{minver}, '1', "specific SYMVER_1 symbol" ); $sym = $sym_file->lookup_symbol('_ZN3NSB6Symver14symver_method1Ev@SYMVER_1', 'libpatterns.so.1'); -is ( $sym->{minver}, '1.method1', "specific symbol prefered over pattern" ); +is ( $sym->{minver}, '1.method1', "specific symbol preferred over pattern" ); $sym = $sym_file->lookup_symbol('_ZN3NSB6Symver14symver_method2Ev@SYMVER_1', 'libpatterns.so.1'); is ( $sym->{minver}, '1.method2', "c++ alias pattern preferred over generic pattern" ); diff --git a/scripts/t/600_Dpkg_Changelog/shadow b/scripts/t/600_Dpkg_Changelog/shadow index 8863a508b..f212bc6db 100644 --- a/scripts/t/600_Dpkg_Changelog/shadow +++ b/scripts/t/600_Dpkg_Changelog/shadow @@ -1058,7 +1058,7 @@ shadow (20000902-11) unstable; urgency=low shadow (20000902-10) unstable; urgency=low * We hates the automake. We hates it forever. closes: #139293 - * stupid ommision: logoutd still in postinst. closes: #139422 + * stupid omission: logoutd still in postinst. closes: #139422 * make login.defs a bit clearer. closes: #138809 -- Karl Ramm <kcr@debian.org> Fri, 22 Mar 2002 12:09:07 -0500 @@ -1382,7 +1382,7 @@ shadow (19990827-9) unstable; urgency=low shadow (19990827-8) unstable; urgency=low - * src/login.c: fixed loggin of username on succesful login (was using + * src/login.c: fixed loggin 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, @@ -1400,11 +1400,11 @@ shadow (19990827-7) unstable; urgency=low * {passwd,login}.pam.d: added blurb about how to use the pam_cracklib module, and also changed it to use pam_unix and not pam_pwdb (gah! how did that happen?), closes: #46983 - * README.debian: changes to reflect new PAM usage aswell as removing + * README.debian: changes to reflect new PAM usage as well as removing references to obsolete config files, closes: #46595 * passwd.expire.cron: example script that informs users by email when their accounts are about to expire, closes: #41393 - * lastlogin.c: added -h option and usage aswell as long option support, + * lastlogin.c: added -h option and usage as well as long option support, closes: #45804 * shadow now only has 3 wishlist bugs and nothing else @@ -1413,7 +1413,7 @@ shadow (19990827-7) unstable; urgency=low shadow (19990827-6) unstable; urgency=low * debian/shells: new file, needed to include /bin/sash, closes: #45826 - * useradd.8,groupadd.8: added note about the prefered use of adduser + * useradd.8,groupadd.8: added note about the preferred use of adduser and addgroup when conforming to Debian policy (taken from notes in adduser's man pages), closes: #22821 * dialups.5: new man page that documents /etc/{dialups,d_passwd}, @@ -1434,7 +1434,7 @@ shadow (19990827-5) unstable; urgency=low * {login,su}.1: added description of a subsystem login, closes: #31987 * src/chowndir.c: fixed recursive chown's on usermod, also changed it to use lchown and lstat since we actually want that, closes: #46405 - * su.1: removed reference to suauth aswell as added "-c" to the SYNOPSIS, + * su.1: removed reference to suauth as well as added "-c" to the SYNOPSIS, closes: #45685 * login.1: added options to the SYNOPSIS and documented OPTIONS, closes: #28763 @@ -1463,7 +1463,7 @@ shadow (19990827-4) unstable; urgency=low check passwords when the user is trying to get back to their default group, closes: #22244 * Closed some other bugs that were either not really bugs, or they weren't - reproducable. + reproducible. * debian/login.pam.d: moved around the pam_motd and pam_mail modules to order them the same as old login would have done @@ -1559,12 +1559,12 @@ shadow (19990827-1) unstable; urgency=low - More "Fixed" bugs getting closed...CLOSED AT LAST, closes: #17593 closes: #20057, #12689 * Switched to a new build setup (dbs) - * Split makes into seperate files to make it a little cleaner + * Split makes into separate files to make it a little cleaner * FHS compliance changes (usr/{doc,man} to usr/share/{doc,man}) * debian/tar.c: removed * su: su is now going to be provided by shadow's login package and removed from shellutils (the shellutils maintainer agreed to this) - in preperation for future PAM support. Added conflicts with older + in preparation for future PAM support. Added conflicts with older version of shellutils that does provide the su binary. * debian/control.in: removed the secure-su package since login now contains su and all of it's components @@ -1575,7 +1575,7 @@ shadow (19990827-1) unstable; urgency=low * Enabled PAM. Support now for su, passwd, chfn, chsh. I am working on the support in login. * expiry: Changed to be installed as sgid shadow instead of suid root - since it doesn't need root priviledges. Also added man page expiry(1) based + since it doesn't need root privileges. Also added man page expiry(1) based on the comments found in expiry.c. * Removed bashism's in control scripts. Now lintian clean (smells fresh too) * chage.c: Keep chage from locking when not running as root, since it just diff --git a/src/filesdb.h b/src/filesdb.h index e85bb75da..30dae880e 100644 --- a/src/filesdb.h +++ b/src/filesdb.h @@ -40,7 +40,7 @@ * When we read files contained info about a particular package we set the * ‘files’ member of the clientdata struct to the appropriate thing. When * not yet set the files pointer is made to point to ‘fileslist_uninited’ - * (this is available only internally, withing filesdb.c - the published + * (this is available only internally, within filesdb.c - the published * interface is ensure_*_available). */ diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c index d50e0e0a5..46295c0c1 100644 --- a/utils/start-stop-daemon.c +++ b/utils/start-stop-daemon.c @@ -12,7 +12,7 @@ * Domain. * * Changes by Ben Collins <bcollins@debian.org>, added --chuid, --background - * and --make-pidfile options, placed in public domain aswell. + * and --make-pidfile options, placed in public domain as well. * * Port to OpenBSD by Sontri Tomo Huynh <huynh.29@osu.edu> * and Andreas Schuldei <andreas@schuldei.org> @@ -1166,7 +1166,7 @@ pid_is_cmd(pid_t pid, const char *name) end_argv_0_p = strchr(*pid_argv_p, ' '); if (end_argv_0_p == NULL) /* There seems to be no space, so we have the command - * allready in its desired form. */ + * already in its desired form. */ start_argv_0_p = *pid_argv_p; else { /* Tests indicate that this never happens, since diff --git a/utils/t/100_update_alternatives.t b/utils/t/100_update_alternatives.t index 135188d0f..c5c4b0a05 100644 --- a/utils/t/100_update_alternatives.t +++ b/utils/t/100_update_alternatives.t @@ -426,7 +426,7 @@ my $old_path = $choices[0]{"slaves"}[0]{"path"}; $old_slave = $choices[0]{"slaves"}[0]{"link"}; $choices[0]{"slaves"}[0]{"path"} = "$bindir/doesntexist"; $choices[0]{"slaves"}[0]{"link"} = "$bindir/baddir/slave2"; -# test rename of slave link that existed but that doesnt anymore +# test rename of slave link that existed but that doesn't anymore # and link is moved into non-existing dir at the same time install_choice(0); check_choice(0, "auto", "optional renamed slave2 in non-existing dir"); |