This is an automated email from the git hooks/post-receive script.
guillem pushed a commit to branch master
in repository dpkg.
commit 53dbac6cdff347fc8acc8cdacf7e509ceadd7f5d
Author: Guillem Jover <guil...@debian.org>
Date: Sun Jan 22 20:09:24 2017 +0100
dpkg-deb: Fix capitalization of Debian in output messages
Here Debian refers to the distribution and in English this needs to be
capitalized. No translation will be unfuzzed, as the capitalization
rules change among locales.
Warned-by: spellintian
---
debian/changelog | 1 +
dpkg-deb/extract.c | 8 ++++----
t-func/deb-format.at | 14 +++++++-------
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 22af260..1b6e498 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,7 @@ dpkg (1.19.0) UNRELEASED; urgency=medium
for negating the option via --no-uniform-compression.
* Clarify subprocess error message by shuffling words around.
* Print the package name on maintainter script errors. Closes: #877521
+ * Fix capitalization of Debian in dpkg-deb output messages.
* Perl modules:
- Switch from Dpkg::Util to List::Util, now that the module in the
new required Perl contains the needed functions.
diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c
index b1d66ee..ddb8709 100644
--- a/dpkg-deb/extract.c
+++ b/dpkg-deb/extract.c
@@ -146,7 +146,7 @@ extracthalf(const char *debar, const char *dir,
char *infobuf;
if (strncmp(arh.ar_name, DEBMAGIC, sizeof(arh.ar_name)) != 0)
- ohshit(_("file '%.250s' is not a debian binary archive (try
dpkg-split?)"),
+ ohshit(_("file '%.250s' is not a Debian binary archive (try
dpkg-split?)"),
debar);
infobuf= m_malloc(memberlen+1);
r = fd_read(ar->fd, infobuf, memberlen + (memberlen & 1));
@@ -221,7 +221,7 @@ extracthalf(const char *debar, const char *dir,
}
if (admininfo >= 2) {
- printf(_(" new debian package, version %d.%d.\n"
+ printf(_(" new Debian package, version %d.%d.\n"
" size %jd bytes: control archive=%jd bytes.\n"),
version.major, version.minor,
(intmax_t)ar->size, (intmax_t)ctrllennum);
@@ -256,7 +256,7 @@ extracthalf(const char *debar, const char *dir,
}
if (admininfo >= 2) {
- printf(_(" old debian package, version %d.%d.\n"
+ printf(_(" old Debian package, version %d.%d.\n"
" size %jd bytes: control archive=%jd, main archive=%jd.\n"),
version.major, version.minor,
(intmax_t)ar->size, (intmax_t)ctrllennum,
@@ -269,7 +269,7 @@ extracthalf(const char *debar, const char *dir,
" corrupted by being downloaded in ASCII mode"));
}
- ohshit(_("'%.255s' is not a debian format archive"), debar);
+ ohshit(_("'%.255s' is not a Debian format archive"), debar);
}
m_pipe(p1);
diff --git a/t-func/deb-format.at b/t-func/deb-format.at
index 3e676db..cdfc648 100644
--- a/t-func/deb-format.at
+++ b/t-func/deb-format.at
@@ -44,7 +44,7 @@ dpkg-deb -I pkg-version-2x.deb | sed -e 's/ *$//'
], [], [debian-binary
control.tar
data.tar
- new debian package, version 2.999.
+ new Debian package, version 2.999.
size 20674 bytes: control archive=10240 bytes.
193 bytes, 7 lines control
Package: pkg-deb-format
@@ -68,7 +68,7 @@ dpkg-deb -I pkg-magic-extra.deb | sed -e 's/ *$//'
], [], [debian-binary
control.tar
data.tar
- new debian package, version 2.0.
+ new Debian package, version 2.0.
size 20684 bytes: control archive=10240 bytes.
193 bytes, 7 lines control
Package: pkg-deb-format
@@ -88,7 +88,7 @@ ar t pkg-missing-magic.deb
dpkg-deb -I pkg-missing-magic.deb
], [2], [control.tar
data.tar
-], [dpkg-deb: error: file 'pkg-missing-magic.deb' is not a debian binary
archive (try dpkg-split?)
+], [dpkg-deb: error: file 'pkg-missing-magic.deb' is not a Debian binary
archive (try dpkg-split?)
])
AT_CHECK([
@@ -162,7 +162,7 @@ dpkg-deb -I pkg-extra-member.deb | sed -e 's/ *$//'
control.tar
data.tar
unknown
- new debian package, version 2.0.
+ new Debian package, version 2.0.
size 20732 bytes: control archive=10240 bytes.
193 bytes, 7 lines control
Package: pkg-deb-format
@@ -185,7 +185,7 @@ dpkg-deb -I pkg-under-member.deb | sed -e 's/ *$//'
_ignore
control.tar
data.tar
- new debian package, version 2.0.
+ new Debian package, version 2.0.
size 20732 bytes: control archive=10240 bytes.
193 bytes, 7 lines control
Package: pkg-deb-format
@@ -218,7 +218,7 @@ dpkg-deb -I pkg-control-none.deb | sed -e 's/ *$//'
], [], [debian-binary
control.tar
data.tar
- new debian package, version 2.0.
+ new Debian package, version 2.0.
size 20672 bytes: control archive=10240 bytes.
193 bytes, 7 lines control
Package: pkg-deb-format
@@ -312,7 +312,7 @@ dpkg-deb -c pkg-mixed-comp.deb
], [], [debian-binary
control.tar.xz
data.tar.gz
- new debian package, version 2.0.
+ new Debian package, version 2.0.
size 682 bytes: control archive=336 bytes.
193 bytes, 7 lines control
Package: pkg-deb-format
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/dpkg/dpkg.git
