diff options
Diffstat (limited to 'dilos/libraries')
33 files changed, 100 insertions, 407 deletions
diff --git a/dilos/libraries/libtdeldap/debian/cdbs/debian-tde.mk b/dilos/libraries/libtdeldap/debian/cdbs/debian-tde.mk index e2b1dc666..82994a844 100644 --- a/dilos/libraries/libtdeldap/debian/cdbs/debian-tde.mk +++ b/dilos/libraries/libtdeldap/debian/cdbs/debian-tde.mk @@ -82,7 +82,7 @@ DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$( DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include" -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el +DEB_COMPRESS_EXCLUDE_ALL += .dcl .docbook -license .tag .sty .el # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -202,6 +202,11 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: install -p -D -m644 debian/$(cdbs_curpkg).presubj \ debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ fi + if test -d debian/$(cdbs_curpkg)/usr/lib && \ + test $$(find debian/$(cdbs_curpkg)/usr/lib -name "*.so" | wc -l) -gt 0; then \ + echo "# Triggers added by cdbs/debian-tde.mk" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + echo "activate-noawait ldconfig" >> debian/.debhelper/generated/$(cdbs_curpkg)/triggers; \ + fi binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: set -e; \ diff --git a/dilos/libraries/libtdeldap/debian/compat b/dilos/libraries/libtdeldap/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/libraries/libtdeldap/debian/compat +++ b/dilos/libraries/libtdeldap/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/libraries/libtdeldap/debian/control b/dilos/libraries/libtdeldap/debian/control index 0bedee5d7..6c8ce3269 100644 --- a/dilos/libraries/libtdeldap/debian/control +++ b/dilos/libraries/libtdeldap/debian/control @@ -2,7 +2,7 @@ Source: libtdeldap-trinity Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libldap2-dev, heimdal-multidev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, libldap2-dev, heimdal-multidev Standards-Version: 3.8.4 Package: libtdeldap-trinity diff --git a/dilos/libraries/python-trinity/debian/NEWS.Debian b/dilos/libraries/pytde/debian/NEWS.Debian index 367c6950d..367c6950d 100644 --- a/dilos/libraries/python-trinity/debian/NEWS.Debian +++ b/dilos/libraries/pytde/debian/NEWS.Debian diff --git a/dilos/libraries/python-trinity/debian/changelog b/dilos/libraries/pytde/debian/changelog index 12485eccd..43df2609a 100644 --- a/dilos/libraries/python-trinity/debian/changelog +++ b/dilos/libraries/pytde/debian/changelog @@ -1,4 +1,4 @@ -python-trinity-trinity (3.16.3-0ubuntu4) karmic; urgency=low +pytde (3.16.3-0ubuntu4) karmic; urgency=low * Karmic rebuild diff --git a/dilos/libraries/pytde/debian/compat b/dilos/libraries/pytde/debian/compat new file mode 100644 index 000000000..f599e28b8 --- /dev/null +++ b/dilos/libraries/pytde/debian/compat @@ -0,0 +1 @@ +10 diff --git a/dilos/libraries/python-trinity/debian/control b/dilos/libraries/pytde/debian/control index 85cb1de20..b8859e4a1 100644 --- a/dilos/libraries/python-trinity/debian/control +++ b/dilos/libraries/pytde/debian/control @@ -1,44 +1,40 @@ -Source: python-trinity-trinity +Source: pytde Section: python Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org> Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> -Build-Depends: debhelper (>= 9~), libtqtinterface-dev, python-all, python-all-dev, python-all-dbg [!solaris-any], python-sip-tqt, python-sip-tqt-dev, python-sip-tqt-dbg [!solaris-any], python-tqt-dev, python-tqt-dbg [!solaris-any], tdelibs14-trinity-dev, dh-python +Build-Depends: debhelper (>= 10~), libtqtinterface-dev, dh-python, python3-all-dev, python3-all-dbg [!solaris-any], python3-sip-tqt, python3-sip-tqt-dev, python3-sip-tqt-dbg [!solaris-any], pytqt-dev, python3-pytqt-dbg [!solaris-any], tdelibs14-trinity-dev Standards-Version: 3.8.4 Homepage: http://www.riverbankcomputing.co.uk/pytde/index.php -Package: python-trinity-trinity +Package: python3-pytde Architecture: any -Depends: ${shlibs:Depends}, ${python:Depends}, python-tqt -Replaces: python-trinity-trinity (<< 4:14.0.0~) -Breaks: python-trinity-trinity (<< 4:14.0.0~) -Provides: ${python:Provides} -Conflicts: python-trinity-trinity -Description: Trinity bindings for Python [Trinity] +Depends: ${shlibs:Depends}, ${python3:Depends}, python3-pytqt +Breaks: python-trinity-trinity (<< 4:14.1.0~) +Provides: ${python3:Provides} +Description: Trinity bindings for Python 3 [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyTDE. Using this, you'll get (for example) classes from kio, kjs, tdehtml and kprint. -Package: python-trinity-trinity-dbg +Package: python3-pytde-dbg Priority: extra Architecture: linux-any -Replaces: python-trinity-trinity-dbg (<< 4:14.0.0~) -Breaks: python-trinity-trinity-dbg (<< 4:14.0.0~) -Depends: python-trinity-trinity (= ${binary:Version}), python-all-dbg, python-tqt-dbg, ${shlibs:Depends} -Description: Trinity bindings for Python (debug extensions) [Trinity] +Depends: python3-pytde (= ${binary:Version}), python3-all-dbg, python3-pytqt-dbg, ${shlibs:Depends} +Description: Trinity bindings for Python 3 (debug extensions) [Trinity] Python binding module that provides wide access to the Trinity API, also known as PyTDE. Using this, you'll get (for example) classes from kio, kjs, tdehtml and kprint. . This package contains the extension built for the Python debug interpreter. -Package: python-trinity-trinity-dev +Package: pytde-dev Section: python Architecture: all -Replaces: python-trinity-trinity-dev (<< 4:14.0.0~) -Breaks: python-trinity-trinity-dev (<< 4:14.0.0~) -Depends: pytqt-tools, ${python:Depends} +Replaces: python-trinity-trinity-dev (<< 4:14.1.0~) +Breaks: python-trinity-trinity-dev (<< 4:14.1.0~) +Depends: pytqt-tools, ${python3:Depends} Description: Trinity bindings for Python - Development files and scripts [Trinity] Development .sip files with definitions of PyTDE classes. They are needed to build PyTDE, but also as building blocks of other @@ -46,11 +42,11 @@ Description: Trinity bindings for Python - Development files and scripts [Trinit The package also contains tdepyuic, a wrapper script around PyTQt's user interface compiler. -Package: python-trinity-trinity-doc +Package: pytde-doc Section: doc Architecture: all -Replaces: python-trinity-trinity-doc (<< 4:14.0.0~) -Breaks: python-trinity-trinity-doc (<< 4:14.0.0~) +Replaces: python-trinity-trinity-doc (<< 4:14.1.0~) +Breaks: python-trinity-trinity-doc (<< 4:14.1.0~) Description: Documentation and examples for PyTDE [Trinity] General documentation and examples for PyTDE providing programming tips and working code you can use to learn from. diff --git a/dilos/libraries/python-trinity/debian/copyright b/dilos/libraries/pytde/debian/copyright index eec6b36a5..eec6b36a5 100644 --- a/dilos/libraries/python-trinity/debian/copyright +++ b/dilos/libraries/pytde/debian/copyright diff --git a/dilos/libraries/python-trinity/debian/patches/.gitignore b/dilos/libraries/pytde/debian/patches/.gitignore index e69de29bb..e69de29bb 100644 --- a/dilos/libraries/python-trinity/debian/patches/.gitignore +++ b/dilos/libraries/pytde/debian/patches/.gitignore diff --git a/dilos/libraries/pytde/debian/pytde-dev.dirs b/dilos/libraries/pytde/debian/pytde-dev.dirs new file mode 100644 index 000000000..d4b26d5db --- /dev/null +++ b/dilos/libraries/pytde/debian/pytde-dev.dirs @@ -0,0 +1 @@ +usr/share/sip-tqt/trinity diff --git a/dilos/libraries/pytde/debian/pytde-dev.install b/dilos/libraries/pytde/debian/pytde-dev.install new file mode 100644 index 000000000..224c18bd2 --- /dev/null +++ b/dilos/libraries/pytde/debian/pytde-dev.install @@ -0,0 +1,2 @@ +sip/* usr/share/sip-tqt/trinity +contrib/tdepyuic usr/bin/ diff --git a/dilos/libraries/pytde/debian/pytde-doc.dirs b/dilos/libraries/pytde/debian/pytde-doc.dirs new file mode 100644 index 000000000..190e712a3 --- /dev/null +++ b/dilos/libraries/pytde/debian/pytde-doc.dirs @@ -0,0 +1,3 @@ +usr/share/doc/pytde-doc +usr/share/doc/pytde-doc/examples +usr/share/doc/pytde-doc/html diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base b/dilos/libraries/pytde/debian/pytde-doc.doc-base index bb9705168..4429e7518 100644 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.doc-base +++ b/dilos/libraries/pytde/debian/pytde-doc.doc-base @@ -8,5 +8,5 @@ Abstract: This documentation describes the PyTDE API Section: Programming Format: HTML -Index: /usr/share/doc/python-trinity-trinity-doc/html/index.html -Files: /usr/share/doc/python-trinity-trinity-doc/html/*.html +Index: /usr/share/doc/pytde-doc/html/index.html +Files: /usr/share/doc/pytde-doc/html/*.html diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.examples b/dilos/libraries/pytde/debian/pytde-doc.examples index e39721e20..e39721e20 100644 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.examples +++ b/dilos/libraries/pytde/debian/pytde-doc.examples diff --git a/dilos/libraries/pytde/debian/pytde-doc.install b/dilos/libraries/pytde/debian/pytde-doc.install new file mode 100644 index 000000000..484ad91a4 --- /dev/null +++ b/dilos/libraries/pytde/debian/pytde-doc.install @@ -0,0 +1 @@ +doc/* usr/share/doc/pytde-doc/html diff --git a/dilos/libraries/pytde/debian/pytdeconfig.py b/dilos/libraries/pytde/debian/pytdeconfig.py new file mode 100644 index 000000000..c12c20788 --- /dev/null +++ b/dilos/libraries/pytde/debian/pytdeconfig.py @@ -0,0 +1,17 @@ +# import the sipconfig.py for the normal or the debug build + +import os +import sys +import sysconfig + +sys.path.insert(0, os.path.join(sysconfig.get_path('platstdlib'), 'dist-packages')) + +if 'd' in sys.abiflags: + try: + from pytdeconfig_d import * + from pytdeconfig_d import _pkg_config, _default_macros + except ImportError as msg: + raise ImportError('No module named pytdeconfig; package python3-pytde-dbg not installed') +else: + from pytdeconfig_nd import * + from pytdeconfig_nd import _pkg_config, _default_macros diff --git a/dilos/libraries/pytde/debian/python3-pytde.install b/dilos/libraries/pytde/debian/python3-pytde.install new file mode 100644 index 000000000..a3546ced0 --- /dev/null +++ b/dilos/libraries/pytde/debian/python3-pytde.install @@ -0,0 +1,2 @@ +usr/lib/python3*/*-packages/*.so +usr/lib/python3*/*-packages/dcop*.py diff --git a/dilos/libraries/python-trinity/debian/rules b/dilos/libraries/pytde/debian/rules index 3bae8384b..40e46f0ad 100755 --- a/dilos/libraries/python-trinity/debian/rules +++ b/dilos/libraries/pytde/debian/rules @@ -1,11 +1,8 @@ #!/usr/bin/make -f -# -*- makefile -*- # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - DEB_CONFIGURE_INCLUDEDIR := /usr/include DEB_CONFIGURE_MANDIR := /usr/share/man DEB_CONFIGURE_PREFIX := /usr @@ -23,10 +20,22 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) endif -# This has to be exported to make some magic below work. +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 -export QTDIR=/usr/share/qt3 -export QMAKESPEC=$(QTDIR)/mkspecs/dilos-g++ + +-include /usr/share/python3/python.mk +ifeq (,$(py_sitename)) +py_sitename = site-packages +py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages +py_sitename_sh = $(py_sitename) +py_libdir_sh = $(py_libdir) +endif + +export TQTDIR=/usr/share/tqt3 +export QMAKESPEC=$(TQTDIR)/mkspecs/dilos-g++ CXXFLAGS = -Wall -g @@ -36,10 +45,7 @@ else CXXFLAGS += -O2 endif -PYTHONS := $(shell pyversions -vr debian/control) -#DBG_PYTHONS := $(shell pyversions -vd) - -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python) +PYTHONS := $(shell py3versions -vr) GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p') ifneq (,$(filter $(GCCVER),4.2 4.3)) @@ -52,15 +58,15 @@ endif # dbg-build-%/configure-stamp configure: $(PYTHONS:%=build-%/configure-stamp) -# $(DBG_PYTHONS:%=dbg-build-%/configure-stamp) +# $(PYTHONS:%=dbg-build-%/configure-stamp) build-%/configure-stamp: dh_testdir mkdir -p build-$* cd build-$* && python$* ../configure.py \ -c -u -k /usr -o /usr/include -n /usr/lib/$(DEB_HOST_MULTIARCH) \ - -e python$* \ - -v /usr/share/sip/trinity -j $(SPLIT) + -d /usr/lib/python$*/$(call py_sitename,$*) \ + -v /usr/share/sip-tqt/trinity -j $(SPLIT) touch $@ dbg-build-%/configure-stamp: @@ -68,12 +74,12 @@ dbg-build-%/configure-stamp: mkdir -p dbg-build-$* cd dbg-build-$* && python$*-dbg ../configure.py \ -c -u -k /usr -o /usr/include -n /usr/lib \ - -e python$* \ - -v /usr/share/sip/trinity -j $(SPLIT) + -d /usr/lib/python$*/$(call py_sitename,$*) \ + -v /usr/share/sip-tqt/trinity -j $(SPLIT) touch $@ build build-arch: $(PYTHONS:%=build-%/build-stamp) -# $(DBG_PYTHONS:%=dbg-build-%/build-stamp) +# $(PYTHONS:%=dbg-build-%/build-stamp) build-indep: build-%/build-stamp: build-%/configure-stamp @@ -90,7 +96,7 @@ clean: dh_testdir dh_testroot rm -f *-stamp - rm -rf $(PYTHONS:%=build-%) $(DBG_PYTHONS:%=dbg-build-%) + rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%) # remove autogenerated *mod.sip files and clean up sources for moddir in sip/*;\ @@ -111,14 +117,12 @@ install-indep: dh_install -i -X'\.diff$$' -X'\.in$$' -X'\.html$$' for version in ${PYTHONS};\ do\ - mkdir -p debian/python-trinity-trinity-dev/usr/lib/python-$$version/site-packages;\ - cp debian/pytdeconfig.py debian/python-trinity-trinity-dev/usr/lib/python-$$version/site-packages/;\ - cp build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/usr/lib/python-$$version/site-packages/pytdeconfig_nd.py;\ + pylib=$$(python$$version -c "import sysconfig; print(sysconfig.get_path('platstdlib'))");\ + mkdir -p debian/pytde-dev/$$pylib;\ + install -m 644 -o root -g root debian/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig.py;\ + install -m 644 -o root -g root build-$$version/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig_nd.py;\ done -# for version in ${DBG_PYTHONS};\ -# do\ -# cp dbg-build-$$version/pytdeconfig.py debian/python-trinity-trinity-dev/usr/lib/python-$$version/site-packages/pytdeconfig_d.py;\ -# done +# install -m 644 -o root -g root dbg-build-$$version/pytdeconfig.py debian/pytde-dev/$$pylib/pytdeconfig_d.py;\ install-arch: dh_testdir @@ -130,23 +134,19 @@ install-arch: do\ $(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp;\ done - -# set -e; \ -# for version in ${DBG_PYTHONS}; do \ -# $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-trinity-trinity-dbg;\ -# done +# $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python3-pytde-dbg;\ dh_install -a --sourcedir=$(CURDIR)/debian/tmp - mkdir -p $(CURDIR)/debian/python-trinity-trinity/usr/lib/$(DEB_HOST_MULTIARCH) - ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/trinity/libkonsolepart.so $(CURDIR)/debian/python-trinity-trinity/usr/lib/$(DEB_HOST_MULTIARCH) -# for i in $$(find debian/python-*-dbg -name '*.so'); do \ + mkdir -p $(CURDIR)/debian/python3-pytde/usr/lib/$(DEB_HOST_MULTIARCH) + ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/trinity/libkonsolepart.so $(CURDIR)/debian/python3-pytde/usr/lib/$(DEB_HOST_MULTIARCH) +# for i in $$(find debian/python3-*-dbg -name '*.so'); do \ # b=$$(basename $$i .so); \ # mv $$i $$(dirname $$i)/$${b}_d.so; \ # done -# find debian/python-*-dbg ! -type d \ +# find debian/python3-*-dbg ! -type d \ # ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f -# find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \; +# find debian/python3-*-dbg -depth -type d -empty -exec rmdir {} \; # Must not depend on anything. This is to be called by @@ -160,11 +160,11 @@ binary-common: dh_installexamples dh_link ifeq (,$(findstring -i, $(DH_OPTIONS))) - DH_OPTIONS= dh_strip -ppython-trinity-trinity #--dbg-package=python-trinity-trinity-dbg + DH_OPTIONS= dh_strip -ppython3-pytde #--dbg-package=python3-pytde-dbg endif dh_compress -X.py -X.ui -X.dtd dh_fixperms - ${DH_PYTHON2} + dh_python3 --no-dbg-cleaning --shebang=/usr/bin/python3 dh_installdeb dh_shlibdeps -l /usr/lib/$(DEB_HOST_MULTIARCH) dh_gencontrol diff --git a/dilos/libraries/python-trinity/debian/source/format b/dilos/libraries/pytde/debian/source/format index 163aaf8d8..163aaf8d8 100644 --- a/dilos/libraries/python-trinity/debian/source/format +++ b/dilos/libraries/pytde/debian/source/format diff --git a/dilos/libraries/python-trinity/debian/source/options b/dilos/libraries/pytde/debian/source/options index 72f1f5450..72f1f5450 100644 --- a/dilos/libraries/python-trinity/debian/source/options +++ b/dilos/libraries/pytde/debian/source/options diff --git a/dilos/libraries/pytdeextensions/debian/compat b/dilos/libraries/pytdeextensions/debian/compat index ec635144f..f599e28b8 100644 --- a/dilos/libraries/pytdeextensions/debian/compat +++ b/dilos/libraries/pytdeextensions/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/dilos/libraries/pytdeextensions/debian/control b/dilos/libraries/pytdeextensions/debian/control index 48386f4de..bd6fc8f4d 100644 --- a/dilos/libraries/pytdeextensions/debian/control +++ b/dilos/libraries/pytdeextensions/debian/control @@ -3,18 +3,18 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org> -Build-Depends: cdbs, debhelper (>= 9~), chrpath [!solaris-any], quilt, tdelibs14-trinity, libtool-bin | libtool (<< 2.4.2-1.11), libtool, - libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity, - python-tqt-dev, python-sip-tqt-dev, python-support (>= 0.6) | dh-python, python-all, python-all-dev +Build-Depends: cdbs, debhelper (>= 10~), chrpath [!solaris-any], quilt, tdelibs-trinity, libtool-bin, libtool, + libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python3-pytde, + pytqt-dev, python3-sip-tqt-dev, dh-python, python3-all, python3-all-dev Standards-Version: 3.8.4 Package: pytdeextensions-trinity Architecture: all -Depends: ${python:Depends} +Depends: ${python3:Depends} Replaces: pykdeextensions-trinity (<< 4:14.0.0~) Breaks: pykdeextensions-trinity (<< 4:14.0.0~) Conflicts: pykdeextensions -Provides: ${python:Provides} +Provides: ${python3:Provides} Description: Python packages to support TDE applications (scripts) [Trinity] PyTDE Extensions is a collection of software and Python packages to support the creation and installation of TDE applications. @@ -26,7 +26,7 @@ Architecture: any Section: libdevel Replaces: libpythonize0-trinity-dev (<< 4:14.0.0~) Breaks: libpythonize0-trinity-dev (<< 4:14.0.0~) -Depends: libpythonize0-trinity (= ${binary:Version}), python-all-dev +Depends: libpythonize0-trinity (= ${binary:Version}), python3-all-dev Description: Python packages to support TDE applications (development) [Trinity] PyTDE Extensions is a collection of software and Python packages to support the creation and installation of TDE applications. diff --git a/dilos/libraries/pytdeextensions/debian/python-distutils-jaunty.mk b/dilos/libraries/pytdeextensions/debian/python-distutils-jaunty.mk deleted file mode 100644 index 8b238c772..000000000 --- a/dilos/libraries/pytdeextensions/debian/python-distutils-jaunty.mk +++ /dev/null @@ -1,297 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2003 Colin Walters <walters@debian.org> -# Copyright © 2006 Marc Dequènes (Duck) <Duck@DuckCorp.org> -# -# Description: manage Python public modules build -# This class is designed to work with Python packages using the -# 'distutils' build system and comply to the new policy established -# during summer 2006. Use of the debhelper class to make use of the -# new dh_python is strongly advised. (This is still left as optional -# in line with CDBS' flexible behavior.) -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2, or (at -# your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02111-1307 USA. -# - -# This class provides rules for old and new Python policy. Leaving -# DEB_PYTHON_SYSTEM unset selects the old behavior. The pysupport and -# pycentral methods are available to comply with new policy. Don't forget -# to update your 'debian/control'. (Build-Depends are correctly generated -# if you are using the auto control generation feature.) - -# Once all old-style packages are removed before etch, some of the old -# can be refactored or removed. - - -_cdbs_scripts_path ?= /usr/lib/cdbs -_cdbs_rules_path ?= /usr/share/cdbs/1/rules -_cdbs_class_path ?= /usr/share/cdbs/1/class - -ifndef _cdbs_class_python_distutils -_cdbs_class_python_distutils = 1 - -include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) -include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix) - - -# check python system -cdbs_use_xs_field := $(shell grep -q "^XS-Python-Version:" debian/control && echo yes) -cdbs_selected_pycompat := $(shell if [ -e debian/pycompat ]; then cat debian/pycompat; fi) -cdbs_pycompat = $(cdbs_selected_pycompat) -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) - cdbs_python_support_path = usr/share/python-support/$(DEB_PYTHON_MODULE_PACKAGE) - ifeq (, $(cdbs_selected_pycompat)) - cdbs_pycompat = 2 - endif # use pycompat - # warning pysupport compatibility mode - ifneq (, $(cdbs_use_xs_field)) - $(warning WARNING: Use of XS-Python-Version and XB-Python-Version fields in debian/control is deprecated with pysupport method; use debian/pyversions if you need to specify specific versions.) - endif # use XS field (compat) -else - ifeq (pycentral, $(DEB_PYTHON_SYSTEM)) - ifeq (, $(cdbs_selected_pycompat)) - cdbs_pycompat = 2 - endif # use pycompat - else - ifneq (, $(DEB_PYTHON_SYSTEM)) - $(error unsupported Python system: $(DEB_PYTHON_SYSTEM) (select either pysupport or pycentral)) - else - ifneq (, $(cdbs_use_xs_field)) - $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral") - endif - ifneq (, $(cdbs_selected_pycompat)) - ifeq (yes, $(shell expr $(cdbs_selected_pycompat) \> 1 >/dev/null && echo yes)) - $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral") - endif - endif # use pycompat - endif # unknown method - endif # pycentral -endif # pysupport - - -ifndef DEB_PYTHON_SYSTEM -DEB_PYTHON_COMPILE_VERSION = -DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6 2.7 -else -# default package is the first one declared in 'debian/control' -# (override if necessary) -DEB_PYTHON_MODULE_PACKAGE = $(firstword $(filter-out %-doc %-dev %-common, $(DEB_PACKAGES))) -DEB_PYTHON_PRIVATE_MODULES_DIRS = -endif - -# common variables -DEB_PYTHON_SETUP_CMD = setup.py -DEB_PYTHON_CLEAN_ARGS = -a -DEB_PYTHON_BUILD_ARGS = --build-base="$(CURDIR)/$(DEB_BUILDDIR)/build" -DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0 --prefix=/usr - - -ifndef DEB_PYTHON_SYSTEM -########################### old policy method ########################### - -$(warning =======================================================) -$(warning Your package does not conform to the new Python policy.) -$(warning Please consider updating. Here is some documentation:) -$(warning http://wiki.debian.org/DebianPython/NewPolicy) -$(warning http://wiki.debian.org/DebianPythonFAQ) -$(warning =======================================================) - -# make: *** No rule to make target `voodoo'. Stop. -DEB_PYTHON_REAL_LIB_PACKAGES = $(strip $(filter $(patsubst %,python%%,$(DEB_PYTHON_VERSIONS)),$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES)))) -# If no versioned python library packages found, grab all simpler ones -ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES)) -DEB_PYTHON_SIMPLE_PACKAGES = $(strip $(filter python-%,$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES)))) -endif - -cdbs_python_ver = $(filter-out -%,$(subst -, -,$(patsubst python%,%,$(cdbs_curpkg)))) - -common-build-arch common-build-indep:: common-build-impl -common-build-impl:: - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS) - - -# See if this package doesn't appear to need to be compiled by multiple -# Python versions. -ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES)) -common-install-arch common-install-indep:: common-install-impl -common-install-impl:: - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)) - for ddir in $(DEB_DESTDIR)/usr/lib/python?.?/dist-packages; do \ - sdir=$$(dirname $$ddir)/site-packages; \ - mkdir -p $$sdir; \ - tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \ - rm -rf $$ddir; \ - done -else -$(patsubst %,install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: install/% : - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)) - for ddir in $(CURDIR)/debian/$(cdbs_curpkg)/usr/lib/python?.?/dist-packages; do \ - sdir=$$(dirname $$ddir)/site-packages; \ - mkdir -p $$sdir; \ - tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \ - rm -rf $$ddir; \ - done -endif - -$(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% : - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) python $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg)) -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) - for ddir in $(CURDIR)/debian/$(cdbs_curpkg)/usr/lib/python?.?/dist-packages; do \ - sdir=$$(dirname $$ddir)/site-packages; \ - mkdir -p $$sdir; \ - tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \ - rm -rf $$ddir; \ - done -endif - -# This class can optionally utilize debhelper's "dh_python" command. Just -# be sure you include debhelper.mk before including this file. -ifdef _cdbs_rules_debhelper - -DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python) - -$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: - ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) -endif - - -# Ignore errors from this rule. In a tarball build, the file may not -# exist. -ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES)) -clean:: - -python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS) -else -clean:: $(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) - -$(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: python-cleanbuilddir/% : - -python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS) -endif - -else -########################## new policy methods ########################### - -# Calculate cdbs_python_build_versions -cdbs_python_module_arch := $(strip $(shell perl -e '$$/=""; $$_=(grep {/^Package: $(DEB_PYTHON_MODULE_PACKAGE)$$/m;} (<>))[0]; /^Architecture: (.*)$$/m && print $$1' debian/control)) -cdbs_python_current_version := $(shell pyversions -vd) -ifeq (all, $(cdbs_python_module_arch)) - # check if current is in build versions - ifneq ($(cdbs_python_current_version), $(filter $(cdbs_python_current_version), $(shell pyversions -vr))) - cdbs_python_compile_version := $(firstword $(strip $(sort $(shell pyversions -vr)))) - cdbs_python_build_versions := $(cdbs_python_compile_version) - else - cdbs_python_build_versions := $(cdbs_python_current_version) - endif -else -cdbs_python_build_versions := $(shell pyversions -vr) -endif # archall - -# check if build is possible -ifeq (, $(cdbs_python_build_versions)) -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) -$(error invalid setting in debian/pyversions) -else -$(error invalid setting for XS-Python-Version) -endif # system selected -endif # build versions empty - - -# Declare Build-Deps for packages using this file -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.37.2), cdbs (>= 0.4.43) -ifeq (all, $(cdbs_python_module_arch)) - ifneq (, $(cdbs_python_compile_version)) - CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python$(cdbs_python_compile_version)-dev, python (>= 2.3.5-11) - else - CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-dev (>= 2.3.5-11) - endif -else -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-all-dev (>= 2.3.5-11) -endif -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-support (>= 0.3.2) -else -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-central (>= 0.6) -endif - - -cdbs_python_current_binary := $(shell pyversions -d) -cdbs_python_binary = $(if $(call cdbs_streq,$(cdbs_python_current_binary),$(1)),python,$(1)) - -# build stage -common-build-arch common-build-indep:: $(addprefix python-build-stamp-, $(cdbs_python_build_versions)) -python-build-stamp-%: -ifeq (all, $(cdbs_python_module_arch)) - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS) -else - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS) -endif # archall detection - touch $@ - - -# install stage -ifeq (all, $(cdbs_python_module_arch)) -common-install-arch common-install-indep:: python-install-py -python-install-py: - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) -else -common-install-arch common-install-indep:: $(addprefix python-install-, $(cdbs_python_build_versions)) -python-install-%: - cd $(DEB_SRCDIR) && PATH=/usr/bin:$(PATH) $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) -endif # archall detection - - -# This class can optionally use debhelper's commands. Just -# be sure you include debhelper.mk before including this file. -ifdef _cdbs_rules_debhelper - -DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_python) - -$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) - dh_pysupport -p$(cdbs_curpkg) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) -else - dh_pycentral -p$(cdbs_curpkg) -endif - ${DH_PYTHON2} -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS) -endif - - -# clean stage -clean:: $(addprefix python-clean-, $(cdbs_python_build_versions)) -python-clean-%: -ifeq (all, $(cdbs_python_module_arch)) - -cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS) -else - -cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS) -endif # archall detection - -clean:: -ifeq (, $(cdbs_selected_pycompat)) - echo "$(cdbs_pycompat)" >debian/pycompat -endif # use pycompat - rm -f python-build-stamp-* - -endif - - -########################## all policy methods ########################### - -# Calling setup.py clean may create .pyc files, so we need a final cleanup -# pass here. -clean:: - find . -name '*.pyc' -exec rm '{}' ';' - -endif diff --git a/dilos/libraries/pytdeextensions/debian/pyversions b/dilos/libraries/pytdeextensions/debian/pyversions deleted file mode 100644 index 0c043f18c..000000000 --- a/dilos/libraries/pytdeextensions/debian/pyversions +++ /dev/null @@ -1 +0,0 @@ -2.6- diff --git a/dilos/libraries/pytdeextensions/debian/rules b/dilos/libraries/pytdeextensions/debian/rules index 009b362ca..9f24adcf1 100755 --- a/dilos/libraries/pytdeextensions/debian/rules +++ b/dilos/libraries/pytdeextensions/debian/rules @@ -1,17 +1,11 @@ #!/usr/bin/make -f -DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) -DEB_PYTHON2_MODULE_PACKAGES=pytdeextensions-trinity libpythonize0-trinity +DEB_PYTHON3_MODULE_PACKAGES=pytdeextensions-trinity libpythonize0-trinity DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) include /usr/share/cdbs/1/rules/debhelper.mk -ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) - include debian/python-distutils-jaunty.mk -else - include /usr/share/cdbs/1/class/python-distutils.mk -endif -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/class/python-distutils.mk include /usr/share/cdbs/1/rules/utils.mk DEB_CONFIGURE_INCLUDEDIR := /usr/include @@ -40,12 +34,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) endif -post-patches:: - # make sure that python binary exists - # since the existing code is still dependent on python2 - # and cdbs uses python as the default binary name - test -x /usr/bin/python || ln -s python2 /usr/bin/python - install/pytdeextensions-trinity:: # We have no idea if the built product is site-packages or dist-packages cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages" diff --git a/dilos/libraries/python-trinity/debian/compat b/dilos/libraries/python-trinity/debian/compat deleted file mode 100644 index ec635144f..000000000 --- a/dilos/libraries/python-trinity/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/dilos/libraries/python-trinity/debian/pytdeconfig.py b/dilos/libraries/python-trinity/debian/pytdeconfig.py deleted file mode 100644 index eac264752..000000000 --- a/dilos/libraries/python-trinity/debian/pytdeconfig.py +++ /dev/null @@ -1,11 +0,0 @@ -# import the sipconfig.py for the normal or the debug build - -import sys - -if getattr(sys, "pydebug", False): - try: - from pytdeconfig_d import * - except ImportError, msg: - raise ImportError, 'No module named pytdeconfig; package python-trinity-dbg not installed' -else: - from pytdeconfig_nd import * diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs b/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs deleted file mode 100644 index be8aad160..000000000 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/sip/trinity diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.install b/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.install deleted file mode 100644 index c523f227e..000000000 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-dev.install +++ /dev/null @@ -1,2 +0,0 @@ -sip/* usr/share/sip/trinity -contrib/tdepyuic usr/bin/ diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs b/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs deleted file mode 100644 index 96235463f..000000000 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/share/doc/python-trinity-trinity-doc -usr/share/doc/python-trinity-trinity-doc/examples -usr/share/doc/python-trinity-trinity-doc/html diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.install b/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.install deleted file mode 100644 index 20b273acb..000000000 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity-doc.install +++ /dev/null @@ -1 +0,0 @@ -doc/* usr/share/doc/python-trinity-trinity-doc/html diff --git a/dilos/libraries/python-trinity/debian/python-trinity-trinity.install b/dilos/libraries/python-trinity/debian/python-trinity-trinity.install deleted file mode 100644 index facee2907..000000000 --- a/dilos/libraries/python-trinity/debian/python-trinity-trinity.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/python*/*-packages/*.so -usr/lib/python*/*-packages/dcop*.py - diff --git a/dilos/libraries/python-trinity/debian/watch b/dilos/libraries/python-trinity/debian/watch deleted file mode 100644 index 8b3afcac0..000000000 --- a/dilos/libraries/python-trinity/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 - -http://www.riverbankcomputing.com/Downloads/PyTrinity/PyKDE-(.*)\.tar\.bz2 |