The following commit has been merged in the master branch:
commit adaf5c43dc21083aa89341dd78a573dcc1e12be5
Author: Guillem Jover <guil...@debian.org>
Date: Thu May 21 06:12:12 2009 +0200
Revert "dpkg-deb: don't warn on unknown fields starting with "X-""
This reverts commit 66835c07b3eb5c6a5a1374e60e93dfaf12538323.
Conflicts:
debian/changelog
diff --git a/debian/changelog b/debian/changelog
index c0782c0..617f465 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,9 +45,6 @@ dpkg (1.15.1) UNRELEASED; urgency=low
Thanks to Bill Allombert for the patch.
* dpkg now correctly refuses empty parameters when an integer value is
wanted. Closes: #386197 Based on a patch by Bill Allombert.
- * dpkg-deb doesn't warn anymore when it encounters unknown DEBIAN/control
- fields starting with "X-". Closes: #353040
- Thanks to Nils Rennebarth for the patch.
* Fix a mistake in the french translation of dpkg's manual page.
Thanks to Jonathan Gibert. Closes: #522032
* Fix dpkg-source to not die when uncompressor processes are killed by
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index a6faa4e..f5bcc70 100644
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
@@ -73,9 +73,6 @@ static const char *arbitrary_fields[] = {
static int known_arbitrary_field(const struct arbitraryfield *field) {
const char **known;
- /* always accept fields starting with x- */
- if (strncasecmp(field->name, "x-", 2) == 0)
- return 1;
for (known= arbitrary_fields; *known; known++)
if (strcasecmp(field->name, *known) == 0)
return 1;
--
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
