Commit a4fe0b97 authored by Julian Andres Klode's avatar Julian Andres Klode
Browse files

Use pybuild to split out -dbg stuff, avoid .install/.files

Doing this via pybuild is somewhat nasty, as it does not
allow us to move all the common files into the common
package itself, so we have to hack around that.

I'd like to more declaratively state which files belong
into common, or for pybuild to figure that out itself
(it ain't hard), but meh, what can I do?

This fixes the problem where the wildcard that was
matching debug symbols "d-*" (formerly dm-*) also is
matching kfreebsd-, and hence caused FTBFS on freebsd.

Closes: #958118
parent 35e91e88
usr/share/locale
usr/share/python-apt
usr/lib/python3*/*/*dm-*.so
usr/lib/python3*/*/*d-*.so
usr/lib/python3*/*/apt_pkg*.so
usr/lib/python3*/*/apt_inst*.so
usr/lib/python3*/*/*/
usr/lib/python3*/*/*.egg-info
......@@ -9,6 +9,7 @@ export DEB_CFLAGS_MAINT_APPEND=-Wno-write-strings \
-DDATE=\""$(DATE)"\" \
-DTIME=\""$(TIME)"\"
export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
export PYBUILD_NAME=apt
BUILDDIR3 := $(shell pybuild --print build_dir --interpreter python3)
......@@ -19,9 +20,18 @@ override_dh_auto_build:
dh_auto_build
PYTHONPATH=$(BUILDDIR3) python3 setup.py build_sphinx
override_dh_install:
dh_movefiles
dh_install
# this is nasty. instead of installing the files to one dir, overriding
# common ones, and then us picking out the files we want, we have to move some
# files from python3-apt to python-apt-common and then delete it from other
# packages.
override_dh_auto_install:
dh_auto_install
mkdir -p debian/python-apt-common/usr/share/
mv debian/python3-apt/usr/share/locale debian/python-apt-common/usr/share/
mv debian/python3-apt/usr/share/python-apt debian/python-apt-common/usr/share/
rm -r debian/python3-*/usr/share/locale
rm -r debian/python3-*/usr/share/python-apt
rmdir debian/python3-*/usr/share
override_dh_installdocs:
dh_installdocs -p python3-apt -p python3-apt-dbg --link-doc=python3-apt
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment