From 93cfd4d4cfe1a24128e43db14782633d3b7fc427 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Fri, 10 Nov 2023 10:54:50 -0600 Subject: [PATCH] Sorry Aaron, they re-did it upstream. Better luck next time with your ninja skills. ;) Revert "Fix an arch-dependency issue" This reverts commit a38d072d8416719aabe7094f2d2021ad6f1cf95f. --- debian/changelog | 6 ------ debian/patches/fix-arch-dependence.patch | 22 ---------------------- debian/patches/series | 1 - 3 files changed, 29 deletions(-) delete mode 100644 debian/patches/fix-arch-dependence.patch delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 9460d30..ebc0663 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -lxqt-menu-data (1.4.0-0ubuntu2) UNRELEASED; urgency=medium - - * Make the package arch-independent - - -- Aaron Rainbolt Mon, 06 Nov 2023 10:27:06 -0600 - lxqt-menu-data (1.4.0-0ubuntu1) noble; urgency=medium * Initial release. diff --git a/debian/patches/fix-arch-dependence.patch b/debian/patches/fix-arch-dependence.patch deleted file mode 100644 index 7876a59..0000000 --- a/debian/patches/fix-arch-dependence.patch +++ /dev/null @@ -1,22 +0,0 @@ -Description: Fix arch-dependence issues - lxqt-menu-data is arch-independent, however the main CMakeLists.txt file - is configured improperly and is generating an arch-dependent config file. - This is causing build failures for users of lxqt-menu-data on 32-bit arches - like armhf. Fix the configuration issue. -Author: Aaron Rainbolt -Origin: vendor -Bug: https://github.com/lxqt/lxqt-menu-data/issues/17 -Forwarded: not-needed -Last-Update: 2023-11-06 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -36,6 +36,7 @@ write_basic_package_version_file( - "${CMAKE_BINARY_DIR}/${LXQT_MENU_DATA_CMAKE_NAME}-config-version.cmake" - VERSION ${LXQT_MENU_DATA_VERSION} - COMPATIBILITY AnyNewerVersion -+ ARCH_INDEPENDENT - ) - - install(FILES diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 2b7aadf..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -fix-arch-dependence.patch