Merge branch 'sid' (through tag '1.16.4.2')

Conflicts:
	debian/changelog

debian/changelog

@@ -4,6 +4,13 @@ dpkg (1.16.5) UNRELEASED; urgency=low
 
  -- Guillem Jover <guillem@debian.org>  Fri, 08 Jun 2012 09:39:42 +0200
 
+dpkg (1.16.4.2) unstable; urgency=low
+
+  * Check correctly for out of range negative field width values in dpkg-query
+    --show format strings. Regression introduced in 1.16.4. Closes: #676796
+
+ -- Guillem Jover <guillem@debian.org>  Sat, 09 Jun 2012 16:16:17 +0200
+
 dpkg (1.16.4.1) unstable; urgency=low
 
   * Fix explicit file trigger activation. Regression introduced in 1.16.4.

lib/dpkg/pkg-format.c

@@ -86,7 +86,7 @@ parsefield(struct pkg_format_node *cur, const char *fmt, const char *fmtend)
 			       *endptr);
 			return false;
 		}
-		if (w < INT_MAX || w > INT_MAX || errno == ERANGE) {
+		if (w < INT_MIN || w > INT_MAX || errno == ERANGE) {
 			fprintf(stderr, _("field width is out of range\n"));
 			return false;
 		}