DEB sip4-tqt: Change the sip-api symbolic name to sip-tqt-api

to avoid unwanted confusion between sip and sip-tqt.

To ensure a smooth upgrade, sip-api-7.1 has been left here,
which will be removed subsequently.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 8022c4c534c86419309ea089783a506396ebb266)

6 files changed, 22 insertions, 22 deletions

diff --git a/debian/_base/dependencies/python-tqt/debian/control b/debian/_base/dependencies/python-tqt/debian/control
index 1712725a2..8af7946c1 100644
--- a/debian/_base/dependencies/python-tqt/debian/control
+++ b/debian/_base/dependencies/python-tqt/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.8.4
 
 Package: python-tqt
 Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, ${sip:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${python:Depends}, ${sip-tqt:Depends}, ${misc:Depends}
 Replaces: python-tqt (<< 4:14.0.0~)
 Breaks: python-tqt (<< 4:14.0.0~)
 Suggests: python-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
diff --git a/debian/_base/dependencies/sip4-tqt/debian/control b/debian/_base/dependencies/sip4-tqt/debian/control
index 1624cba0b..bdd8f4eb0 100644
--- a/debian/_base/dependencies/sip4-tqt/debian/control
+++ b/debian/_base/dependencies/sip4-tqt/debian/control
@@ -13,7 +13,7 @@ Architecture: any
 Section: python
 Replaces: python-sip-tqt (<< 4:14.0.0~)
 Breaks: python-sip-tqt (<< 4:14.0.0~)
-Provides: ${python:Provides}, sip-api-7.0, sip-api-7.1
+Provides: ${python:Provides}, sip-tqt-api-7.1, sip-api-7.1
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: python-sip4 (<< 4.10)
 Description: Python/C++ bindings generator runtime library
diff --git a/debian/_base/dependencies/sip4-tqt/debian/dh_sip_tqt b/debian/_base/dependencies/sip4-tqt/debian/dh_sip_tqt
index b1a8c19e3..3c6450bd9 100644
--- a/debian/_base/dependencies/sip4-tqt/debian/dh_sip_tqt
+++ b/debian/_base/dependencies/sip4-tqt/debian/dh_sip_tqt
@@ -15,30 +15,30 @@ B<dh_sip_tqt>
 
 =head1 DESCRIPTION
 
-dh_sip_tqt creates the ${sip:Depends} substitution variable which must be used by
-Python extensions built with sip in order to depend on a version of python-sip
-that exports the correct public API. 
+dh_sip_tqt creates the ${sip-tqt:Depends} substitution variable which must be
+used by Python extensions built with sip-tqt in order to depend on a version of
+python-sip-tqt that exports the correct public API.
 
 =cut
 
 init();
 
-my $sip_provides = `dpkg -s python-sip-tqt`;
-$sip_provides =~ /^Provides:\s*(.+)$/m;
+my $sip_tqt_provides = `dpkg -s python-sip-tqt`;
+$sip_tqt_provides =~ /^Provides:\s*(.+)$/m;
 
-my @sip_apis = sort(grep(/sip\-api/, split(/,\s*/, $1)));
+my @sip_tqt_apis = sort(grep(/sip\-tqt\-api/, split(/,\s*/, $1)));
 
-my $sip_api_version=$sip_apis[-1];
+my $sip_tqt_api_version=$sip_tqt_apis[-1];
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
-        addsubstvar($package, "sip:Depends", $sip_api_version);
+        addsubstvar($package, "sip-tqt:Depends", $sip_tqt_api_version);
 }
 
 =head1 SEE ALSO
 
 L<debhelper(7)>
 
-This program is a part of python-sip-dev but is made to work with debhelper.
+This program is a part of python-sip-tqt-dev but is made to work with debhelper.
 
 =head1 AUTHORS
 
diff --git a/ubuntu/_base/dependencies/python-tqt/debian/control b/ubuntu/_base/dependencies/python-tqt/debian/control
index 1712725a2..8af7946c1 100644
--- a/ubuntu/_base/dependencies/python-tqt/debian/control
+++ b/ubuntu/_base/dependencies/python-tqt/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.8.4
 
 Package: python-tqt
 Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, ${sip:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${python:Depends}, ${sip-tqt:Depends}, ${misc:Depends}
 Replaces: python-tqt (<< 4:14.0.0~)
 Breaks: python-tqt (<< 4:14.0.0~)
 Suggests: python-tqt-gl, python-tqt-doc, libtqt3-mt-mysql|libtqt3-mt-odbc|libtqt3-mt-psql
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/control b/ubuntu/_base/dependencies/sip4-tqt/debian/control
index 1624cba0b..bdd8f4eb0 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/control
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/control
@@ -13,7 +13,7 @@ Architecture: any
 Section: python
 Replaces: python-sip-tqt (<< 4:14.0.0~)
 Breaks: python-sip-tqt (<< 4:14.0.0~)
-Provides: ${python:Provides}, sip-api-7.0, sip-api-7.1
+Provides: ${python:Provides}, sip-tqt-api-7.1, sip-api-7.1
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: python-sip4 (<< 4.10)
 Description: Python/C++ bindings generator runtime library
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip_tqt b/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip_tqt
index b1a8c19e3..3c6450bd9 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip_tqt
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip_tqt
@@ -15,30 +15,30 @@ B<dh_sip_tqt>
 
 =head1 DESCRIPTION
 
-dh_sip_tqt creates the ${sip:Depends} substitution variable which must be used by
-Python extensions built with sip in order to depend on a version of python-sip
-that exports the correct public API. 
+dh_sip_tqt creates the ${sip-tqt:Depends} substitution variable which must be
+used by Python extensions built with sip-tqt in order to depend on a version of
+python-sip-tqt that exports the correct public API.
 
 =cut
 
 init();
 
-my $sip_provides = `dpkg -s python-sip-tqt`;
-$sip_provides =~ /^Provides:\s*(.+)$/m;
+my $sip_tqt_provides = `dpkg -s python-sip-tqt`;
+$sip_tqt_provides =~ /^Provides:\s*(.+)$/m;
 
-my @sip_apis = sort(grep(/sip\-api/, split(/,\s*/, $1)));
+my @sip_tqt_apis = sort(grep(/sip\-tqt\-api/, split(/,\s*/, $1)));
 
-my $sip_api_version=$sip_apis[-1];
+my $sip_tqt_api_version=$sip_tqt_apis[-1];
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
-        addsubstvar($package, "sip:Depends", $sip_api_version);
+        addsubstvar($package, "sip-tqt:Depends", $sip_tqt_api_version);
 }
 
 =head1 SEE ALSO
 
 L<debhelper(7)>
 
-This program is a part of python-sip-dev but is made to work with debhelper.
+This program is a part of python-sip-tqt-dev but is made to work with debhelper.
 
 =head1 AUTHORS