DEB sip4-tqt: drop python2 support.

Signed-off-by: Michele Calgaro <[email protected]>

19 files changed, 84 insertions, 362 deletions

diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/control b/ubuntu/_base/dependencies/sip4-tqt/debian/control
index ca64055dd..edfed3d45 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/control
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/control
@@ -4,49 +4,27 @@ Priority: optional
 Maintainer: TDE Debian Team <[email protected]>
 XSBC-Original-Maintainer: Debian Python Modules Team <[email protected]>
 Uploaders: Torsten Marek <[email protected]>, Bernd Zeimetz <[email protected]>, Michael Casadevall <[email protected]>
-Build-Depends: debhelper (>= 9~), python-all-dev (>= 2.3.5-10), python-all-dbg, python3-all-dev, python3-all-dbg, python-support (>= 0.7.1) | dh-python, libtqtinterface-dev, bison, flex
+Build-Depends: debhelper (>= 9~), python3-all-dev, python3-all-dbg, dh-python, libtqtinterface-dev, bison, flex
 Standards-Version: 3.8.4
 XS-Python-Version: all
 X-Python3-Version: >= 3.0
 
-Package: python-sip-tqt
+Package: python3-sip-tqt
 Architecture: any
 Section: python
-Replaces: python-sip-tqt (<< 4:14.0.0~)
-Breaks: python-sip-tqt (<< 4:14.0.0~)
-Provides: ${python:Provides}
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: python-sip4 (<< 4.10)
-Description: Python/C++ bindings generator runtime library
- SIP-TQt is a tool for generating bindings for C++ classes with some ideas
- borrowed from SWIG, but capable of tighter bindings because of its
- specificity towards C++ and Python.
-
-Package: python-sip-tqt-dbg
-Priority: extra
-Architecture: any
-Replaces: python-sip-tqt-dbg (<< 4:14.0.0~)
-Breaks: python-sip-tqt-dbg (<< 4:14.0.0~)
-Section: debug
-Provides: ${python:Provides}
-Depends: python-sip-tqt (= ${binary:Version}), python-all-dbg, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: python-sip4-dbg (<< 4.10)
-Description: Python/C++ bindings generator runtime library (debug extension)
+Provides: ${python3:Provides}
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: Python 3/C++ bindings generator runtime library
  SIP-TQt is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its
  specificity towards C++ and Python.
  .
- This package contains the extension built for the Python debug interpreter.
+ This package provides the SIP-TQt module for Python 3
 
-Package: python-sip-tqt-dev
+Package: python3-sip-tqt-dev
 Architecture: any
 Section: python
-Replaces: python-sip-tqt-dev (<< 4:14.0.0~)
-Breaks: python-sip-tqt-dev (<< 4:14.0.0~)
-Depends: ${python:Depends}, python-sip-tqt (= ${binary:Version}), python-all-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends}
-Recommends: python-sip-tqt (>= ${source:Version})
-Provides: python-sip-dev, python-sip4-dev, sip4
-Conflicts: python-sip-dev, python-sip4-dev (<< 4.10), sip4 (<< 4.10)
+Depends: ${python:Depends}, python3-sip-tqt (= ${binary:Version}), sip-tqt-dev, python3-all-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends}
 Description: Python/C++ bindings generator development files
  SIP-TQt is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its
@@ -67,25 +45,26 @@ Description: Python/C++ bindings generator development files
      - static member functions.
  .
  This package contains the code generator tool and the development headers
- needed to develop Python bindings with sip-tqt.
+ needed to develop Python 3 bindings with sip-tqt.
 
-Package: python3-sip-tqt
+Package: python3-sip-tqt-dbg
 Architecture: any
-Section: python
-Provides: ${python3:Provides}
-Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Section: debug
+Priority: extra
+Depends: python3-sip-tqt (= ${binary:Version}), python3-all-dbg, ${shlibs:Depends}, ${misc:Depends}
 Description: Python 3/C++ bindings generator runtime library
  SIP-TQt is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its
  specificity towards C++ and Python.
  .
- This package provides SIP-TQt with support for Python 3
+ This package provides the SIP-TQt module for the debug build of the Python 3.
 
-Package: python3-sip-tqt-dev
+Package: sip-tqt-dev
 Architecture: any
 Section: python
-Depends: ${python:Depends}, python3-sip-tqt (= ${binary:Version}), python-all-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends}
-Recommends: python3-sip-tqt (>= ${source:Version})
+Depends: ${python:Depends}, ${shlibs:Depends}
+Breaks: python-sip-tqt-dev (<< 4:14.1.0~)
+Recommends: python3-sip-tqt-dev
 Description: Python/C++ bindings generator development files
  SIP-TQt is a tool for generating bindings for C++ classes with some ideas
  borrowed from SWIG, but capable of tighter bindings because of its
@@ -105,17 +84,5 @@ Description: Python/C++ bindings generator development files
      - global class instances
      - static member functions.
  .
- This package contains the code generator tool and the development headers
- needed to develop Python 3 bindings with sip-tqt.
+ This package contains the code generator tool needed to develop Python 3 bindings with sip-tqt.
 
-Package: python3-sip-tqt-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: python3-sip-tqt (= ${binary:Version}), python3-all-dbg, ${shlibs:Depends}, ${misc:Depends}
-Description: Python 3/C++ bindings generator runtime library
- SIP-TQt is a tool for generating bindings for C++ classes with some ideas
- borrowed from SWIG, but capable of tighter bindings because of its
- specificity towards C++ and Python.
- .
- This package contains debugging symbols for python3-sip-tqt
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/dh_py3sip_tqt b/ubuntu/_base/dependencies/sip4-tqt/debian/dh_py3sip_tqt
new file mode 100644
index 000000000..a59025f15
--- /dev/null
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/dh_py3sip_tqt
@@ -0,0 +1,49 @@
+#!/usr/bin/perl -w
+
+=head1 NAME
+
+dh_py3sip_tqt - set the correct dependencies for Python 3 packages using sip
+
+=cut
+
+use strict;
+use Debian::Debhelper::Dh_Lib;
+
+=head1 SYNOPSIS
+
+B<dh_py3sip_tqt>
+
+=head1 DESCRIPTION
+
+dh_py3sip_tqt creates the ${py3sip-tqt:Depends} substitution variable which must be
+used by Python 3 extensions built with sip-tqt in order to depend on a version of
+python3-sip-tqt that exports the correct public API.
+
+=cut
+
+init();
+
+my $sip_tqt_provides = `dpkg -s python3-sip-tqt`;
+$sip_tqt_provides =~ /^Provides:\s*(.+)$/m;
+
+my @sip_tqt_apis = sort(grep(/sip\-tqt\-py3api/, split(/,\s*/, $1)));
+
+my $sip_tqt_api_version=$sip_tqt_apis[-1];
+
+foreach my $package (@{$dh{DOPACKAGES}}) {
+        addsubstvar($package, "py3sip-tqt:Depends", $sip_tqt_api_version);
+}
+
+=head1 SEE ALSO
+
+L<debhelper(7)>
+
+This program is a part of python3-sip-tqt-dev but is made to work with debhelper.
+
+=head1 AUTHORS
+
+Torsten Marek <[email protected]>
+Adapted for Python3 by
+Slávek Banko <[email protected]>
+
+=cut
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip3_tqt b/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip3_tqt
deleted file mode 100644
index 9b6387689..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip3_tqt
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/perl -w
-
-=head1 NAME
-
-dh_sip3_tqt - set the correct dependencies for Python 3 packages using sip
-
-=cut
-
-use strict;
-use Debian::Debhelper::Dh_Lib;
-
-=head1 SYNOPSIS
-
-B<dh_sip3_tqt>
-
-=head1 DESCRIPTION
-
-dh_sip3_tqt creates the ${sip3-tqt:Depends} substitution variable which must be
-used by Python 3 extensions built with sip3-tqt in order to depend on a version of
-python3-sip-tqt that exports the correct public API.
-
-=cut
-
-init();
-
-my $sip3_tqt_provides = `dpkg -s python3-sip-tqt`;
-$sip3_tqt_provides =~ /^Provides:\s*(.+)$/m;
-
-my @sip3_tqt_apis = sort(grep(/sip\-tqt\-py3api/, split(/,\s*/, $1)));
-
-my $sip3_tqt_api_version=$sip3_tqt_apis[-1];
-
-foreach my $package (@{$dh{DOPACKAGES}}) {
-        addsubstvar($package, "sip3-tqt:Depends", $sip3_tqt_api_version);
-}
-
-=head1 SEE ALSO
-
-L<debhelper(7)>
-
-This program is a part of python3-sip-tqt-dev but is made to work with debhelper.
-
-=head1 AUTHORS
-
-Torsten Marek <[email protected]>
-Adapted for Python3 by
-Slávek Banko <[email protected]>
-
-=cut
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip_tqt b/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip_tqt
deleted file mode 100644
index c92f23529..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/dh_sip_tqt
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/perl -w
-
-=head1 NAME
-
-dh_sip_tqt - set the correct dependencies for Python packages using sip-tqt
-
-=cut
-
-use strict;
-use Debian::Debhelper::Dh_Lib;
-
-=head1 SYNOPSIS
-
-B<dh_sip_tqt>
-
-=head1 DESCRIPTION
-
-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_tqt_provides = `dpkg -s python-sip-tqt`;
-$sip_tqt_provides =~ /^Provides:\s*(.+)$/m;
-
-my @sip_tqt_apis = sort(grep(/sip\-tqt\-api/, split(/,\s*/, $1)));
-
-my $sip_tqt_api_version=$sip_tqt_apis[-1];
-
-foreach my $package (@{$dh{DOPACKAGES}}) {
-        addsubstvar($package, "sip-tqt:Depends", $sip_tqt_api_version);
-}
-
-=head1 SEE ALSO
-
-L<debhelper(7)>
-
-This program is a part of python-sip-tqt-dev but is made to work with debhelper.
-
-=head1 AUTHORS
-
-Torsten Marek <[email protected]>
-
-=cut
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_sip3_tqt.1 b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_py3sip_tqt.1
index a4284326a..8539600cf 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_sip3_tqt.1
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_py3sip_tqt.1
@@ -123,20 +123,20 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "DH_SIP3_TQT 1"
-.TH DH_SIP3_TQT 1 "2010-02-02" "perl v5.10.1" "User Contributed Perl Documentation"
+.IX Title "DH_PY3SIP_TQT 1"
+.TH DH_PY3SIP_TQT 1 "2010-02-02" "perl v5.10.1" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
-dh_sip3_tqt \- set the correct dependencies for Python 3 packages using sip-tqt
+dh_py3sip_tqt \- set the correct dependencies for Python 3 packages using sip-tqt
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
-\&\fBdh_sip3_tqt\fR
+\&\fBdh_py3sip_tqt\fR
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
-dh_sip3_tqt creates the ${sip3-tqt:Depends} substitution variable which must be used by
+dh_py3sip_tqt creates the ${py3sip-tqt:Depends} substitution variable which must be used by
 Python 3 extensions built with sip-tqt in order to depend on a version of python3-sip-tqt
 that exports the correct public \s-1API\s0.
 .SH "SEE ALSO"
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1 b/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1
deleted file mode 100644
index 6f0edd8f1..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/manpages/dh_sip_tqt.1
+++ /dev/null
@@ -1,149 +0,0 @@
-.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.07)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "DH_SIP_TQT 1"
-.TH DH_SIP_TQT 1 "2010-02-02" "perl v5.10.1" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-dh_sip_tqt \- set the correct dependencies for Python packages using sip-tqt
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-\&\fBdh_sip_tqt\fR
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-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 \s-1API\s0.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-\&\fIdebhelper\fR\|(7)
-.PP
-This program is a part of python-sip-tqt-dev but is made to work with debhelper.
-.SH "AUTHORS"
-.IX Header "AUTHORS"
-Torsten Marek <[email protected]>
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install
deleted file mode 100644
index 8b1c81fa9..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/*
-../../debian/dh_sip_tqt /usr/bin/
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links
deleted file mode 100644
index fdd5af4cc..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/javascript/jquery/jquery.js usr/share/doc/python-sip-tqt-dev/html/_static/jquery.js
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
deleted file mode 100644
index b3b0eafea..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/manpages/sip-tqt.1
-debian/manpages/dh_sip_tqt.1
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install b/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
deleted file mode 100644
index e9db89432..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python2.*/*-packages/sip_tqt.so
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.docs
index 416a453aa..416a453aa 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/python-sip-tqt-dev.docs
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.docs
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install
index 43fbfa385..8c6fee21f 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.install
@@ -1 +1 @@
-../../debian/dh_sip3_tqt /usr/bin/
+../dh_py3sip_tqt /usr/bin/
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.links b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.links
new file mode 100644
index 000000000..47086f7df
--- /dev/null
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.links
@@ -0,0 +1 @@
+usr/share/javascript/jquery/jquery.js usr/share/doc/python3-sip-tqt-dev/html/_static/jquery.js
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages
index db0d5945a..42f51bda1 100644
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/python3-sip-tqt-dev.manpages
@@ -1 +1 @@
-debian/manpages/dh_sip3_tqt.1
+debian/manpages/dh_py3sip_tqt.1
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/pyversions b/ubuntu/_base/dependencies/sip4-tqt/debian/pyversions
deleted file mode 100644
index 57a7586e4..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.3-
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/rules b/ubuntu/_base/dependencies/sip4-tqt/debian/rules
index b2a6d7a5a..f5dabc8df 100755
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/rules
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/rules
@@ -12,9 +12,12 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 endif
 
+export DEB_HOST_ARCH  		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+export DEB_HOST_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+export DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 export DH_OPTIONS
 
-PY2_PROVIDES=sip-tqt-api-7.0, sip-tqt-api-7.1
 PY3_PROVIDES=sip-tqt-py3api-7.0, sip-tqt-py3api-7.1
 PYDIST=sip $(shell python -c "a=[i.strip() for i in '$(PY3_PROVIDES)'.split(',')]; print sorted(a, reverse=True)[0]")
 
@@ -28,12 +31,9 @@ else
 	CFLAGS += -O2 -g
 endif
 
-PYTHONS := $(shell pyversions -vr) $(shell py3versions -vd)
-
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
+PYTHONS := $(shell py3versions -vd)
 
--include /usr/share/python/python.mk
+-include /usr/share/python3/python.mk
 ifeq (,$(py_sitename))
 py_sitename = site-packages
 py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
@@ -88,7 +88,6 @@ install-arch: build
 	dh_testdir
 	dh_testroot
 	dh_prep -a
-	echo "python:Provides=$(PY2_PROVIDES)" >> debian/python-sip-tqt.substvars
 	echo "python3:Provides=$(PY3_PROVIDES)" >> debian/python3-sip-tqt.substvars
 	dh_installdirs -a
 	# This is needed to enforce that the install-arch-% rules are
@@ -100,16 +99,10 @@ install-arch: build
 		$(MAKE) -f debian/rules install-arch-$$p;\
 	done
 
-	for i in $$(find debian/python-sip-tqt-dbg -name '*.so'); do \
-		b=$$(basename $$i .so); \
-		mv $$i $$(dirname $$i)/$${b}_d.so; \
-	done
 	for i in $$(find debian/python3-sip-tqt-dbg -name '*.so'); do \
 		b=$$(basename $$i .so); \
 		mv $$i $$(dirname $$i)/$${b}_d.so; \
 	done
-	find debian/python-sip-tqt-dbg ! -type d ! -name '*_d.*' | xargs rm -f
-	find debian/python-sip-tqt-dbg -depth -empty -exec rmdir {} \;
 	find debian/python3-sip-tqt-dbg ! -type d ! -name '*_d.*' | xargs rm -f
 	find debian/python3-sip-tqt-dbg -depth -empty -exec rmdir {} \;
 
@@ -130,21 +123,6 @@ install-arch-3.%:
 	mkdir -p debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages
 	install -m 644 -o root -g root sip_tqt_distutils.py debian/python3-sip-tqt-dev/usr/lib/python3.$*/dist-packages
 
-install-arch-%:
-	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
-	$(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-sip-tqt-dbg
-	mkdir -p debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/
-	install -m 644 -o root -g root debian/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config.py
-	install -m 644 -o root -g root build-$*/sip_tqt_config.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_nd.py
-	install -m 644 -o root -g root dbg-build-$*/sip_tqt_config.py debian/python-sip-tqt-dbg/usr/lib/python$*/$(call py_sitename,$*)/sip_tqt_config_d.py
-	mkdir -p debian/python-sip-tqt-dev$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
-	install -m 644 -o root -g root siplib/sip-tqt.h debian/python-sip-tqt-dev$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/
-	mkdir -p debian/python-sip-tqt-dev$$(python$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
-	ln -s ../$$(python$* -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())' | xargs basename)/sip-tqt.h \
-	    debian/python-sip-tqt-dev/$$(python$*-dbg -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')/sip-tqt.h
-	mkdir -p debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)
-	install -m 644 -o root -g root sip_tqt_distutils.py debian/python-sip-tqt-dev/usr/lib/python$*/$(call py_sitename,$*)
-
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
@@ -159,24 +137,14 @@ binary-common:
 	dh_link
 # don't call strip twice, it's in binary-common
 ifneq (,$(findstring -a, $(DH_OPTIONS)))
-	DH_OPTIONS= dh_strip -ppython-sip-tqt-dev
-	DH_OPTIONS= dh_strip -ppython-sip-tqt -Npython-sip-tqt-dev --dbg-package=python-sip-tqt-dbg
 	DH_OPTIONS= dh_strip -ppython3-sip-tqt-dev
 	DH_OPTIONS= dh_strip -ppython3-sip-tqt -Npython3-sip-tqt-dev --dbg-package=python3-sip-tqt-dbg
-	rm -rf debian/python-sip-tqt-dbg/usr/share/doc/python-sip-tqt-dbg
-	mkdir -p debian/python-sip-tqt-dbg/usr/share/doc
-	ln -s python-sip-tqt debian/python-sip-tqt-dbg/usr/share/doc/python-sip-tqt-dbg
 	rm -rf debian/python3-sip-tqt-dbg/usr/share/doc/python3-sip-tqt-dbg
 	mkdir -p debian/python3-sip-tqt-dbg/usr/share/doc
 	ln -s python3-sip-tqt debian/python3-sip-tqt-dbg/usr/share/doc/python3-sip-tqt-dbg
 endif
 	dh_compress -X.inv
 	dh_fixperms
-ifneq (dh_pysupport,${DH_PYTHON2})
-	${DH_PYTHON2} --no-dbg-cleaning
-else
-	${DH_PYTHON2}
-endif
 	dh_python3 --no-dbg-cleaning
 	dh_installdeb
 	dh_shlibdeps
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.install b/ubuntu/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.install
new file mode 100644
index 000000000..07438bc04
--- /dev/null
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.install
@@ -0,0 +1 @@
+usr/bin/sip-tqt
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages b/ubuntu/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages
new file mode 100644
index 000000000..1570b539a
--- /dev/null
+++ b/ubuntu/_base/dependencies/sip4-tqt/debian/sip-tqt-dev.manpages
@@ -0,0 +1 @@
+debian/manpages/sip-tqt.1
diff --git a/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py b/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py
deleted file mode 100644
index 33ebcb65b..000000000
--- a/ubuntu/_base/dependencies/sip4-tqt/debian/sip_tqt_config.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# import the sip_tqt_config.py for the normal or the debug build
-
-import sys
-
-if getattr(sys, "pydebug", False):
-    try:
-        from sip_tqt_config_d import *
-        from sip_tqt_config_d import _pkg_config, _default_macros
-    except ImportError, msg:
-        raise ImportError, 'No module named sip_config; package python-sip-tqt-dbg not installed'
-else:
-    from sip_tqt_config_nd import *
-    from sip_tqt_config_nd import _pkg_config, _default_macros