TDE
/
tde-packaging
9
1
Fork 1
Code Issues 10 Pull Requests Releases Wiki Activity
Labels Milestones
New Pull Request

DEB tdebindings: drop python2 support. #187

Merged
MicheleC merged 1 commits from deb/tdebindings/drop-python2 into master 1 year ago
Conversation 0 Commits 1 Files Changed 18
18 changed files with 29 additions and 45 deletions
Show Stats Download Patch File Download Diff File

14
debian/_base/core/tdebindings/debian/control vendored
Unescape View File

@ -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

1
debian/_base/core/tdebindings/debian/python-dcop-trinity.install vendored
Unescape View File

@ -1 +0,0 @@
debian/tmp/opt/trinity/lib/python2.*/site-packages

0
debian/_base/core/tdebindings/debian/python-dcop-trinity.docs → debian/_base/core/tdebindings/debian/python3-dcop-trinity.docs vendored
Unescape View File

0
debian/_base/core/tdebindings/debian/python-dcop-trinity.examples → debian/_base/core/tdebindings/debian/python3-dcop-trinity.examples vendored
Unescape View File

1
debian/_base/core/tdebindings/debian/python3-dcop-trinity.install vendored
Unescape View File

@ -0,0 +1 @@
debian/tmp/opt/trinity/lib/python3/dist-packages

9
debian/_base/core/tdebindings/debian/rules vendored
Unescape View File

@ -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)
###

14
dilos/core/tdebindings/debian/control
Unescape View File

@ -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

1
dilos/core/tdebindings/debian/python-dcop-trinity.install
Unescape View File

@ -1 +0,0 @@
debian/tmp/usr/lib/python2.*/site-packages

0
dilos/core/tdebindings/debian/python-dcop-trinity.docs → dilos/core/tdebindings/debian/python3-dcop-trinity.docs
Unescape View File

0
dilos/core/tdebindings/debian/python-dcop-trinity.examples → dilos/core/tdebindings/debian/python3-dcop-trinity.examples
Unescape View File

1
dilos/core/tdebindings/debian/python3-dcop-trinity.install
Unescape View File

@ -0,0 +1 @@
debian/tmp/usr/lib/python3/dist-packages

8
dilos/core/tdebindings/debian/rules
Unescape View File

@ -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)
###

14
ubuntu/_base/core/tdebindings/debian/control
Unescape View File

@ -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

1
ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.install
Unescape View File

@ -1 +0,0 @@
debian/tmp/opt/trinity/lib/python2.*/site-packages

0
ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.docs → ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.docs
Unescape View File

0
ubuntu/_base/core/tdebindings/debian/python-dcop-trinity.examples → ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.examples
Unescape View File

1
ubuntu/_base/core/tdebindings/debian/python3-dcop-trinity.install
Unescape View File

@ -0,0 +1 @@
debian/tmp/opt/trinity/lib/python3/dist-packages

9
ubuntu/_base/core/tdebindings/debian/rules
Unescape View File

@ -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)
###

Write Preview
Loading…
Cancel
Save