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>
pull/65/head
Slávek Banko 5 years ago
parent dda369c7f8
commit 4fafee9e96
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -107,12 +107,7 @@ install-arch-%:
touch debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/__init__.py 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 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 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 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$* 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$*/ 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 mkdir -p debian/python-sip-tqt-dev/usr/include/python$*_d
@ -143,15 +138,10 @@ ifneq (,$(findstring -a, $(DH_OPTIONS)))
endif endif
dh_compress dh_compress
dh_fixperms dh_fixperms
${DH_PYTHON2}
ifneq (dh_pysupport,${DH_PYTHON2}) ifneq (dh_pysupport,${DH_PYTHON2})
# move *_d.py back into right package ${DH_PYTHON2} --no-dbg-cleaning
find debian/python-sip-tqt -name "*_d.py" | \ else
while read f; do \ ${DH_PYTHON2}
f1="debian/python-sip-tqt-dbg/$${f#debian/python-sip-tqt/}"; \
mkdir -p "$${f1%/*}"; \
mv "$${f}" "$${f1}" ; \
done
endif endif
dh_installdeb dh_installdeb
dh_shlibdeps dh_shlibdeps

@ -107,12 +107,7 @@ install-arch-%:
touch debian/python-sip-tqt/usr/lib/python$*/$(call py_sitename,$*)/sip4_tqt/__init__.py 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 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 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 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$* 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$*/ 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 mkdir -p debian/python-sip-tqt-dev/usr/include/python$*_d
@ -143,15 +138,10 @@ ifneq (,$(findstring -a, $(DH_OPTIONS)))
endif endif
dh_compress dh_compress
dh_fixperms dh_fixperms
${DH_PYTHON2}
ifneq (dh_pysupport,${DH_PYTHON2}) ifneq (dh_pysupport,${DH_PYTHON2})
# move *_d.py back into right package ${DH_PYTHON2} --no-dbg-cleaning
find debian/python-sip-tqt -name "*_d.py" | \ else
while read f; do \ ${DH_PYTHON2}
f1="debian/python-sip-tqt-dbg/$${f#debian/python-sip-tqt/}"; \
mkdir -p "$${f1%/*}"; \
mv "$${f}" "$${f1}" ; \
done
endif endif
dh_installdeb dh_installdeb
dh_shlibdeps dh_shlibdeps

Loading…
Cancel
Save