diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-08-28 19:15:43 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-08-28 19:16:34 +0200 |
| commit | b62d2459ac2b493be81ac65c5076b8c2bb95e925 (patch) | |
| tree | 9fe78ecafb074c31e73f215f4419321da7642ad5 /ubuntu/maverick | |
| parent | d61339466d025f53e360b0a47b20586450716676 (diff) | |
| download | tde-packaging-b62d2459ac2b493be81ac65c5076b8c2bb95e925.tar.gz tde-packaging-b62d2459ac2b493be81ac65c5076b8c2bb95e925.zip | |
Fix FTBFS sip4-tqt due to older dh_python2 on Debian and Ubuntu
Diffstat (limited to 'ubuntu/maverick')
| -rwxr-xr-x | ubuntu/maverick/dependencies/sip4-tqt/debian/rules | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/rules b/ubuntu/maverick/dependencies/sip4-tqt/debian/rules index 9073bd22f..077c9ee58 100755 --- a/ubuntu/maverick/dependencies/sip4-tqt/debian/rules +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/rules @@ -20,7 +20,7 @@ endif PYTHONS := $(shell pyversions -vr debian/control) DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) -DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2 --no-dbg-cleaning,dh_pysupport) +DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) -include /usr/share/python/python.mk ifeq (,$(py_sitename)) @@ -104,7 +104,8 @@ install-arch-%: mkdir -p debian/python-sip/usr/lib/python$*/$(call py_sitename,$*)/ install -m 644 -o root -g root debian/sipconfig.py debian/python-sip/usr/lib/python$*/$(call py_sitename,$*)/ install -m 644 -o root -g root build-$*/sipconfig.py debian/python-sip/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_nd.py - install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip-dbg/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_d.py + # install *_d.py into wrong package to prevent deletion in dh_python2 + install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_d.py mkdir -p debian/python-sip-dev/usr/include/python$* install -m 644 -o root -g root siplib/sip.h debian/python-sip-dev/usr/include/python$*/ mkdir -p debian/python-sip-dev/usr/include/python$*_d @@ -136,6 +137,12 @@ endif dh_compress dh_fixperms ${DH_PYTHON2} + # move *_d.py back into right package + find debian/python-sip -name "*_d.py" | \ + while read f; do \ + mkdir -p $${f%/*}; \ + mv "$${f}" "debian/python-sip-dbg/$${f#debian/python-sip/}" ; \ + done dh_installdeb dh_shlibdeps dh_gencontrol |