From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: location@lists.ipfire.org Subject: Re: [PATCH 6/8] debian: Drop unintended files from location-python Date: Mon, 19 Apr 2021 14:14:45 +0100 Message-ID: In-Reply-To: <20210416130612.15959-7-valter.jansons@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7514946359926992940==" List-Id: --===============7514946359926992940== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, > On 16 Apr 2021, at 14:06, Valters Jansons wrot= e: >=20 > _location.la gets built and installed to site-packages/, however > an .la file is not expected to reside in the Python root. Additionally, > the dependency library listed does not have its respective .la file > installed. Further complicating the situation, dh-python moves the > site-packages/ files to dist-packages/ silently which then results in > a broken libdir left behind in the .la file. Moving those files has indeed many bad consequences and I am not sure if Debi= an is doing something that is very logical. However, I can live with simply deleting this file. > The only reason the file is there is that it gets built inside the > source directory, which gets copied entirely to location-python package > as-is. Considering the situation, this commit ensures the .la files is > not packaged by deleting it from the package files subdirectory. >=20 > location-importer package pulls in two Python (.py) files from the > source directory. These files should not be included in the > location-python package as a result. And how do they go there when they are just being deleted here? -Michael >=20 > Resolves: lintian: > unknown-file-in-python-module-directory, > incorrect-libdir-in-la-file, > non-empty-dependency_libs-in-la-file, > binaries-have-file-conflict >=20 > Signed-off-by: Valters Jansons > --- > debian/rules | 8 ++++++++ > 1 file changed, 8 insertions(+) >=20 > diff --git a/debian/rules b/debian/rules > index 8893b7b..05b88fd 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -18,3 +18,11 @@ override_dh_perl: >=20 > override_dh_systemd_enable: > dh_systemd_enable location-update.timer > + > +override_dh_install: > + dh_install > + # lintian: unknown-file-in-python-module-directory > + rm debian/location-python/usr/lib/python3*/site-packages/_location.la > + # linitan: binaries-have-file-conflict (d/location-importer.install) > + rm debian/location-python/usr/lib/python3*/site-packages/location/databas= e.py > + rm debian/location-python/usr/lib/python3*/site-packages/location/importe= r.py > --=20 > 2.31.1 >=20 --===============7514946359926992940==--