The following commit has been merged in the master branch:
commit 8d7922e757b61cd270b7dd7cc9c27fa344deb854
Author: Guillem Jover <guil...@debian.org>
Date: Fri May 4 07:22:30 2012 +0200
scripts: Use “changelog” instead of “change log”
diff --git a/man/dpkg-genchanges.1 b/man/dpkg-genchanges.1
index 24ad23a..cdc7691 100644
--- a/man/dpkg-genchanges.1
+++ b/man/dpkg-genchanges.1
@@ -117,7 +117,7 @@ default is
.BR debian/control .
.TP
.BI \-l changelogfile
-Specifies the change log file to read information from. The
+Specifies the changelog file to read information from. The
default is
.BR debian/changelog .
.TP
diff --git a/man/dpkg-gencontrol.1 b/man/dpkg-gencontrol.1
index e17f5d3..a267a95 100644
--- a/man/dpkg-gencontrol.1
+++ b/man/dpkg-gencontrol.1
@@ -83,7 +83,7 @@ default is
.BR debian/control .
.TP
.BI \-l changelogfile
-Specifies the change log file to read information from. The
+Specifies the changelog file to read information from. The
default is
.BR debian/changelog .
.TP
diff --git a/man/dpkg-parsechangelog.1 b/man/dpkg-parsechangelog.1
index e6e628d..bdd0d00 100644
--- a/man/dpkg-parsechangelog.1
+++ b/man/dpkg-parsechangelog.1
@@ -36,7 +36,7 @@ form.
.SH OPTIONS
.TP
.BI \-l changelogfile
-Specifies the change log file to read information from. The
+Specifies the changelog file to read information from. The
default is
.BR debian/changelog .
.TP
diff --git a/man/dpkg-source.1 b/man/dpkg-source.1
index 1bd8bb5..912f079 100644
--- a/man/dpkg-source.1
+++ b/man/dpkg-source.1
@@ -131,7 +131,7 @@ If given with relative pathname this is interpreted
starting at
the source tree's top level directory.
.TP
.BI \-l changelogfile
-Specifies the change log file to read information from. The
+Specifies the changelog file to read information from. The
default is
.BR debian/changelog .
If given with relative pathname this is interpreted starting at
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 5f71363..c849d9b 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -125,7 +125,7 @@ Options:
-sa source includes orig src.
-sd source is diff and .dsc only.
-q quiet - no informational messages on stderr.
- -F<changelogformat> force change log format.
+ -F<changelogformat> force changelog format.
-V<name>=<value> set a substitution variable.
-T<varlistfile> read variables here, not debian/substvars.
-D<field>=<value> override or add a field and value.
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 77502e3..380766d 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -75,7 +75,7 @@ Options:
-p<package> print control file for package.
-c<controlfile> get control info from this file.
-l<changelogfile> get per-version info from this file.
- -F<changelogformat> force change log format.
+ -F<changelogformat> force changelog format.
-v<forceversion> set version of binary package.
-f<fileslistfile> write files here instead of debian/files.
-P<packagebuilddir> temporary build dir instead of debian/tmp.
diff --git a/scripts/dpkg-parsechangelog.pl b/scripts/dpkg-parsechangelog.pl
index 705b336..4e0c98e 100755
--- a/scripts/dpkg-parsechangelog.pl
+++ b/scripts/dpkg-parsechangelog.pl
@@ -45,8 +45,8 @@ sub usage {
Options:
-l<changelogfile> get per-version info from this file.
- -F<changelogformat> force change log format.
- -L<libdir> look for change log parsers in <libdir>.
+ -F<changelogformat> force changelog format.
+ -L<libdir> look for changelog parsers in <libdir>.
-h, --help show this help message.
--version show the version.
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 881d521..ff72f7b 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -476,7 +476,7 @@ Commands:
"Build options:
-c<controlfile> get control info from this file.
-l<changelogfile> get per-version info from this file.
- -F<changelogformat> force change log format.
+ -F<changelogformat> force changelog format.
-V<name>=<value> set a substitution variable.
-T<varlistfile> read variables here.
-D<field>=<value> override or add a .dsc field and value.
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
