From c42e7f0a76c23c75f9c3e1f19b7b8140432db35a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 10 Apr 2020 14:38:24 +0200 Subject: DilOS sip4-tqt: Use dh_python2 with the --no-dbg-cleaning option instead of a hack to preserve "*_d.py" files in the dbg package. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- dilos/dependencies/sip4-tqt/debian/rules | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/dilos/dependencies/sip4-tqt/debian/rules b/dilos/dependencies/sip4-tqt/debian/rules index a553058fb..35d23b4cb 100755 --- a/dilos/dependencies/sip4-tqt/debian/rules +++ b/dilos/dependencies/sip4-tqt/debian/rules @@ -111,12 +111,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 @@ -147,15 +142,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 -- cgit v1.2.3