diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2020-04-07 18:19:41 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2020-04-07 18:22:07 +0200 |
| commit | cea8b18df0ad94161bddc6925c822ce43e96e668 (patch) | |
| tree | 740a177e0ca9fc349603e84e0e19221dc55298d5 /debian | |
| parent | 99155cbc5d47d6d54f3d85b844609f24539b429a (diff) | |
| download | tde-packaging-cea8b18df0ad94161bddc6925c822ce43e96e668.tar.gz tde-packaging-cea8b18df0ad94161bddc6925c822ce43e96e668.zip | |
DEB sip4-tqt: Use dh_python2 with the --no-dbg-cleaning option
instead of a hack to preserve "*_d.py" files in the dbg package.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 4fafee9e96c8d08751127df1816e6f3bfb482f09)
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/_base/dependencies/sip4-tqt/debian/rules | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/debian/_base/dependencies/sip4-tqt/debian/rules b/debian/_base/dependencies/sip4-tqt/debian/rules index 86a541601..71965fa31 100755 --- a/debian/_base/dependencies/sip4-tqt/debian/rules +++ b/debian/_base/dependencies/sip4-tqt/debian/rules @@ -107,12 +107,7 @@ install-arch-%: touch debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/__init__.py install -m 644 -o root -g root debian/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/ install -m 644 -o root -g root build-$*/sipconfig.py debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/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-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_d.py -else install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip-tqt-dbg/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/sipconfig_d.py -endif mkdir -p debian/python-sip-tqt-dev/usr/include/python$* install -m 644 -o root -g root siplib/sip.h debian/python-sip-tqt-dev/usr/include/python$*/ mkdir -p debian/python-sip-tqt-dev/usr/include/python$*_d @@ -143,15 +138,10 @@ ifneq (,$(findstring -a, $(DH_OPTIONS))) endif dh_compress dh_fixperms - ${DH_PYTHON2} ifneq (dh_pysupport,${DH_PYTHON2}) - # move *_d.py back into right package - find debian/python-sip-tqt -name "*_d.py" | \ - while read f; do \ - f1="debian/python-sip-tqt-dbg/$${f#debian/python-sip-tqt/}"; \ - mkdir -p "$${f1%/*}"; \ - mv "$${f}" "$${f1}" ; \ - done + ${DH_PYTHON2} --no-dbg-cleaning +else + ${DH_PYTHON2} endif dh_installdeb dh_shlibdeps |