diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2016-01-30 20:19:21 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2016-01-30 20:19:21 +0100 |
| commit | 1e2672ad64a3a6bee8e12dd2496a85ddc80768a6 (patch) | |
| tree | c72c3e1d875a1bc747ca05400ccda8aaaf7ad7ec /ubuntu/maverick/applications/fusion-icon/debian | |
| parent | 65a078c0bcb64fc1a2bc14389e08692bbf99094b (diff) | |
| download | tde-packaging-1e2672ad64a3a6bee8e12dd2496a85ddc80768a6.tar.gz tde-packaging-1e2672ad64a3a6bee8e12dd2496a85ddc80768a6.zip | |
Switch remaining packages to dh_python2 on Debian and Ubuntu
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'ubuntu/maverick/applications/fusion-icon/debian')
| -rw-r--r-- | ubuntu/maverick/applications/fusion-icon/debian/control | 2 | ||||
| -rwxr-xr-x | ubuntu/maverick/applications/fusion-icon/debian/rules | 16 |
2 files changed, 13 insertions, 5 deletions
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/control b/ubuntu/maverick/applications/fusion-icon/debian/control index 2bbbdbdaa..d1c814e7c 100644 --- a/ubuntu/maverick/applications/fusion-icon/debian/control +++ b/ubuntu/maverick/applications/fusion-icon/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org> XS-Python-Version: all Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), quilt, pkg-config, python-all-dev -Build-Depends-Indep: python-support (>= 0.6), intltool +Build-Depends-Indep: python-support (>= 0.6) | dh-python, intltool Standards-Version: 3.8.4 Package: fusion-icon-trinity diff --git a/ubuntu/maverick/applications/fusion-icon/debian/rules b/ubuntu/maverick/applications/fusion-icon/debian/rules index 3fe3dd8ea..f1b2fcb21 100755 --- a/ubuntu/maverick/applications/fusion-icon/debian/rules +++ b/ubuntu/maverick/applications/fusion-icon/debian/rules @@ -1,10 +1,15 @@ #!/usr/bin/make -f -DEB_PYTHON_SYSTEM=pysupport +DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_pysupport),pysupport) +DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) +DEB_PYTHON2_MODULE_PACKAGES=fusion-icon-trinity include /usr/share/cdbs/1/rules/debhelper.mk -# include /usr/share/cdbs/1/class/python-distutils.mk -include debian/python-distutils-custom.mk +ifeq (pysupport, $(DEB_PYTHON_SYSTEM)) + include debian/python-distutils-custom.mk +else + include /usr/share/cdbs/1/class/python-distutils.mk +endif #include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ @@ -19,7 +24,7 @@ binary-install/fusion-icon-trinity:: mkdir -p 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 - dh_pysupport -pfusion-icon-trinity + ${DH_PYTHON2} -pfusion-icon-trinity ### # Must be done after invoking dh_pysupport, otherwise python scripts will # end up in /usr/share/pyshare instead of dist-packages @@ -27,4 +32,7 @@ binary-install/fusion-icon-trinity:: mv debian/fusion-icon-trinity/temp/lib debian/fusion-icon-trinity/usr rm -rf debian/fusion-icon-trinity/temp ### + mkdir -p debian/fusion-icon-trinity/usr/share/doc/fusion-icon-trinity + mv debian/fusion-icon-trinity/opt/trinity/share/doc/fusion-icon-trinity/* debian/fusion-icon-trinity/usr/share/doc/fusion-icon-trinity/ + rmdir -p --ignore-fail-on-non-empty debian/fusion-icon-trinity/opt/trinity/share/doc/fusion-icon-trinity dh_icons |