Merge commit '1.16.1.2'

Conflicts:
	scripts/mk/architecture.mk

debian/changelog

@@ -80,6 +80,20 @@ dpkg (1.16.2) UNRELEASED; urgency=low
 
  -- Helge Kreutzmann <debian@helgefjell.de>  Fri, 23 Sep 2011 17:29:38 +0200
 
+dpkg (1.16.1.2) unstable; urgency=medium
+
+  [ Raphaël Hertzog ]
+  * Fix another typo to correctly set DEB_*_ARCH_BITS in architecture.mk.
+  * Set urgency to medium as changes are minor, and it should migrate
+    quickly in case 1.16.2 comes soon.
+
+  [ Jonathan Nieder ]
+  * Update dpkg-buildflags(1) to note that the processor option
+    -D_FORTIFY_SOURCE=2 is set in CPPFLAGS now instead of CFLAGS and
+    CXXFLAGS. Closes: #646073
+
+ -- Raphaël Hertzog <hertzog@debian.org>  Fri, 25 Nov 2011 11:18:30 +0100
+
 dpkg (1.16.1.1) unstable; urgency=low
 
   [ Raphaël Hertzog ]

man/dpkg-buildflags.1

@@ -200,7 +200,7 @@ input and contains "%n".
 .B fortify
 This setting (enabled by default) adds
 .B \-D_FORTIFY_SOURCE=2
-to \fBCFLAGS\fP and \fBCXXFLAGS\fP. During code generation the compiler
+to \fBCPPFLAGS\fP. During code generation the compiler
 knows a great deal of information about buffer sizes (where possible), and
 attempts to replace insecure unlimited length buffer function calls with
 length-limited ones. This is especially useful for old, crufty code.