From patchwork Fri Apr 16 13:06:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valters Jansons X-Patchwork-Id: 4177 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4FMGh20LHHz44Qw for ; Fri, 16 Apr 2021 13:06:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FMGh169Glz27K; Fri, 16 Apr 2021 13:06:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FMGh15YYWz2xKk; Fri, 16 Apr 2021 13:06:57 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4FMGgz6xP9z2xKk for ; Fri, 16 Apr 2021 13:06:55 +0000 (UTC) Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FMGgz0pDwz27K for ; Fri, 16 Apr 2021 13:06:55 +0000 (UTC) Received: by mail-wm1-x336.google.com with SMTP id p19so14285578wmq.1 for ; Fri, 16 Apr 2021 06:06:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xaRIVsS0a5E+g+YeFRZ5sGjX4B+Ki/NNqVo/9Z5mCCI=; b=LL0h+A/KPRgeA0dkLEOuO8W4DUKaUkXx3UM9Ud59dtv0LMR0ooquDeTEklEBnQl2GL YcCuj4f78tqfgFsyj/dx5A2pvJVB9z5Vh9ATKqSQqBxp+IGgJhlfxqf7a2fVUPj3iaoT xBfiGapduHQQxh1IH5sQI66wwzlaLiTUTtAdkGGdWPO0xjKZfid5HcTG7JXqg1WjuRVJ 54nE478tpgY8Nih6AYaZ/33DBgJ4+/mydY82ex8OGYdYYP85GvTEU/l8Y31xNQLry53h p1oAy/9I4dggEjxzzwf62Zew0diVIuKYV3heuMk3KJMqNFLLXkz8NuXLcBKTIBxO+KjC gr7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xaRIVsS0a5E+g+YeFRZ5sGjX4B+Ki/NNqVo/9Z5mCCI=; b=C9xaMR+EQAyTBabkt+1WzlDLXbzBhWp4eWu3PLpuaZe0NcwMmZzcvLHwsmqNLsJjEN Y74cVxUEb8pdLn9bGOGN6dO4b2Mvb1wS1A4Fo8D5fE22rjRaAQHtnAwUk0CApm4DgNjj Nfzb25VANun1RfERniE9TgGh2IvhMxzWNCWmOjNrN/EP6GXi1dPKBOC7PN8JXmSNrflI lvkfqSdJxo1B59Wm9V6C0SGttdghMzPCOWjpbCNpiN999SwDC+pPWqhwmM/s3SSDb6B3 kA8VLsCK4aTWL8HnmJ49hHw3kAEYFhcfjMRTs1ni482W/Vx9Qb9dPrWZ3iFjyEW+Ehoh On3g== X-Gm-Message-State: AOAM532anPcfYfBXaOFVZ/Zqrv91ZB6IeL1xytkMpsJABGFLPXcF6hhn VzJ7EjxHfCMPA1xA7eRIAvsYGaIoO6hKUg== X-Google-Smtp-Source: ABdhPJwdCNJbS4ezYGASKzJfYYKrukQh0d6QPiBZ37SZIiStgVKJmJ+zw/pvRoTISU3R+TrlvMbTPw== X-Received: by 2002:a1c:b48b:: with SMTP id d133mr7900692wmf.182.1618578414325; Fri, 16 Apr 2021 06:06:54 -0700 (PDT) Received: from DESKTOP-30GCCHK.localdomain ([80.232.183.114]) by smtp.gmail.com with ESMTPSA id b187sm8592958wmh.17.2021.04.16.06.06.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 06:06:54 -0700 (PDT) From: Valters Jansons To: IPFire Location Mailing List Subject: [PATCH 6/8] debian: Drop unintended files from location-python Date: Fri, 16 Apr 2021 16:06:10 +0300 Message-Id: <20210416130612.15959-7-valter.jansons@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210416130612.15959-1-valter.jansons@gmail.com> References: <20210416130612.15959-1-valter.jansons@gmail.com> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1618578415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=xaRIVsS0a5E+g+YeFRZ5sGjX4B+Ki/NNqVo/9Z5mCCI=; b=j6sr1ELX/mACa5EfqgZoxoR5Kw25cIlIwj0PELhkCs+9R1vrq0wOTqgN1XN4DGOdZCz6sD SlZlRG7Fiwfz1PHHKtlY/twNMAaDVi9mAmraW4NU8xkt7lE1GjL3FeS8tM5/JK9yl1gDBK 7lKCnRSXsjZSXnfI/3JoMQPXVPXS8JFtq7fawEiMCpViL2ybmcLQxY4cPOO4Klabos84w5 c6ZXx4bfrBgtN6J2WfNX+X+9u+udE6Qgi5s7T5kaJWp4HgJ/D1wey900x1SULwGKovpf3+ dfauFoM8hGtwRZJeQr8R16HcOLcJJDWVVgZGc4uOr9v1fh1BjPvM1YU7ADp2WQ== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=gmail.com header.s=20161025 header.b="LL0h+A/K"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mail01.ipfire.org: domain of valterjansons@gmail.com designates 2a00:1450:4864:20::336 as permitted sender) smtp.mailfrom=valterjansons@gmail.com ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1618578415; a=rsa-sha256; cv=none; b=Q/Cb4XtbbFjUwb6cay6goUqPytWzT1o62wE/P41Esd8CcgYCCZ8LsvFMWZ894q24iXRr2w vfK+97VetrdNSzJIGx+BQfhyTapCNvAlhPs8pb4hEAznz2dvA4PtBzOXmFIw1R2t+QskZ1 DsDQ1FzjGcCzRRu26anumPtQWN7NZ7N/+gfVL872Xjuqb46k7DcKbrjq9WXFAhiOHGlB0M IaNC2CeH45ELI7IeKnqVy/T+9tngW2NeW2n3ICkuKB4397RR/3pjuOwD1E6Zc1ceeCHHSz pK+DPy4hq0FHbl1014RrUQxYcxlgEZJf8nUvr9tMEHQl2vDQgxnFA7qFU5aqmw== X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [-1.81 / 11.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36:c]; FREEMAIL_FROM(0.00)[gmail.com]; R_MISSING_CHARSET(2.50)[]; BROKEN_CONTENT_TYPE(1.50)[]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; IP_REPUTATION_HAM(-0.81)[asn: 15169(-0.21), country: US(-0.01), ip: 2a00:1450:4864:20::(-0.19)]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; BAYES_HAM(-3.00)[99.99%]; FROM_HAS_DN(0.00)[]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[location@lists.ipfire.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::336:from]; NEURAL_HAM(-1.00)[-1.000]; FREEMAIL_CC(0.00)[gmail.com]; RCVD_TLS_ALL(0.00)[] X-Rspamd-Queue-Id: 4FMGgz0pDwz27K Authentication-Results: mail01.ipfire.org; dkim=pass header.d=gmail.com header.s=20161025 header.b="LL0h+A/K"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mail01.ipfire.org: domain of valterjansons@gmail.com designates 2a00:1450:4864:20::336 as permitted sender) smtp.mailfrom=valterjansons@gmail.com X-BeenThere: location@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: location-bounces@lists.ipfire.org Sender: "Location" _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. 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. 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. Resolves: lintian: unknown-file-in-python-module-directory, incorrect-libdir-in-la-file, non-empty-dependency_libs-in-la-file, binaries-have-file-conflict Signed-off-by: Valters Jansons --- debian/rules | 8 ++++++++ 1 file changed, 8 insertions(+) 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: 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/database.py + rm debian/location-python/usr/lib/python3*/site-packages/location/importer.py