Switch to dh_python2 (or dh_pysupport as fallback) on Debian and Ubuntu

(cherry picked from commit 2d0d0ba99b)
v3.5.13-sru
Slávek Banko 11 years ago
parent 0f086e7174
commit 969208d92e

@ -2,7 +2,7 @@ Source: desktop-effects-kde-trinity
Section: kde Section: kde
Priority: optional Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 5.0.38), python-central (>= 0.5.6) Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 5.0.38), python-support (>= 0.6) | python-dev (>= 2.6.6-3~)
Standards-Version: 3.8.4 Standards-Version: 3.8.4
XS-Python-Version: all XS-Python-Version: all

@ -1,5 +1,8 @@
#!/usr/bin/make -f #!/usr/bin/make -f
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 include /usr/share/cdbs/1/rules/debhelper.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
@ -13,4 +16,4 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2) && echo xz || echo bzip2)
binary-install/desktop-effects-kde-trinity:: binary-install/desktop-effects-kde-trinity::
dh_pycentral -pdesktop-effects-kde-trinity ${DH_PYTHON2} -pdesktop-effects-kde-trinity

@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org> Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
XS-Python-Version: all XS-Python-Version: all
Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), pkg-config, python-all-dev Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), pkg-config, python-all-dev
Build-Depends-Indep: python-central (>= 0.6.0), intltool Build-Depends-Indep: python-support (>= 0.6), intltool
Standards-Version: 3.8.4 Standards-Version: 3.8.4
Package: fusion-icon-trinity Package: fusion-icon-trinity

@ -1,6 +1,6 @@
#!/usr/bin/make -f #!/usr/bin/make -f
DEB_PYTHON_SYSTEM=pycentral DEB_PYTHON_SYSTEM=pysupport
include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/debhelper.mk
# include /usr/share/cdbs/1/class/python-distutils.mk # include /usr/share/cdbs/1/class/python-distutils.mk
@ -17,5 +17,5 @@ binary-install/fusion-icon-trinity::
mkdir -p debian/fusion-icon-trinity/opt/trinity mkdir -p debian/fusion-icon-trinity/opt/trinity
cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/ cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/
rm -rf debian/fusion-icon-trinity/usr rm -rf debian/fusion-icon-trinity/usr
dh_pycentral -pfusion-icon-trinity dh_pysupport -pfusion-icon-trinity
dh_icons dh_icons

@ -1,6 +1,6 @@
Source: kdebindings-trinity Source: kdebindings-trinity
Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5), Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5),
python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk, python-dev (>= 2.3.5-11), python-support (>= 0.5) | python-dev (>= 2.6.6-3~), quilt, gawk,
gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc], gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc],
kdelibs4-trinity-dev (>= 4:3.5.9), libqt3-compat-headers (>= 3:3.3.5), kdelibs4-trinity-dev (>= 4:3.5.9), libqt3-compat-headers (>= 3:3.3.5),
ruby, ruby-dev, flex, bison, ruby, ruby-dev, flex, bison,

@ -3,6 +3,9 @@
DEB_QUILT_PATCHDIR_LINK := DEB_QUILT_PATCHDIR_LINK :=
export QUILT_PATCHES=debian/patches 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 include /usr/share/cdbs/1/rules/debhelper.mk
override DEB_BUILDDIR := $(DEB_SRCDIR) override DEB_BUILDDIR := $(DEB_SRCDIR)
@ -131,7 +134,7 @@ binary-install/libqt0-ruby1.8-trinity::
mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
binary-install/python-dcop-trinity:: binary-install/python-dcop-trinity::
dh_pysupport -p$(cdbs_curpkg) ${DH_PYTHON2} -p$(cdbs_curpkg)
### ###

@ -1,10 +1,10 @@
pykdeextensions: desktop-entry-contains-unknown-key ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB] pykdeextensions-trinity: desktop-entry-contains-unknown-key ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB]
pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop kcmshell pykdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop kcmshell
pykdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop pykdeextensions-trinity: desktop-entry-invalid-category QT ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
pykdeextensions: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop pykdeextensions-trinity: desktop-entry-invalid-category X-KDE-settings-system ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
pykdeextensions: desktop-entry-lacks-main-category ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop pykdeextensions-trinity: desktop-entry-lacks-main-category ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$ pykdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pykdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$
pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$ pykdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pykdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$
pykdeextensions: executable-not-elf-or-script ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py pykdeextensions-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py
pykdeextensions: executable-not-elf-or-script ./usr/share/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py pykdeextensions-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py

@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.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> Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), kdelibs4-trinity-dev, python-central (>= 0.6.11), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev Build-Depends: debhelper (>= 5.0.38), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), kdelibs4-trinity-dev, python-support (>= 0.6) | python-dev (>= 2.6.6-3~), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev
Standards-Version: 3.8.4 Standards-Version: 3.8.4
Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php
XS-Python-Version: all XS-Python-Version: all

@ -31,6 +31,9 @@ endif
PYTHONS := $(shell pyversions -vr debian/control) PYTHONS := $(shell pyversions -vr debian/control)
DBG_PYTHONS := $(shell pyversions -vd) DBG_PYTHONS := $(shell pyversions -vd)
DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p') GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
ifneq (,$(filter $(GCCVER),4.2 4.3)) ifneq (,$(filter $(GCCVER),4.2 4.3))
SPLIT=20 SPLIT=20
@ -149,7 +152,7 @@ ifeq (,$(findstring -i, $(DH_OPTIONS)))
endif endif
dh_compress -X.py -X.ui -X.dtd dh_compress -X.py -X.ui -X.dtd
dh_fixperms dh_fixperms
DH_PYCENTRAL=nomove dh_pycentral ${DH_PYTHON2}
dh_installdeb dh_installdeb
dh_shlibdeps -l /opt/trinity/lib dh_shlibdeps -l /opt/trinity/lib
dh_gencontrol dh_gencontrol

@ -2,7 +2,7 @@ Source: desktop-effects-kde-trinity
Section: kde Section: kde
Priority: optional Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 5.0.38), quilt, python-central (>= 0.5.6) Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 5.0.38), quilt, python-support (>= 0.6) | python-dev (>= 2.6.6-3~)
Standards-Version: 3.8.4 Standards-Version: 3.8.4
XS-Python-Version: all XS-Python-Version: all

@ -1,5 +1,8 @@
#!/usr/bin/make -f #!/usr/bin/make -f
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 include /usr/share/cdbs/1/rules/debhelper.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
@ -13,4 +16,4 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2) && echo xz || echo bzip2)
binary-install/desktop-effects-kde-trinity:: binary-install/desktop-effects-kde-trinity::
dh_pycentral -pdesktop-effects-kde-trinity ${DH_PYTHON2} -pdesktop-effects-kde-trinity

@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org> Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
XS-Python-Version: all XS-Python-Version: all
Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), quilt, pkg-config, python-all-dev Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), quilt, pkg-config, python-all-dev
Build-Depends-Indep: python-central (>= 0.6.0), intltool Build-Depends-Indep: python-support (>= 0.6), intltool
Standards-Version: 3.8.4 Standards-Version: 3.8.4
Package: fusion-icon-trinity Package: fusion-icon-trinity

@ -1,6 +1,6 @@
#!/usr/bin/make -f #!/usr/bin/make -f
DEB_PYTHON_SYSTEM=pycentral DEB_PYTHON_SYSTEM=pysupport
include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/debhelper.mk
# include /usr/share/cdbs/1/class/python-distutils.mk # include /usr/share/cdbs/1/class/python-distutils.mk
@ -17,5 +17,5 @@ binary-install/fusion-icon-trinity::
mkdir -p debian/fusion-icon-trinity/opt/trinity mkdir -p debian/fusion-icon-trinity/opt/trinity
cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/ cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/
rm -rf debian/fusion-icon-trinity/usr rm -rf debian/fusion-icon-trinity/usr
dh_pycentral -pfusion-icon-trinity dh_pysupport -pfusion-icon-trinity
dh_icons dh_icons

@ -1,6 +1,6 @@
Source: kdebindings-trinity Source: kdebindings-trinity
Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5), Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5),
python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk, python-dev (>= 2.3.5-11), python-support (>= 0.5) | python-dev (>= 2.6.6-3~), quilt, gawk,
gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc], gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc],
kdelibs4-trinity-dev (>= 4:3.5.9), libqt3-compat-headers (>= 3:3.3.5), kdelibs4-trinity-dev (>= 4:3.5.9), libqt3-compat-headers (>= 3:3.3.5),
ruby, ruby-dev, flex, bison, ruby, ruby-dev, flex, bison,

@ -3,6 +3,9 @@
DEB_QUILT_PATCHDIR_LINK := DEB_QUILT_PATCHDIR_LINK :=
export QUILT_PATCHES=debian/patches 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 include /usr/share/cdbs/1/rules/debhelper.mk
override DEB_BUILDDIR := $(DEB_SRCDIR) override DEB_BUILDDIR := $(DEB_SRCDIR)
@ -131,7 +134,7 @@ binary-install/libqt0-ruby1.8-trinity::
mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
binary-install/python-dcop-trinity:: binary-install/python-dcop-trinity::
dh_pysupport -p$(cdbs_curpkg) ${DH_PYTHON2} -p$(cdbs_curpkg)
### ###

@ -1,10 +1,10 @@
pykdeextensions: desktop-entry-contains-unknown-key ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB] pykdeextensions-trinity: desktop-entry-contains-unknown-key ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB]
pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop kcmshell pykdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop kcmshell
pykdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop pykdeextensions-trinity: desktop-entry-invalid-category QT ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
pykdeextensions: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop pykdeextensions-trinity: desktop-entry-invalid-category X-KDE-settings-system ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
pykdeextensions: desktop-entry-lacks-main-category ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop pykdeextensions-trinity: desktop-entry-lacks-main-category ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$ pykdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pykdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$
pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$ pykdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pykdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$
pykdeextensions: executable-not-elf-or-script ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py pykdeextensions-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py
pykdeextensions: executable-not-elf-or-script ./usr/share/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py pykdeextensions-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py

@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.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> Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
Build-Depends: debhelper (>= 5.0.38), quilt, libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), kdelibs4-trinity-dev, python-central (>= 0.6.11), python-sip4, python-sip4-dbg, python-sip4-dev Build-Depends: debhelper (>= 5.0.38), quilt, libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), kdelibs4-trinity-dev, python-support (>= 0.6) | python-dev (>= 2.6.6-3~), python-sip4, python-sip4-dbg, python-sip4-dev
Standards-Version: 3.8.4 Standards-Version: 3.8.4
Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php
XS-Python-Version: all XS-Python-Version: all

@ -31,6 +31,9 @@ endif
PYTHONS := $(shell pyversions -vr debian/control) PYTHONS := $(shell pyversions -vr debian/control)
DBG_PYTHONS := $(shell pyversions -vd) DBG_PYTHONS := $(shell pyversions -vd)
DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p') GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
ifneq (,$(filter $(GCCVER),4.2 4.3)) ifneq (,$(filter $(GCCVER),4.2 4.3))
SPLIT=20 SPLIT=20
@ -149,7 +152,7 @@ ifeq (,$(findstring -i, $(DH_OPTIONS)))
endif endif
dh_compress -X.py -X.ui -X.dtd dh_compress -X.py -X.ui -X.dtd
dh_fixperms dh_fixperms
DH_PYCENTRAL=nomove dh_pycentral ${DH_PYTHON2}
dh_installdeb dh_installdeb
dh_shlibdeps -l /opt/trinity/lib dh_shlibdeps -l /opt/trinity/lib
dh_gencontrol dh_gencontrol

@ -2,7 +2,7 @@ Source: desktop-effects-kde-trinity
Section: kde Section: kde
Priority: optional Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 5.0.38), quilt, python-central (>= 0.5.6) Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 5.0.38), quilt, python-support (>= 0.6) | python-dev (>= 2.6.6-3~)
Standards-Version: 3.8.4 Standards-Version: 3.8.4
XS-Python-Version: all XS-Python-Version: all

@ -1,5 +1,8 @@
#!/usr/bin/make -f #!/usr/bin/make -f
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 include /usr/share/cdbs/1/rules/debhelper.mk
DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
@ -13,4 +16,4 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2) && echo xz || echo bzip2)
binary-install/desktop-effects-kde-trinity:: binary-install/desktop-effects-kde-trinity::
dh_pycentral -pdesktop-effects-kde-trinity ${DH_PYTHON2} -pdesktop-effects-kde-trinity

@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org> Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
XS-Python-Version: all XS-Python-Version: all
Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), quilt, pkg-config, python-all-dev Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), quilt, pkg-config, python-all-dev
Build-Depends-Indep: python-central (>= 0.6.0), intltool Build-Depends-Indep: python-support (>= 0.6), intltool
Standards-Version: 3.8.4 Standards-Version: 3.8.4
Package: fusion-icon-trinity Package: fusion-icon-trinity

@ -1,6 +1,6 @@
#!/usr/bin/make -f #!/usr/bin/make -f
DEB_PYTHON_SYSTEM=pycentral DEB_PYTHON_SYSTEM=pysupport
include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/debhelper.mk
# include /usr/share/cdbs/1/class/python-distutils.mk # include /usr/share/cdbs/1/class/python-distutils.mk
@ -17,5 +17,5 @@ binary-install/fusion-icon-trinity::
mkdir -p debian/fusion-icon-trinity/opt/trinity mkdir -p debian/fusion-icon-trinity/opt/trinity
cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/ cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/
rm -rf debian/fusion-icon-trinity/usr rm -rf debian/fusion-icon-trinity/usr
dh_pycentral -pfusion-icon-trinity dh_pysupport -pfusion-icon-trinity
dh_icons dh_icons

@ -1,6 +1,6 @@
Source: kdebindings-trinity Source: kdebindings-trinity
Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5), Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5),
python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk, python-dev (>= 2.3.5-11), python-support (>= 0.5) | python-dev (>= 2.6.6-3~), quilt, gawk,
gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc], gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc],
kdelibs4-trinity-dev (>= 4:3.5.9), libqt3-compat-headers (>= 3:3.3.5), kdelibs4-trinity-dev (>= 4:3.5.9), libqt3-compat-headers (>= 3:3.3.5),
ruby, ruby-dev, flex, bison, ruby, ruby-dev, flex, bison,

@ -3,6 +3,9 @@
DEB_QUILT_PATCHDIR_LINK := DEB_QUILT_PATCHDIR_LINK :=
export QUILT_PATCHES=debian/patches 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 include /usr/share/cdbs/1/rules/debhelper.mk
override DEB_BUILDDIR := $(DEB_SRCDIR) override DEB_BUILDDIR := $(DEB_SRCDIR)
@ -131,7 +134,7 @@ binary-install/libqt0-ruby1.8-trinity::
mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
binary-install/python-dcop-trinity:: binary-install/python-dcop-trinity::
dh_pysupport -p$(cdbs_curpkg) ${DH_PYTHON2} -p$(cdbs_curpkg)
### ###

@ -1,10 +1,10 @@
pykdeextensions: desktop-entry-contains-unknown-key ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB] pykdeextensions-trinity: desktop-entry-contains-unknown-key ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB]
pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop kcmshell pykdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop kcmshell
pykdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop pykdeextensions-trinity: desktop-entry-invalid-category QT ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
pykdeextensions: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop pykdeextensions-trinity: desktop-entry-invalid-category X-KDE-settings-system ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
pykdeextensions: desktop-entry-lacks-main-category ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop pykdeextensions-trinity: desktop-entry-lacks-main-category ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$ pykdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pykdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$
pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$ pykdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pykdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$
pykdeextensions: executable-not-elf-or-script ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py pykdeextensions-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py
pykdeextensions: executable-not-elf-or-script ./usr/share/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py pykdeextensions-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py

@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.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> Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
Build-Depends: debhelper (>= 5.0.38), quilt, libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), kdelibs4-trinity-dev, python-central (>= 0.6.11), python-sip4, python-sip4-dbg, python-sip4-dev Build-Depends: debhelper (>= 5.0.38), quilt, libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), kdelibs4-trinity-dev, python-support (>= 0.6) | python-dev (>= 2.6.6-3~), python-sip4, python-sip4-dbg, python-sip4-dev
Standards-Version: 3.8.4 Standards-Version: 3.8.4
Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php
XS-Python-Version: all XS-Python-Version: all

@ -31,6 +31,9 @@ endif
PYTHONS := $(shell pyversions -vr debian/control) PYTHONS := $(shell pyversions -vr debian/control)
DBG_PYTHONS := $(shell pyversions -vd) DBG_PYTHONS := $(shell pyversions -vd)
DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p') GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
ifneq (,$(filter $(GCCVER),4.2 4.3)) ifneq (,$(filter $(GCCVER),4.2 4.3))
SPLIT=20 SPLIT=20
@ -149,7 +152,7 @@ ifeq (,$(findstring -i, $(DH_OPTIONS)))
endif endif
dh_compress -X.py -X.ui -X.dtd dh_compress -X.py -X.ui -X.dtd
dh_fixperms dh_fixperms
DH_PYCENTRAL=nomove dh_pycentral ${DH_PYTHON2}
dh_installdeb dh_installdeb
dh_shlibdeps -l /opt/trinity/lib dh_shlibdeps -l /opt/trinity/lib
dh_gencontrol dh_gencontrol

Loading…
Cancel
Save