diff --git a/debian/changelog b/debian/changelog index c670633..fe9c601 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ calamares (3.3.1-0ubuntu1) noble; urgency=medium * Updated copyright file. * Enabled AppStream and AppData (it is no longer enabled by default upstream but should be enabled by us). + * Dropped lp-2045741.patch, it's included in the latest upstream release. -- Aaron Rainbolt Thu, 18 Jan 2024 20:29:45 +0000 diff --git a/debian/patches/lp-2045741.patch b/debian/patches/lp-2045741.patch deleted file mode 100644 index 677d407..0000000 --- a/debian/patches/lp-2045741.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 709296940c1a3d320bde317966b073167833fad9 Mon Sep 17 00:00:00 2001 -From: Adriaan de Groot -Date: Sun, 24 Dec 2023 23:01:37 +0100 -Subject: [PATCH] i18n: suppress duplicated languages - -The list of translations from Transifex contains "en", and we -add it explicitly a second time -- instead of fixing those and -needing to ensure that the source language is returned, or optionally -adding "en" if it isn't in the list already, just de-duplicate. - -FIXES #2257 ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8a26ae6c7f..53e9f494e4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -513,6 +513,7 @@ if(NOT CALAMARES_RELEASE_MODE) - list(APPEND CALAMARES_TRANSLATION_LANGUAGES ${_tx_incomplete}) - endif() - list(SORT CALAMARES_TRANSLATION_LANGUAGES) -+list(REMOVE_DUPLICATES CALAMARES_TRANSLATION_LANGUAGES) - - add_subdirectory(lang) # i18n tools - diff --git a/debian/patches/series b/debian/patches/series index d09302b..a047188 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 0001-replace-pkexec-by-sudo.patch apport-package-hook.patch support-appstream-1.0.patch -lp-2045741.patch