DEB tdebindings: drop python2 support.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

18 files changed, 29 insertions, 45 deletions

diff --git a/debian/_base/core/tdebindings/debian/control b/debian/_base/core/tdebindings/debian/control
index f56288575..c2d3bd966 100644
--- a/debian/_base/core/tdebindings/debian/control
+++ b/debian/_base/core/tdebindings/debian/control
@@ -1,8 +1,8 @@
 Source: tdebindings-trinity
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~),
- python-all-dev (>= 2.3.5-11), python-support (>= 0.5) | dh-python, quilt, gawk,
+ python3-all-dev, dh-python, quilt, gawk,
  default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc],
- tdelibs14-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
+ tdelibs14-trinity-dev, libtqt3-compat-headers,
  ruby, ruby-dev, flex, bison, libpkcs11-helper1-dev, automake, autoconf, libtool, libltdl-dev
 Section: devel
 Priority: optional
@@ -16,7 +16,7 @@ Architecture: all
 Section: tde
 Replaces: kdebindings-trinity (<< 4:14.0.0~)
 Breaks: kdebindings-trinity (<< 4:14.0.0~)
-Depends: tdebindings-java-trinity (>= ${source:Version}), libdcop3-java-trinity (>= ${source:Version}), libdcop3-jni-trinity (>= ${source:Version}), libqt3-java-trinity (>= ${source:Version}), libqt3-jni-trinity (>= ${source:Version}), libtrinity-java-trinity (>= ${source:Version}), libtrinity-jni-trinity (>= ${source:Version}), libsmoketqt1-trinity (>= ${source:Version}), libsmoketde1-trinity (>= ${source:Version}), python-dcop-trinity (>= ${source:Version}), libkjsembed1-trinity (>= ${source:Version}), kjscmd-trinity (>= ${source:Version}), juic-trinity (>= ${source:Version}), libkorundum0-ruby-trinity (>= ${source:Version}), libqt0-ruby-trinity (>= ${source:Version}), tde-xparts-extras-trinity (>= ${source:Version})
+Depends: tdebindings-java-trinity (>= ${source:Version}), libdcop3-java-trinity (>= ${source:Version}), libdcop3-jni-trinity (>= ${source:Version}), libqt3-java-trinity (>= ${source:Version}), libqt3-jni-trinity (>= ${source:Version}), libtrinity-java-trinity (>= ${source:Version}), libtrinity-jni-trinity (>= ${source:Version}), libsmoketqt1-trinity (>= ${source:Version}), libsmoketde1-trinity (>= ${source:Version}), python3-dcop-trinity (>= ${source:Version}), libkjsembed1-trinity (>= ${source:Version}), kjscmd-trinity (>= ${source:Version}), juic-trinity (>= ${source:Version}), libkorundum0-ruby-trinity (>= ${source:Version}), libqt0-ruby-trinity (>= ${source:Version}), tde-xparts-extras-trinity (>= ${source:Version})
 Description: TDE bindings metapackage
  TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -211,13 +211,11 @@ Description: SMOKE Binding Library to TDE - Development Files
  .
  This package is part of the official TDE bindings module.
 
-Package: python-dcop-trinity
+Package: python3-dcop-trinity
 Architecture: any
 Section: python
-Replaces: python-dcop-trinity (<< 4:14.0.0~)
-Breaks: python-dcop-trinity (<< 4:14.0.0~)
-Depends: ${python:Depends}, ${shlibs:Depends}
-Provides: ${python:Provides}
+Depends: ${python3:Depends}, ${shlibs:Depends}
+Provides: ${python3:Provides}
 Description: DCOP bindings for Python
  This package contains the shared libraries necessary to run and
  develop Python programs using the Python DCOP bindings
diff --git a/debian/_base/core/tdebindings/debian/python-dcop-trinity.install b/debian/_base/core/tdebindings/debian/python-dcop-trinity.install
deleted file mode 100644
index 364b52d9d..000000000
--- a/debian/_base/core/tdebindings/debian/python-dcop-trinity.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/opt/trinity/lib/python2.*/site-packages
diff --git a/debian/_base/core/tdebindings/debian/python-dcop-trinity.docs b/debian/_base/core/tdebindings/debian/python3-dcop-trinity.docs
index 957d3af3e..957d3af3e 100644
--- a/debian/_base/core/tdebindings/debian/python-dcop-trinity.docs
+++ b/debian/_base/core/tdebindings/debian/python3-dcop-trinity.docs
diff --git a/debian/_base/core/tdebindings/debian/python-dcop-trinity.examples b/debian/_base/core/tdebindings/debian/python3-dcop-trinity.examples
index 4100d465b..4100d465b 100644
--- a/debian/_base/core/tdebindings/debian/python-dcop-trinity.examples
+++ b/debian/_base/core/tdebindings/debian/python3-dcop-trinity.examples
diff --git a/debian/_base/core/tdebindings/debian/python3-dcop-trinity.install b/debian/_base/core/tdebindings/debian/python3-dcop-trinity.install
new file mode 100644
index 000000000..8123736e6
--- /dev/null
+++ b/debian/_base/core/tdebindings/debian/python3-dcop-trinity.install
@@ -0,0 +1 @@
+debian/tmp/opt/trinity/lib/python3/dist-packages
diff --git a/debian/_base/core/tdebindings/debian/rules b/debian/_base/core/tdebindings/debian/rules
index 63b19e54f..5fe76afb1 100755
--- a/debian/_base/core/tdebindings/debian/rules
+++ b/debian/_base/core/tdebindings/debian/rules
@@ -3,10 +3,6 @@
 DEB_QUILT_PATCHDIR_LINK :=
 export QUILT_PATCHES=debian/patches
 
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
-
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 override DEB_BUILDDIR := $(DEB_SRCDIR)
 include debian/cdbs/debian-tde.mk
@@ -111,8 +107,9 @@ common-install-arch:: stamp-install-dcopjava
 
 binary-install/juic-trinity::
 	sed -i "s|UIXSLDIR=/usr|UIXSLDIR=/opt/trinity|" debian/$(cdbs_curpkg)/opt/trinity/bin/juic
-binary-install/python-dcop-trinity::
-	${DH_PYTHON2} -p$(cdbs_curpkg)
+
+binary-install/python3-dcop-trinity::
+	dh_python3 -p$(cdbs_curpkg)
 
 ###
 
diff --git a/dilos/core/tdebindings/debian/control b/dilos/core/tdebindings/debian/control
index c9b846391..9328ab8f4 100644
--- a/dilos/core/tdebindings/debian/control
+++ b/dilos/core/tdebindings/debian/control
@@ -1,8 +1,8 @@
 Source: tdebindings-trinity
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~),
- python-all-dev (>= 2.3.5-11), python-support (>= 0.5) | dh-python, quilt, gawk,
+ python3-all-dev, dh-python, quilt, gawk,
  default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc],
- tdelibs14-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
+ tdelibs14-trinity-dev, libtqt3-compat-headers,
  ruby, ruby-dev, flex, bison, libpkcs11-helper1-dev, automake, autoconf, libtool, libltdl-dev,
  graphviz [solaris-any], libgtk2.0-dev [solaris-any], oracle-java8-jdk [solaris-any]
 Section: devel
@@ -17,7 +17,7 @@ Architecture: all
 Section: tde
 Replaces: kdebindings-trinity (<< 4:14.0.0~)
 Breaks: kdebindings-trinity (<< 4:14.0.0~)
-Depends: tdebindings-java-trinity (>= ${source:Version}), libdcop3-java-trinity (>= ${source:Version}), libdcop3-jni-trinity (>= ${source:Version}), libqt3-java-trinity (>= ${source:Version}), libqt3-jni-trinity (>= ${source:Version}), libtrinity-java-trinity (>= ${source:Version}), libtrinity-jni-trinity (>= ${source:Version}), libsmoketqt1-trinity (>= ${source:Version}), libsmoketde1-trinity (>= ${source:Version}), python-dcop-trinity (>= ${source:Version}), libkjsembed1-trinity (>= ${source:Version}), kjscmd-trinity (>= ${source:Version}), juic-trinity (>= ${source:Version}), libkorundum0-ruby-trinity (>= ${source:Version}), libqt0-ruby-trinity (>= ${source:Version}), tde-xparts-extras-trinity (>= ${source:Version})
+Depends: tdebindings-java-trinity (>= ${source:Version}), libdcop3-java-trinity (>= ${source:Version}), libdcop3-jni-trinity (>= ${source:Version}), libqt3-java-trinity (>= ${source:Version}), libqt3-jni-trinity (>= ${source:Version}), libtrinity-java-trinity (>= ${source:Version}), libtrinity-jni-trinity (>= ${source:Version}), libsmoketqt1-trinity (>= ${source:Version}), libsmoketde1-trinity (>= ${source:Version}), python3-dcop-trinity (>= ${source:Version}), libkjsembed1-trinity (>= ${source:Version}), kjscmd-trinity (>= ${source:Version}), juic-trinity (>= ${source:Version}), libkorundum0-ruby-trinity (>= ${source:Version}), libqt0-ruby-trinity (>= ${source:Version}), tde-xparts-extras-trinity (>= ${source:Version})
 Description: TDE bindings metapackage
  TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -212,13 +212,11 @@ Description: SMOKE Binding Library to TDE - Development Files
  .
  This package is part of the official TDE bindings module.
 
-Package: python-dcop-trinity
+Package: python3-dcop-trinity
 Architecture: any
 Section: python
-Replaces: python-dcop-trinity (<< 4:14.0.0~)
-Breaks: python-dcop-trinity (<< 4:14.0.0~)
-Depends: ${python:Depends}, ${shlibs:Depends}
-Provides: ${python:Provides}
+Depends: ${python3:Depends}, ${shlibs:Depends}
+Provides: ${python3:Provides}
 Description: DCOP bindings for Python
  This package contains the shared libraries necessary to run and
  develop Python programs using the Python DCOP bindings
diff --git a/dilos/core/tdebindings/debian/python-dcop-trinity.install b/dilos/core/tdebindings/debian/python-dcop-trinity.install
deleted file mode 100644
index 86d1a899e..000000000
--- a/dilos/core/tdebindings/debian/python-dcop-trinity.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/python2.*/site-packages
diff --git a/dilos/core/tdebindings/debian/python-dcop-trinity.docs b/dilos/core/tdebindings/debian/python3-dcop-trinity.docs
index 957d3af3e..957d3af3e 100644
--- a/dilos/core/tdebindings/debian/python-dcop-trinity.docs
+++ b/dilos/core/tdebindings/debian/python3-dcop-trinity.docs
diff --git a/dilos/core/tdebindings/debian/python-dcop-trinity.examples b/dilos/core/tdebindings/debian/python3-dcop-trinity.examples
index 4100d465b..4100d465b 100644
--- a/dilos/core/tdebindings/debian/python-dcop-trinity.examples
+++ b/dilos/core/tdebindings/debian/python3-dcop-trinity.examples
diff --git a/dilos/core/tdebindings/debian/python3-dcop-trinity.install b/dilos/core/tdebindings/debian/python3-dcop-trinity.install
new file mode 100644
index 000000000..0cb9ab6cb
--- /dev/null
+++ b/dilos/core/tdebindings/debian/python3-dcop-trinity.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/python3/dist-packages
diff --git a/dilos/core/tdebindings/debian/rules b/dilos/core/tdebindings/debian/rules
index 97aacdcc5..b63afb2fd 100755
--- a/dilos/core/tdebindings/debian/rules
+++ b/dilos/core/tdebindings/debian/rules
@@ -3,10 +3,6 @@
 DEB_QUILT_PATCHDIR_LINK :=
 export QUILT_PATCHES=debian/patches
 
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
-
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 override DEB_BUILDDIR := $(DEB_SRCDIR)
 include debian/cdbs/debian-tde.mk
@@ -117,8 +113,8 @@ common-install-arch:: stamp-install-dcopjava
 
 ###
 
-binary-install/python-dcop-trinity::
-	${DH_PYTHON2} -p$(cdbs_curpkg)
+binary-install/python3-dcop-trinity::
+	dh_python3 -p$(cdbs_curpkg)
 
 ###
 
diff --git a/ubuntu/_base/core/tdebindings/debian/control b/ubuntu/_base/core/tdebindings/debian/control
index 651da2701..393f556ce 100644
--- a/ubuntu/_base/core/tdebindings/debian/control
+++ b/ubuntu/_base/core/tdebindings/debian/control
@@ -1,8 +1,8 @@
 Source: tdebindings-trinity
 Build-Depends: cdbs (>= 0.4.43), debhelper (>= 9~),
- python-all-dev (>= 2.3.5-11), python-support (>= 0.5) | dh-python, quilt, gawk,
+ python3-all-dev, dh-python, quilt, gawk,
  default-jdk [amd64 i386 armel armhf arm64 mipsel ia64 powerpc ppc64el riscv64 s390 sparc],
- tdelibs14-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
+ tdelibs14-trinity-dev, libtqt3-compat-headers,
  ruby, ruby-dev, flex, bison, libpkcs11-helper1-dev, automake, autoconf, libtool, libltdl-dev
 Section: devel
 Priority: optional
@@ -16,7 +16,7 @@ Architecture: all
 Section: tde
 Replaces: kdebindings-trinity (<< 4:14.0.0~)
 Breaks: kdebindings-trinity (<< 4:14.0.0~)
-Depends: tdebindings-java-trinity (>= ${source:Version}), libdcop3-java-trinity (>= ${source:Version}), libdcop3-jni-trinity (>= ${source:Version}), libqt3-java-trinity (>= ${source:Version}), libqt3-jni-trinity (>= ${source:Version}), libtrinity-java-trinity (>= ${source:Version}), libtrinity-jni-trinity (>= ${source:Version}), libsmoketqt1-trinity (>= ${source:Version}), libsmoketde1-trinity (>= ${source:Version}), python-dcop-trinity (>= ${source:Version}), libkjsembed1-trinity (>= ${source:Version}), kjscmd-trinity (>= ${source:Version}), juic-trinity (>= ${source:Version}), libkorundum0-ruby-trinity (>= ${source:Version}), libqt0-ruby-trinity (>= ${source:Version}), tde-xparts-extras-trinity (>= ${source:Version})
+Depends: tdebindings-java-trinity (>= ${source:Version}), libdcop3-java-trinity (>= ${source:Version}), libdcop3-jni-trinity (>= ${source:Version}), libqt3-java-trinity (>= ${source:Version}), libqt3-jni-trinity (>= ${source:Version}), libtrinity-java-trinity (>= ${source:Version}), libtrinity-jni-trinity (>= ${source:Version}), libsmoketqt1-trinity (>= ${source:Version}), libsmoketde1-trinity (>= ${source:Version}), python3-dcop-trinity (>= ${source:Version}), libkjsembed1-trinity (>= ${source:Version}), kjscmd-trinity (>= ${source:Version}), juic-trinity (>= ${source:Version}), libkorundum0-ruby-trinity (>= ${source:Version}), libqt0-ruby-trinity (>= ${source:Version}), tde-xparts-extras-trinity (>= ${source:Version})
 Description: TDE bindings metapackage
  TDE (the Trinity Desktop Environment) is a powerful Open Source graphical
  desktop environment for Unix workstations. It combines ease of use,
@@ -211,13 +211,11 @@ Description: SMOKE Binding Library to TDE - Development Files
  .
  This package is part of the official TDE bindings module.
 
-Package: python-dcop-trinity
+Package: python3-dcop-trinity
 Architecture: any
 Section: python
-Replaces: python-dcop-kde3 (<< 4:14.0.0~), python-dcop-trinity (<< 4:14.0.0~)
-Breaks: python-dcop-kde3 (<< 4:14.0.0~), python-dcop-trinity (<< 4:14.0.0~)
-Depends: ${python:Depends}, ${shlibs:Depends}
-Provides: ${python:Provides}
+Depends: ${python3:Depends}, ${shlibs:Depends}
+Provides: ${python3:Provides}
 Description: DCOP bindings for Python
  This package contains the shared libraries necessary to run and
  develop Python programs using the Python DCOP bindings
diff --git a/ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.install b/ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.install
deleted file mode 100644
index 364b52d9d..000000000
--- a/ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/opt/trinity/lib/python2.*/site-packages
diff --git a/ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.docs b/ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.docs
index 957d3af3e..957d3af3e 100644
--- a/ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.docs
+++ b/ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.docs
diff --git a/ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.examples b/ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.examples
index 4100d465b..4100d465b 100644
--- a/ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.examples
+++ b/ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.examples
diff --git a/ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.install b/ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.install
new file mode 100644
index 000000000..8123736e6
--- /dev/null
+++ b/ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.install
@@ -0,0 +1 @@
+debian/tmp/opt/trinity/lib/python3/dist-packages
diff --git a/ubuntu/_base/core/tdebindings/debian/rules b/ubuntu/_base/core/tdebindings/debian/rules
index 63b19e54f..5fe76afb1 100755
--- a/ubuntu/_base/core/tdebindings/debian/rules
+++ b/ubuntu/_base/core/tdebindings/debian/rules
@@ -3,10 +3,6 @@
 DEB_QUILT_PATCHDIR_LINK :=
 export QUILT_PATCHES=debian/patches
 
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
-DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
-
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 override DEB_BUILDDIR := $(DEB_SRCDIR)
 include debian/cdbs/debian-tde.mk
@@ -111,8 +107,9 @@ common-install-arch:: stamp-install-dcopjava
 
 binary-install/juic-trinity::
 	sed -i "s|UIXSLDIR=/usr|UIXSLDIR=/opt/trinity|" debian/$(cdbs_curpkg)/opt/trinity/bin/juic
-binary-install/python-dcop-trinity::
-	${DH_PYTHON2} -p$(cdbs_curpkg)
+
+binary-install/python3-dcop-trinity::
+	dh_python3 -p$(cdbs_curpkg)
 
 ###