From 8b4a12b77376ef043fdcf155d654494175dc59c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= 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 --- debian/_base/applications/multimedia/k3b/debian/rules | 7 +++++++ debian/_base/core/tdelibs/debian/rules | 7 +++++++ debian/_base/core/tdepim/debian/rules | 11 +++++++++++ debian/_base/dependencies/arts/debian/rules | 7 +++++++ debian/_base/dependencies/libcaldav/debian/rules | 6 ++++++ debian/_base/dependencies/libcarddav/debian/rules | 6 ++++++ debian/_base/dependencies/tqt3/debian/rules | 7 +++++++ 7 files changed, 51 insertions(+) (limited to 'debian') diff --git a/debian/_base/applications/multimedia/k3b/debian/rules b/debian/_base/applications/multimedia/k3b/debian/rules index 0cd87b24d..70fead837 100755 --- a/debian/_base/applications/multimedia/k3b/debian/rules +++ b/debian/_base/applications/multimedia/k3b/debian/rules @@ -57,6 +57,13 @@ ifeq ($(DEB_TIME64_API),true) ls -d debian/* | \ grep -E "/libk3b3$(DEB_TIME64_SUFFIX)-" | \ xargs -r rm + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^Package: \\(libk3b3\\)-trinity$$/Package: \\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libk3b3-trinity\\)\\( [^,]*\|$$\)/\\1:\\2\\3/" \ + -e "s/\\(libk3b3\\)-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/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 diff --git a/debian/_base/dependencies/arts/debian/rules b/debian/_base/dependencies/arts/debian/rules index a934b8c5a..5d7285b22 100755 --- a/debian/_base/dependencies/arts/debian/rules +++ b/debian/_base/dependencies/arts/debian/rules @@ -89,6 +89,13 @@ ifeq ($(DEB_TIME64_API),true) ls -d debian/* | \ grep -E "/libarts1$(DEB_TIME64_SUFFIX)-" | \ xargs -r rm + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^\\(Package: libarts1\\)c2a-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \ + -e "s/^\\(Replaces\\|Breaks\\):\\(.*\\)\\(libarts1\\)c2a-trinity\\( \|$$\)/\\1:\\2\\3c2a-trinity, \\3$(DEB_TIME64_SUFFIX)-trinity\\4/" \ + -e "s/\\(libarts1\\)c2a-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/dependencies/libcaldav/debian/rules b/debian/_base/dependencies/libcaldav/debian/rules index 9b371a62d..612de3dff 100755 --- a/debian/_base/dependencies/libcaldav/debian/rules +++ b/debian/_base/dependencies/libcaldav/debian/rules @@ -59,6 +59,12 @@ ifeq ($(DEB_TIME64_API),true) ls -d debian/* | \ grep -E "/libcaldav$(DEB_TIME64_SUFFIX)\." | \ xargs -r rm + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^Package: \\(libcaldav\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)\\nReplaces: \\1\\nBreaks: \\1/" \ + -e "s/\\(libcaldav\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ + debian/control +else [ ! -f debian/control.t64 ] || \ mv debian/control.t64 debian/control endif diff --git a/debian/_base/dependencies/libcarddav/debian/rules b/debian/_base/dependencies/libcarddav/debian/rules index 22b8c9e32..e9ea50672 100755 --- a/debian/_base/dependencies/libcarddav/debian/rules +++ b/debian/_base/dependencies/libcarddav/debian/rules @@ -59,6 +59,12 @@ ifeq ($(DEB_TIME64_API),true) ls -d debian/* | \ grep -E "/libcarddav$(DEB_TIME64_SUFFIX)\." | \ xargs -r rm + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^Package: \\(libcarddav\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)\\nReplaces: \\1\\nBreaks: \\1/" \ + -e "s/\\(libcarddav\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ + debian/control +else [ ! -f debian/control.t64 ] || \ mv debian/control.t64 debian/control endif diff --git a/debian/_base/dependencies/tqt3/debian/rules b/debian/_base/dependencies/tqt3/debian/rules index cb73bd445..fa9b59714 100755 --- a/debian/_base/dependencies/tqt3/debian/rules +++ b/debian/_base/dependencies/tqt3/debian/rules @@ -253,6 +253,13 @@ ifeq ($(DEB_TIME64_API),true) ls -d debian/* | \ grep -E "/libtqt3-mt$(DEB_TIME64_SUFFIX)\." | \ xargs -r rm + [ -f debian/control.t64 ] || \ + sed -i.t64 \ + -e "s/^\\(Package: libtqt3-mt\\)$$/\\1$(DEB_TIME64_SUFFIX)/" \ + -e "s/^\\(Replaces\\|Breaks\\): \\(libtqt3-mt\\)\\( \|$$\)/\\1: \\2, \\2$(DEB_TIME64_SUFFIX)\\3/" \ + -e "s/\\(libtqt3-mt\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ + debian/control +else [ ! -f debian/control.t64 ] || \ mv debian/control.t64 debian/control endif -- cgit v1.2.1