mirror of
https://git.launchpad.net/~ubuntu-qt-code/ubuntu/+source/calamares/+git/calamares
synced 2025-06-03 23:01:29 +00:00
Drop lp-2045741.patch.
This commit is contained in:
parent
52c7465fe2
commit
95307f7bd7
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -5,6 +5,7 @@ calamares (3.3.1-0ubuntu1) noble; urgency=medium
|
|||||||
* Updated copyright file.
|
* Updated copyright file.
|
||||||
* Enabled AppStream and AppData (it is no longer enabled by default upstream
|
* Enabled AppStream and AppData (it is no longer enabled by default upstream
|
||||||
but should be enabled by us).
|
but should be enabled by us).
|
||||||
|
* Dropped lp-2045741.patch, it's included in the latest upstream release.
|
||||||
|
|
||||||
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Thu, 18 Jan 2024 20:29:45 +0000
|
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Thu, 18 Jan 2024 20:29:45 +0000
|
||||||
|
|
||||||
|
27
debian/patches/lp-2045741.patch
vendored
27
debian/patches/lp-2045741.patch
vendored
@ -1,27 +0,0 @@
|
|||||||
From 709296940c1a3d320bde317966b073167833fad9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Adriaan de Groot <groot@kde.org>
|
|
||||||
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
|
|
||||||
|
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -1,4 +1,3 @@
|
|||||||
0001-replace-pkexec-by-sudo.patch
|
0001-replace-pkexec-by-sudo.patch
|
||||||
apport-package-hook.patch
|
apport-package-hook.patch
|
||||||
support-appstream-1.0.patch
|
support-appstream-1.0.patch
|
||||||
lp-2045741.patch
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user