diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-08-28 20:09:24 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-08-28 20:09:24 +0200 |
| commit | 5fe21127902bacc7cfaa70155df63dce27ab89d3 (patch) | |
| tree | 26849e9aae9e9b151656b61f53d2c7f99f5b0854 /ubuntu/raring | |
| parent | b62d2459ac2b493be81ac65c5076b8c2bb95e925 (diff) | |
| download | tde-packaging-5fe21127902bacc7cfaa70155df63dce27ab89d3.tar.gz tde-packaging-5fe21127902bacc7cfaa70155df63dce27ab89d3.zip | |
Fix prior commit
Diffstat (limited to 'ubuntu/raring')
| -rwxr-xr-x | ubuntu/raring/dependencies/sip4-tqt/debian/rules | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ubuntu/raring/dependencies/sip4-tqt/debian/rules b/ubuntu/raring/dependencies/sip4-tqt/debian/rules index 077c9ee58..641b5cabd 100755 --- a/ubuntu/raring/dependencies/sip4-tqt/debian/rules +++ b/ubuntu/raring/dependencies/sip4-tqt/debian/rules @@ -104,8 +104,12 @@ 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 +ifneq (dh_pysupport,${DH_PYTHON2}) # 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 +else + install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip-dbg/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_d.py +endif 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 @@ -137,12 +141,15 @@ endif dh_compress dh_fixperms ${DH_PYTHON2} +ifneq (dh_pysupport,${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/}" ; \ + f1="debian/python-sip-dbg/$${f#debian/python-sip/}"; \ + mkdir -p "$${f1%/*}"; \ + mv "$${f}" "$${f1}" ; \ done +endif dh_installdeb dh_shlibdeps dh_gencontrol |