[Reproducible-commits] [dpkg] 18/90: doc: Fix multiple typos
Jérémy Bobbio
lunar at moszumanska.debian.org
Sat Aug 29 18:26:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
lunar pushed a commit to branch pu/reproducible_builds
in repository dpkg.
commit e2e40913fad1eb5d3155e1f93d75991ab933b73c
Author: Guillem Jover <guillem at debian.org>
Date: Tue Jul 28 05:57:29 2015 +0200
doc: Fix multiple typos
Warned-by: spellintian
---
ChangeLog.old | 24 ++++++++++++------------
TODO | 4 ++--
debian/changelog | 18 +++++++++---------
dselect/po/zh_TW.po | 4 ++--
scripts/Dpkg/Source/Package/V2.pm | 2 +-
scripts/dpkg-shlibdeps.pl | 2 +-
6 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/ChangeLog.old b/ChangeLog.old
index 03f517f..91c5f42 100644
--- a/ChangeLog.old
+++ b/ChangeLog.old
@@ -2074,14 +2074,14 @@
2008-08-15 Guillem Jover <guillem at debian.org>
* lib/dbmodify.c (modstatdb_note): Do not call modstatdb_note_core if
- cstatus does not allow writting. Move the core functionallity to ...
+ cstatus does not allow writing. Move the core functionality to ...
(modstatdb_note_core): ... here. New function.
* src/help.c (post_postinst_tasks_core): Do not call trig_incorporate
if running under --no-act.
* src/trigproc.c (trigproc): Do not call maintainer_script_postinst
if running under --no-act.
(trig_transitional_activate): Do not call trig_file_interests_save
- if cstatus does not allow writting.
+ if cstatus does not allow writing.
2008-08-15 Guillem Jover <guillem at debian.org>
@@ -2672,7 +2672,7 @@
(dependencies_ok): Handle packages which can be fixed by means of
processing their triggers.
* src/processarc.c (process_archive): Ensure file triggers intersts.
- Activate trigger package processsing. Parse package triggers control
+ 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
being deconfigured and for conflictors. Parse package control file
@@ -3760,7 +3760,7 @@
IO::String.
* scripts/Dpkg/Changelog/Debian.pm (parse): Accept input in
- configuration item 'inhandle'. Allow to override the name of the
+ configuration item 'inhandle'. Allow overriding the name of the
file (used for reporting) with configuration item 'reportfile'.
* scripts/Dpkg/Changelog.pm (init): Call parse if 'inhandle' is given.
@@ -3869,7 +3869,7 @@
2008-01-13 Frank Lichtenheld <djpig at debian.org>
- * scripts/Dpkg/Fields.pm (dump): Allow to omit the
+ * scripts/Dpkg/Fields.pm (dump): Allow omitting the
filehandle argument. If the function is called in
non-void context, also remove the printed string
to the caller. Together this avoids having to fiddle
@@ -6956,14 +6956,14 @@
2006-05-10 Frank Lichtenheld <djpig at debian.org>
* man/C/dpkg-deb.1: Mention the --show-format option also
- seperatly, not just in the description of --show.
+ separately, not just in the description of --show.
Point the reader to the explanation of --show-format
in dpkg-query.1 to avoid having to duplicate it.
2006-05-10 Frank Lichtenheld <djpig at debian.org>
* man/C/dpkg-deb.1: Mention the --show-format option also
- seperatly, not just in the description of --show.
+ separately, not just in the description of --show.
Point the reader to the explanation of --show-format
in dpkg-query.1 to avoid having to duplicate it.
@@ -7056,7 +7056,7 @@
2006-04-29 Justin Pryzby <justinpryzby at users.sourceforge.net>
- * src/filesdb.c: Fix a typo (unexecpted -> unexpected).
+ * src/filesdb.c: Fix a typo.
2006-04-21 Guillem Jover <guillem at debian.org>
@@ -9600,7 +9600,7 @@ Tue Jun 1 17:42:58 BRT 2004 Scott James Remnant <scott at netsplit.com>
* man/ja/Makefile.in: Move dpkg-scanpackages and dpkg-scansources
manpages to section 1.
* man/ja/dpkg-scanpackages.8: Renamed to dpkg-scanpackages.1, adjusted
- refence to dpkg-scansources.
+ reference to dpkg-scansources.
* man/ja/dpkg-scansources.8: Renamed to dpkg-scansources.1, adjusted
reference to dpkg-scanpackages.
* man/ja/dselect.8: Adjusted references to dpkg-scanpackages.
@@ -9864,7 +9864,7 @@ Sun Apr 25 17:08:57 BST 2004 Scott James Remnant <scott at netsplit.com>
Sun Apr 25 16:59:09 BST 2004 Scott James Remnant <scott at netsplit.com>
- * configure.in: Add Norwegian Nynorsk and Portugese linguas.
+ * configure.in: Add Norwegian Nynorsk and Portuguese linguas.
Sun Apr 25 12:27:38 CEST 2004 Tollef Fog Heen <tfheen at debian.org>
@@ -13031,7 +13031,7 @@ Thu Dec 21 01:40:02 CST 2000 Adam Heath <doogie at debian.org>
Thu Dec 21 01:22:22 CST 2000 Adam Heath <doogie at debian.org>
- * lib/mlib.c: Handle EINTR on reading and writting in buffer_copy.
+ * lib/mlib.c: Handle EINTR on reading and writing in buffer_copy.
Thu Dec 21 06:58:21 CET 2000 peter karlsson <peterk at debian.org>
@@ -14278,7 +14278,7 @@ Thu Oct 21 06:37:24 EDT 1999 Ben Collins <bcollins.debian.org>
target in debian/rules (po/ doesn't use it)
* Add function to libdpkg that dpkg can call to make sure it's
compiled version matches that of the library. If it fails,
- complain loudly, but allow to proceed
+ complain loudly, but proceed anyway.
* Make dpkg check for uid 0 requirement, before checking the path
since not being root, is probably the reason that the PATH is
borked in the first place
diff --git a/TODO b/TODO
index 4d96a92..69a7dfb 100644
--- a/TODO
+++ b/TODO
@@ -34,7 +34,7 @@ TODO
- Split dpkg.h into independent headers.
- Do more unused header include removal.
- Add needed includes to all header files.
- - Get rid of unuseful "unsigned" modifiers.
+ - Get rid of useless "unsigned" modifiers.
- Use internerr instead of assert, and print more meaninful messages.
- Use enums for currently hardcoded literals (replacingfilesandsaid,
filetriggers_edited, etc).
@@ -71,7 +71,7 @@ TODO
* Deprecate --force-not-root flag (remove modstatdb_rw rootneeded flags).
- * Test and reenable --command-fd.
+ * Test and re-enable --command-fd.
* Check --no-act for log_action().
diff --git a/debian/changelog b/debian/changelog
index 66507d2..4a211ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -733,7 +733,7 @@ dpkg (1.17.14) unstable; urgency=low
* Add a new --hash option to enable generating only specific file checksums
in dpkg-scanpackages. Requested by Thorsten Glaser <tg at debian.org>.
* Add architecture restriction options for dpkg-architecture -L. This allows
- to select specific subsets of all valid known architectures, matching by
+ selecting specific subsets of all valid known architectures, matching by
wildcard (-W), endianness (-E) or bits (-B). The restricting options can
be combined, or omitted altogether. Closes: #762635
* Say arch-wildcard instead of arch-alias in dpkg-architecture --help output.
@@ -2413,7 +2413,7 @@ dpkg (1.16.1) unstable; urgency=low
directives.
* dpkg-buildflags(1): make it clear that DEB_*_(SET|APPEND) environment
variables are meant for users and should not be used by packages.
- * update-alternatives: do not allow to reuse a slave link in another
+ * update-alternatives: do not allow reusing a slave link in another
slave alternative. Closes: #631547
* Improve dpkg-source's logic to identify ignored files. Closes: #632168
* Fix a small typo in dpkg-source(1). Closes: #632937
@@ -3979,12 +3979,12 @@ dpkg (1.15.3) unstable; urgency=low
that are merged into a SymbolFile. Closes: #533181
* Add new tag "ignore-blacklist" to force-include symbols which are
normally blacklisted. This can be useful for libgcc to include symbols
- that the toolchain allows to be shared but that are often static (and
+ that the toolchain allows being shared but that are often static (and
hence are blacklisted for this reason). Closes: #533642
* In dpkg-source, explicitly pass --keyring ~/.gnupg/trustedkeys.gpg to
gpgv as it does not use it if other --keyring parameters are given.
Closes: #530769
- * In dpkg-vendor, allow to use dashes instead of spaces in vendor
+ * In dpkg-vendor, allow using dashes instead of spaces in vendor
filenames. Closes: #532222
* Skip dpkg-genchanges' warning about lower version numbers for backports
(recognized by ~bpo or ~vola in their version number). Closes: #525115
@@ -4126,7 +4126,7 @@ dpkg (1.15.1) unstable; urgency=low
time. Closes: #525835
* Let dpkg-buildpackage add the missing execute right on debian/rules if
needed. Display a warning when it happens. Closes: #499088
- * Allow to combine -nc and -S in dpkg-buildpackage but display a warning
+ * Allow combining -nc and -S in dpkg-buildpackage but display a warning
saying that it's not advised. Closes: #304404
* Let dpkg-buildpackage error out with subprocerr() when dpkg-checkbuilddeps
is interrupted/killed by a signal. Closes: #498734
@@ -4629,7 +4629,7 @@ dpkg (1.14.20) unstable; urgency=low
Thanks to Justin B Rye for the review and corrections. Closes: #484002
* When dpkg-divert does renames do no check the target file if the source
does not exist and the rename is thus being disabled. This also allows
- to remove bogus diversions. Closes: #476973, #469033
+ removing bogus diversions. Closes: #476973, #469033
* Properly close triggers 'File' file, so it does not get leaked to children.
[ Raphaël Hertzog ]
@@ -5403,7 +5403,7 @@ dpkg (1.14.8) unstable; urgency=low
[ Frank Lichtenheld ]
* Add $(MAKE) check to build target
- * Allow to use other compressions than gzip on dpkg-source -b
+ * Allow using other compressions than gzip on dpkg-source -b
(NOTE: this will result in a Format: 2.0 source package!).
Closes: #382673
* Various small fixes to the manpages suggested by Helge Kreutzmann.
@@ -7057,7 +7057,7 @@ dpkg (1.10.22) unstable; urgency=low
- Create $(docdir) even when --without-sgml-doc is passed so the
ChangeLog can be installed. Closes: #137719.
- Stop hardcoding the list of manual page languages in debian/rules,
- so we include Spanish, Russian and Brazilian Portugese. Closes: #245994.
+ so we include Spanish, Russian and Brazilian Portuguese. Closes: #245994.
- Quote LDFLAGS in debian/rules to allow multiple options.
Closes: #230242.
* Documentation:
@@ -7146,7 +7146,7 @@ dpkg (1.10.21) unstable; urgency=low
* Add a note about diverting shared libraries to the dpkg-divert
manpage. Closes: #214699.
* Updated Translations:
- - Brazilian Portugese (Andre Luis Lopes). Closes: #237864.
+ - Brazilian Portuguese (Andre Luis Lopes). Closes: #237864.
- Catalan (Jordi Mallach).
- Danish (Claus Hindsgaul). Closes: #237624.
- Dutch (Pieter-Paul Spiertz, Bart Cornelis, Erwin).
diff --git a/dselect/po/zh_TW.po b/dselect/po/zh_TW.po
index b995c4b..01c4da2 100644
--- a/dselect/po/zh_TW.po
+++ b/dselect/po/zh_TW.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: dselect 1.13\n"
"Report-Msgid-Bugs-To: debian-dpkg at lists.debian.org\n"
"POT-Creation-Date: 2015-05-30 00:17+0200\n"
-"PO-Revision-Date: 2012-07-07 17:58+0800\n"
+"PO-Revision-Date: 2015-07-28 05:56+0200\n"
"Last-Translator: Asho Yeh <ashoyeh at gmail.com>\n"
"Language-Team: Chinese (traditional) <debian-l10n-chinese at lists.debian.org>\n"
"Language: zh_TW\n"
@@ -832,7 +832,7 @@ msgid ""
"This is free software; see the GNU General Public License version 2 or\n"
"later for copying conditions. There is NO warranty.\n"
msgstr ""
-"這是自由軟體﹔請參閱 GNU Public License \n"
+"這是自由軟體﹔請參閱 GNU General Public License\n"
"第二或更新的版本。該軟體【不】提供任何擔保。\n"
#: dselect/main.cc
diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm
index e27758e..d6ae050 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -202,7 +202,7 @@ sub do_extract {
options => [ '--anchored', '--no-wildcards',
@exclude_symlinks ]);
- # Apply patches (in a separate method as it might be overriden)
+ # Apply patches (in a separate method as it might be overridden)
$self->apply_patches($newdirectory, usage => 'unpack')
unless $self->{options}{skip_patches};
}
diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index ad54f00..db970dd 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -695,7 +695,7 @@ sub extract_from_shlibs {
if (($libname eq $2) && ($libversion eq $3)) {
# Define dep and end here if the package type explicitly
# matches. Otherwise if the packagetype is not specified, use
- # the dep only as a default that can be overriden by a later
+ # the dep only as a default that can be overridden by a later
# line
if (defined($1)) {
if ($1 eq $packagetype) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git
More information about the Reproducible-commits
mailing list