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

Conflicts:
	debian/changelog

ChangeLog.old

@@ -2701,7 +2701,7 @@
 	* src/help.c (cu_post_script_tasks): New function.
 	(do_script): Install cu_post_script_tasks as a cleanup handler.
 	(maintainer_script_alternative): Call post_script_tasks if the
-	first do_script invokation fails instead of it succeeding.
+	first do_script invocation fails instead of it succeeding.
 
 2008-03-28  Ian Jackson  <ian@davenant.greenend.org.uk>,
             Guillem Jover  <guillem@debian.org>

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.1) unstable; urgency=low
+
+  * Fix explicit file trigger activation. Regression introduced in 1.16.4.
+    Closes: #676684
+
+ -- Guillem Jover <guillem@debian.org>  Fri, 08 Jun 2012 23:17:11 +0200
+
 dpkg (1.16.4) unstable; urgency=low
 
   [ Guillem Jover ]
@@ -61,14 +68,14 @@ dpkg (1.16.4) unstable; urgency=low
     become uninstallable. Thanks to Dominic Hargreaves <dom@earth.li>.
     Closes: #675947
   * Put an & before field_capitalize() calls in Dpkg::Control::Fields to
-    fix a usege before declaration warning with perl 5.16. Closes: #676262
+    fix a usage before declaration warning with perl 5.16. Closes: #676262
   * Do not warn in dpkg-divert on missing files list file for packages never
     installed before. Closes: #673518
   * Add support for liblzma to handle .xz and .lzma compressed files, and
     switch to it instead of using xz-utils. This removes the xz-utils
     Pre-Depends from dpkg. Thanks to Jonathan Nieder <jrnieder@gmail.com>.
   * Always activate all path components for file triggers, this fixes file
-    trigger handling for conffiles and dpkg-trigger invokations.
+    trigger handling for conffiles and dpkg-trigger invocations.
     Closes: #675613, #676061, #676062, #676107, #676118, #676122
   * Do not reset Multi-Arch field in the update log when removing the package.
     Closes: #676496

lib/dpkg/triglib.c

@@ -587,15 +587,18 @@ trig_path_activate_byname(const char *trig, struct pkginfo *aw)
 	trig_file_activate_parents(trig, aw);
 }
 
+static const char *trk_file_trig;
+
 static void
 trk_file_activate_start(void)
 {
+	trk_file_trig = nfstrsave(trig_activating_name);
 }
 
 static void
 trk_file_activate_awaiter(struct pkginfo *aw)
 {
-	trig_path_activate_byname(trig_activating_name, aw);
+	trig_path_activate_byname(trk_file_trig, aw);
 }
 
 static void