From f14cf77d43f9946774ee497caf67a5be98784157 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Wed, 15 Nov 2023 17:01:09 -0600 Subject: [PATCH] Revert "Fix FTBFS on !(amd64)." This reverts commit 26c675cb3da5244e718aa62fa951537197c5ed7a. --- debian/changelog | 6 ++++++ debian/rules | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5c27bf3..c26ed1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares-settings-ubuntu (1:24.04.3) noble; urgency=medium + + * Revert a failed FTBFS fix. + + -- Aaron Rainbolt Wed, 15 Nov 2023 17:01:22 -0600 + calamares-settings-ubuntu (1:24.04.2) noble; urgency=medium * Fix FTBFS on !(amd64). diff --git a/debian/rules b/debian/rules index 1eb8d5f..1012151 100755 --- a/debian/rules +++ b/debian/rules @@ -8,21 +8,14 @@ MODULES_DIR = "debian/calamares-settings-ubuntu-common/usr/lib/$(DEB_HOST_MULTIA dh $@ override_dh_auto_configure: -ifeq ($(DEB_BUILD_ARCH),amd64) cd $(PKGSELECT) && mkdir build && cd build && cmake .. -endif override_dh_auto_build: -ifeq ($(DEB_BUILD_ARCH),amd64) make; cd $(PKGSELECT)/build && $(MAKE) -endif override_dh_auto_install: -ifeq ($(DEB_BUILD_ARCH),amd64) cd $(PKGSELECT)/build && $(MAKE) DESTDIR=$(CURDIR)/debian/calamares-settings-ubuntu-common/usr/lib/$(DEB_HOST_MULTIARCH)/ install -endif - override_dh_missing: dh_missing