From 828ca3cfac7d5652c8dfdf49ff64852f449c397e Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Mon, 17 Feb 2025 18:40:32 +0100 Subject: DEB: Make adjustments for time64 ABI in the 'control' file before building - in the cleaning phase and not to return the changes back. This is workaround due to newer dpkg, where cdbs rules for debhelper do not reflect additional changes in the control file made during build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 8b4a12b77376ef043fdcf155d654494175dc59c8) --- debian/_base/core/tdelibs/debian/rules | 7 +++++++ debian/_base/core/tdepim/debian/rules | 11 +++++++++++ 2 files changed, 18 insertions(+) (limited to 'debian/_base/core') diff --git a/debian/_base/core/tdelibs/debian/rules b/debian/_base/core/tdelibs/debian/rules index acafdc46e..ace45702f 100755 --- a/debian/_base/core/tdelibs/debian/rules +++ b/debian/_base/core/tdelibs/debian/rules @@ -149,6 +149,13 @@ ifeq ($(DEB_TIME64_API),true) ls -d debian/* | \ grep -E "/tdelibs14$(DEB_TIME64_SUFFIX)-trinity\." | \ xargs -r rm + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^\\(Package: tdelibs14\\)-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(tdelibs\\)4c2a-trinity\\( \|$$\)/\\1:\\2\\34c2a-trinity, \\314-trinity\\4/" \ + -e "s/\\(tdelibs14\\)-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \ + debian/control +else [ ! -f debian/control.t64 ] || \ mv debian/control.t64 debian/control endif diff --git a/debian/_base/core/tdepim/debian/rules b/debian/_base/core/tdepim/debian/rules index 874cc57ac..b88ad0ab0 100755 --- a/debian/_base/core/tdepim/debian/rules +++ b/debian/_base/core/tdepim/debian/rules @@ -141,6 +141,17 @@ ifeq ($(DEB_TIME64_API),true) ls -d debian/* | \ grep -E "/libkleopatra1$(DEB_TIME64_SUFFIX)-" | \ xargs -r rm + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^\\(Package: libmimelib1\\)c2a-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libmimelib1\\)c2a-trinity\\( \|$$\)/\\1:\\2\\3c2a-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \ + -e "s/\\(libmimelib1\\)c2a-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \ + \ + -e "s/^\\(Package: libkleopatra1\\)-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libkleopatra1\\)-trinity\\( \|$$\)/\\1:\\2\\3-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \ + -e "s/\\(libkleopatra1\\)-trinity (=/\\1$(DEB_TIME64_SUFFIX)-trinity (=/" \ + debian/control +else [ ! -f debian/control.t64 ] || \ mv debian/control.t64 debian/control endif -- cgit v1.2.3