Merging upstream version 13.17.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 12 insertions, 1 deletions

diff --git a/dh_gencontrol b/dh_gencontrol
index e06763c..09b769f 100755
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -62,6 +62,9 @@ if (not compat(13)) {
 	require Dpkg::Control::Fields;
 }
 
+# The `substvars` file ius not quite a pkgfile, but it works similar enough that people might
+# be surprised if it was not detected.
+# INTROSPECTABLE: CONFIG-FILES pkgfile(substvars)
 
 on_pkgs_in_parallel {
 	foreach my $package (@_) {
@@ -72,7 +75,15 @@ on_pkgs_in_parallel {
 
 		my $substvars="debian/${ext}substvars";
 
-		my $changelog=pkgfile($package, 'changelog', 1);
+		my $changelog = pkgfile(
+			{
+				'internal-nameless-variant-handling' => 1,
+				'named'                              => 0,
+				'support-architecture-restriction'   => 0,
+			},
+			$package,
+			'changelog',
+		);
 
 		install_dir("$tmp/DEBIAN");