Make SymbolsHelper work with libdpkg-perl 1.19.0 and newer.

3 files changed, 18 insertions, 15 deletions

diff --git a/debian/changelog b/debian/changelog
index 9bcbdcd..de985b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 pkg-kde-tools (0.15.27) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Adapt SymbolsHelper to debarch_to_cpuattrs() → debarch_to_abiattrs()
+    renaming in libdpkg-perl 1.19.0.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 17 Oct 2017 17:45:29 +0300
 
diff --git a/debian/control b/debian/control
index 434f325..4211e83 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/pkg-kde-tools.git
 Package: pkg-kde-tools
 Architecture: all
 Multi-Arch: foreign
-Depends: libdpkg-perl (>= 1.15.6~),
+Depends: libdpkg-perl (>= 1.19.0~),
          python3:any (>= 3.3.2-2~),
          ${misc:Depends},
          ${perl:Depends}
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';
 }