3 files changed, 28 insertions, 19 deletions
diff --git a/perllib/Debian/Debhelper/Sequence/qmlcdeps.pm b/perllib/Debian/Debhelper/Sequence/qmlcdeps.pm
new file mode 100644
index 0000000..07449d7
--- /dev/null
+++ b/perllib/Debian/Debhelper/Sequence/qmlcdeps.pm
@@ -0,0 +1,8 @@
+use warnings;
+use strict;
+
+use Debian::Debhelper::Dh_Lib;
+
+insert_after("dh_install", "dh_qmlcdeps");
+
+1;
diff --git a/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm b/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
index 29a24d3..f64bba9 100644
--- a/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
+++ b/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
@@ -150,7 +150,7 @@ package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::size_t;
 use strict;
 use warnings;
 use base 'Debian::PkgKde::SymbolsHelper::Substs::TypeSubst';
-use Dpkg::Arch qw(debarch_to_cpuattrs);
+use Dpkg::Arch qw(debarch_to_abiattrs);
 
 sub new {
     my $class = shift;
@@ -162,7 +162,7 @@ sub new {
 
 sub _expand {
     my ($self, $arch) = @_;
-    my ($bits, $endian) = debarch_to_cpuattrs($arch);
+    my ($bits, $endian) = debarch_to_abiattrs($arch);
     return $bits == 64 ? 'm' : 'j';
 }
 
@@ -171,7 +171,7 @@ package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::ssize_t;
 use strict;
 use warnings;
 use base 'Debian::PkgKde::SymbolsHelper::Substs::TypeSubst';
-use Dpkg::Arch qw(debarch_to_cpuattrs);
+use Dpkg::Arch qw(debarch_to_abiattrs);
 
 sub new {
     my $class = shift;
@@ -183,7 +183,7 @@ sub new {
 
 sub _expand {
     my ($self, $arch) = @_;
-    my ($bits, $endian) = debarch_to_cpuattrs($arch);
+    my ($bits, $endian) = debarch_to_abiattrs($arch);
     return $bits == 64 ? 'l' : 'i';
 }
 
@@ -192,7 +192,7 @@ package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::int64_t;
 use strict;
 use warnings;
 use base 'Debian::PkgKde::SymbolsHelper::Substs::TypeSubst';
-use Dpkg::Arch qw(debarch_to_cpuattrs);
+use Dpkg::Arch qw(debarch_to_abiattrs);
 
 sub new {
     my $class = shift;
@@ -204,7 +204,7 @@ sub new {
 
 sub _expand {
     my ($self, $arch) = @_;
-    my ($bits, $endian) = debarch_to_cpuattrs($arch);
+    my ($bits, $endian) = debarch_to_abiattrs($arch);
     return $bits == 64 ? 'l' : 'x';
 }
 
@@ -213,7 +213,7 @@ package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::uint64_t;
 use strict;
 use warnings;
 use base 'Debian::PkgKde::SymbolsHelper::Substs::TypeSubst';
-use Dpkg::Arch qw(debarch_to_cpuattrs);
+use Dpkg::Arch qw(debarch_to_abiattrs);
 
 sub new {
     my $class = shift;
@@ -225,7 +225,7 @@ sub new {
 
 sub _expand {
     my ($self, $arch) = @_;
-    my ($bits, $endian) = debarch_to_cpuattrs($arch);
+    my ($bits, $endian) = debarch_to_abiattrs($arch);
     return $bits == 64 ? 'm' : 'y';
 }
 
@@ -234,7 +234,7 @@ package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::qptrdiff;
 use strict;
 use warnings;
 use base 'Debian::PkgKde::SymbolsHelper::Substs::TypeSubst';
-use Dpkg::Arch qw(debarch_to_cpuattrs);
+use Dpkg::Arch qw(debarch_to_abiattrs);
 
 sub new {
     my $class = shift;
@@ -246,7 +246,7 @@ sub new {
 
 sub _expand {
     my ($self, $arch) = @_;
-    my ($bits, $endian) = debarch_to_cpuattrs($arch);
+    my ($bits, $endian) = debarch_to_abiattrs($arch);
     return $bits == 64 ? 'x' : 'i';
 }
 
@@ -255,7 +255,7 @@ package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::quintptr;
 use strict;
 use warnings;
 use base 'Debian::PkgKde::SymbolsHelper::Substs::TypeSubst';
-use Dpkg::Arch qw(debarch_to_cpuattrs);
+use Dpkg::Arch qw(debarch_to_abiattrs);
 
 sub new {
     my $class = shift;
@@ -267,7 +267,7 @@ sub new {
 
 sub _expand {
     my ($self, $arch) = @_;
-    my ($bits, $endian) = debarch_to_cpuattrs($arch);
+    my ($bits, $endian) = debarch_to_abiattrs($arch);
     return $bits == 64 ? 'y' : 'j';
 }
 
@@ -276,7 +276,7 @@ package Debian::PkgKde::SymbolsHelper::Substs::TypeSubst::intptr_t;
 use strict;
 use warnings;
 use base 'Debian::PkgKde::SymbolsHelper::Substs::TypeSubst';
-use Dpkg::Arch qw(debarch_to_cpuattrs);
+use Dpkg::Arch qw(debarch_to_abiattrs);
 
 sub new {
     my $class = shift;
@@ -288,7 +288,7 @@ sub new {
 
 sub _expand {
     my ($self, $arch) = @_;
-    my ($bits, $endian) = debarch_to_cpuattrs($arch);
+    my ($bits, $endian) = debarch_to_abiattrs($arch);
     return $bits == 64 ? 'l' : 'i';
 }
 
diff --git a/perllib/Debian/PkgKde/SymbolsHelper/SymbolFile.pm b/perllib/Debian/PkgKde/SymbolsHelper/SymbolFile.pm
index 081d543..42c7d2b 100644
--- a/perllib/Debian/PkgKde/SymbolsHelper/SymbolFile.pm
+++ b/perllib/Debian/PkgKde/SymbolsHelper/SymbolFile.pm
@@ -30,11 +30,12 @@ use Debian::PkgKde::SymbolsHelper::Substs;
 
 # Use Debian::PkgKde::SymbolsHelper::Symbol as base symbol
 sub parse {
-    my ($self, $fh, $file, $seen, $obj_ref, $base_symbol) = @_;
-    unless (defined $base_symbol) {
-	$base_symbol = 'Debian::PkgKde::SymbolsHelper::Symbol';
+    my ($self, $fh, $file, %opts) = @_;
+    my $state = $opts{state} //= {};
+    unless (defined $state->{base_symbol}) {
+        $state->{base_symbol} = 'Debian::PkgKde::SymbolsHelper::Symbol';
     }
-    if (!defined $seen) {
+    unless (defined $state->{seen}) {
 	# Read 'SymbolsHelper-Confirmed' header
 	open(my $fh, "<", $file)
 	    or error("unable to open symbol file '$file' for reading");
@@ -46,7 +47,7 @@ sub parse {
 	    $self->set_confirmed(split(/\s+/, $1));
 	}
     }
-    return $self->SUPER::parse($fh, $file, $seen, $obj_ref, $base_symbol);
+    return $self->SUPER::parse($fh, $file, %opts);
 }
 
 sub set_confirmed {