[debhelper-devel] [debhelper] 01/05: Fix a couple of typographical errors.

Sun Oct 2 06:24:28 UTC 2016

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 04a2d9585093a08ebd1d15790021e1851d48d32a
Author: Peter Pentchev <roam at ringlet.net>
Date:   Sat Oct 1 23:51:45 2016 +0300

    Fix a couple of typographical errors.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debhelper.pod     | 6 +++---
 debian/changelog  | 8 +++++++-
 man/po4a/po/de.po | 6 +++---
 man/po4a/po/es.po | 6 +++---
 man/po4a/po/fr.po | 6 +++---
 man/po4a/po/pt.po | 6 +++---
 6 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/debhelper.pod b/debhelper.pod
index 391007b..b27bd64 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -503,7 +503,7 @@ The B<dh> command will no longer use log files to track which commands
 have been run.  The B<dh> command I<still> keeps track of whether it
 already ran the "build" sequence and skip it if it did.
 
-The main affects of this are:
+The main effects of this are:
 
 =over 4
 
@@ -517,7 +517,7 @@ do a full "clean and rebuild" cycle)
 
 The main caveat is that B<dh_*> now only keeps track of what happened
 in a single override target.  When all the calls to a given B<dh_cmd>
-command happens in the same override target every thing will work as
+command happens in the same override target everything will work as
 before.
 
 Example of where it can go wrong:
@@ -538,7 +538,7 @@ B<-a>, B<-i>, etc.
 
 =item -
 
-The B<dh_installdeb> command now shell escapes the lines in the
+The B<dh_installdeb> command now shell-escapes the lines in the
 F<maintscript> config file.  This was the original intent but it did
 not work properly and packages have begun to rely on the incomplete
 shell escaping (e.g. quoting file names).
diff --git a/debian/changelog b/debian/changelog
index c2dd7b2..d061d02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (10.2) UNRELEASED; urgency=medium
+
+  * Apply patch from Peter Pentchev to fix some typos.
+
+ -- Niels Thykier <niels at thykier.net>  Sun, 02 Oct 2016 05:50:21 +0000
+
 debhelper (10.1) unstable; urgency=medium
 
   * Apply patch from Michael Biebl to take over dh-systemd
@@ -20,7 +26,7 @@ debhelper (10.1) unstable; urgency=medium
     options.  The old variants are accepted for compatibility.
     Thanks to Raphaël Hertzog for the suggestion.
     (Closes: #838446)
-  * cmake.pm: If cmake fails, also down CMakeFiles/CMakeOutput.log
+  * cmake.pm: If cmake fails, also dump CMakeFiles/CMakeOutput.log
     and CMakeFiles/CMakeError.log if they are present.  Thanks to
     Michael Banck for the suggestion.  (Closes: #839389)
   * d/copyright: Correct copyright and license of dh_systemd*
diff --git a/man/po4a/po/de.po b/man/po4a/po/de.po
index f71b8a4..dd798ae 100644
--- a/man/po4a/po/de.po
+++ b/man/po4a/po/de.po
@@ -1215,7 +1215,7 @@ msgstr ""
 
 #. type: textblock
 #: debhelper.pod:506
-msgid "The main affects of this are:"
+msgid "The main effects of this are:"
 msgstr "Die wichtigsten Auswirkungen davon sind:"
 
 #. type: textblock
@@ -1235,7 +1235,7 @@ msgstr ""
 msgid ""
 "The main caveat is that B<dh_*> now only keeps track of what happened in a "
 "single override target.  When all the calls to a given B<dh_cmd> command "
-"happens in the same override target every thing will work as before."
+"happens in the same override target everything will work as before."
 msgstr ""
 "Der Pferdefuss hier liegt darin, dass B<dh_*> nun nur noch nachverfolgt, was "
 "in einem einzelnen außer Kraft setzenden Ziel geschieht. Wenn alle Aufrufe "
@@ -1288,7 +1288,7 @@ msgstr ""
 #. type: textblock
 #: debhelper.pod:541
 msgid ""
-"The B<dh_installdeb> command now shell escapes the lines in the "
+"The B<dh_installdeb> command now shell-escapes the lines in the "
 "F<maintscript> config file.  This was the original intent but it did not "
 "work properly and packages have begun to rely on the incomplete shell "
 "escaping (e.g. quoting file names)."
diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po
index eea9f9c..3cd22c0 100644
--- a/man/po4a/po/es.po
+++ b/man/po4a/po/es.po
@@ -1310,7 +1310,7 @@ msgstr ""
 
 #. type: textblock
 #: debhelper.pod:506
-msgid "The main affects of this are:"
+msgid "The main effects of this are:"
 msgstr ""
 
 #. type: textblock
@@ -1326,7 +1326,7 @@ msgstr ""
 msgid ""
 "The main caveat is that B<dh_*> now only keeps track of what happened in a "
 "single override target.  When all the calls to a given B<dh_cmd> command "
-"happens in the same override target every thing will work as before."
+"happens in the same override target everything will work as before."
 msgstr ""
 
 #. type: textblock
@@ -1364,7 +1364,7 @@ msgstr ""
 #. type: textblock
 #: debhelper.pod:541
 msgid ""
-"The B<dh_installdeb> command now shell escapes the lines in the "
+"The B<dh_installdeb> command now shell-escapes the lines in the "
 "F<maintscript> config file.  This was the original intent but it did not "
 "work properly and packages have begun to rely on the incomplete shell "
 "escaping (e.g. quoting file names)."
diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po
index da03ebc..2981e3d 100644
--- a/man/po4a/po/fr.po
+++ b/man/po4a/po/fr.po
@@ -1302,7 +1302,7 @@ msgstr ""
 
 #. type: textblock
 #: debhelper.pod:506
-msgid "The main affects of this are:"
+msgid "The main effects of this are:"
 msgstr "Les principales conséquences de cela sont :"
 
 #. type: textblock
@@ -1321,7 +1321,7 @@ msgstr ""
 msgid ""
 "The main caveat is that B<dh_*> now only keeps track of what happened in a "
 "single override target.  When all the calls to a given B<dh_cmd> command "
-"happens in the same override target every thing will work as before."
+"happens in the same override target everything will work as before."
 msgstr ""
 "La principale précaution est que B<dh_*> enregistre uniquement ce qui s'est "
 "passé dans une unique cible de réécriture. Lorsque tous les appels à une "
@@ -1374,7 +1374,7 @@ msgstr ""
 #. type: textblock
 #: debhelper.pod:541
 msgid ""
-"The B<dh_installdeb> command now shell escapes the lines in the "
+"The B<dh_installdeb> command now shell-escapes the lines in the "
 "F<maintscript> config file.  This was the original intent but it did not "
 "work properly and packages have begun to rely on the incomplete shell "
 "escaping (e.g. quoting file names)."
diff --git a/man/po4a/po/pt.po b/man/po4a/po/pt.po
index 2da5dc3..b09ea1d 100644
--- a/man/po4a/po/pt.po
+++ b/man/po4a/po/pt.po
@@ -1203,7 +1203,7 @@ msgstr ""
 
 #. type: textblock
 #: debhelper.pod:506
-msgid "The main affects of this are:"
+msgid "The main effects of this are:"
 msgstr "Os principais efeitos disto são:"
 
 #. type: textblock
@@ -1222,7 +1222,7 @@ msgstr ""
 msgid ""
 "The main caveat is that B<dh_*> now only keeps track of what happened in a "
 "single override target.  When all the calls to a given B<dh_cmd> command "
-"happens in the same override target every thing will work as before."
+"happens in the same override target everything will work as before."
 msgstr ""
 "O principal embargo é que B<dh_*> agora apenas mantêm acompanhamento do que "
 "aconteceu numa meta de sobreposição singular. Quanto todas as chamadas a um "
@@ -1275,7 +1275,7 @@ msgstr ""
 #. type: textblock
 #: debhelper.pod:541
 msgid ""
-"The B<dh_installdeb> command now shell escapes the lines in the "
+"The B<dh_installdeb> command now shell-escapes the lines in the "
 "F<maintscript> config file.  This was the original intent but it did not "
 "work properly and packages have begun to rely on the incomplete shell "
 "escaping (e.g. quoting file names)."

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git


