[neon/neon-packaging/mauikit-calendar/Neon/unstable_jammy] debian: drop patches dir and add back i18n installs
Carlos De Maine
null at kde.org
Wed Jun 5 10:49:56 BST 2024
Git commit 254f64b0d66bcc9075b4bfa52f84bcb3116a82c6 by Carlos De Maine.
Committed on 05/06/2024 at 09:49.
Pushed by carlosdem into branch 'Neon/unstable_jammy'.
drop patches dir and add back i18n installs
(cherry picked from commit e923cc5c26eecacbe09406b31a24ca44d35c262e)
Co-authored-by: Carlos De Maine <carlosdemaine at gmail.com>
M +1 -1 debian/libmauikitcalendar4.install
D +0 -39 debian/patches/akonadicontactscore
D +0 -1 debian/patches/series
https://invent.kde.org/neon/neon-packaging/mauikit-calendar/-/commit/254f64b0d66bcc9075b4bfa52f84bcb3116a82c6
diff --git a/debian/libmauikitcalendar4.install b/debian/libmauikitcalendar4.install
index e3f9c2d..e92fc93 100644
--- a/debian/libmauikitcalendar4.install
+++ b/debian/libmauikitcalendar4.install
@@ -1,3 +1,3 @@
usr/lib/*/libMauiKitCalendar4.so.4
usr/lib/*/libMauiKitCalendar4.so.4*
-#usr/share/locale/*/LC_MESSAGES/mauikitcalendar.mo
\ No newline at end of file
+usr/share/locale/*/LC_MESSAGES/mauikitcalendar.mo
\ No newline at end of file
diff --git a/debian/patches/akonadicontactscore b/debian/patches/akonadicontactscore
deleted file mode 100644
index 72decc2..0000000
--- a/debian/patches/akonadicontactscore
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8cdc95fecc5a4bc4a35c84c774052edd82f63cf4..697f52a63e578ad0993e5e1e0ba2c1f32083d45c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -105,7 +105,7 @@ find_package(MauiKit${MAUI_MAJOR_VERSION} ${MAUIKIT_VERSION} REQUIRED)
-
- find_package(KPim${KF_MAJOR_VERSION}Akonadi ${AKONADI_LIB_VERSION} REQUIRED)
- find_package(KPim${KF_MAJOR_VERSION}AkonadiCalendar ${AKONADICALENDAR_LIB_VERSION} REQUIRED)
--find_package(KPim${KF_MAJOR_VERSION}AkonadiContact ${AKONADICONTACT_LIB_VERSION} REQUIRED)
-+find_package(KPim${KF_MAJOR_VERSION}AkonadiContactCore ${AKONADICONTACTCORE_LIB_VERSION} REQUIRED)
- find_package(KPim${KF_MAJOR_VERSION}AkonadiMime ${AKONADIMIME_LIB_VERSION} REQUIRED)
- find_package(KPim${KF_MAJOR_VERSION}CalendarUtils ${CALENDARUTILS_LIB_VERSION} REQUIRED)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index f1809ce3af2d3cc166c945743dac947e09bd0e01..33ede9672d2751690feed5fc9f5f44a9f3fe18cb 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -95,7 +95,7 @@ target_link_libraries(
- # KF5::Contacts
-
- KF${KF_MAJOR_VERSION}::CalendarCore
-- KF${KF_MAJOR_VERSION}::Contacts
-+ KF${KF_MAJOR_VERSION}::ContactCore
-
- KPim${KF_MAJOR_VERSION}::AkonadiCore
- KPim${KF_MAJOR_VERSION}::AkonadiCalendar
-diff --git a/src/code/lib/CMakeLists.txt b/src/code/lib/CMakeLists.txt
-index f185ad0f7234db505724c6901765a2927fab0200..e56b10cf3f1591b66b19de3e9a5be06e1b9942a2 100644
---- a/src/code/lib/CMakeLists.txt
-+++ b/src/code/lib/CMakeLists.txt
-@@ -21,7 +21,7 @@ target_link_libraries(kalendar_lib PUBLIC
- KF${KF_MAJOR_VERSION}::CoreAddons
- KF${KF_MAJOR_VERSION}::CalendarCore
- KF${KF_MAJOR_VERSION}::ConfigWidgets
-- KF${KF_MAJOR_VERSION}::Contacts
-+ KF${KF_MAJOR_VERSION}::ContactCore
- KF${KF_MAJOR_VERSION}::ItemModels
-
- KPim${KF_MAJOR_VERSION}::AkonadiCore
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6325772..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-#akonadicontactscore
More information about the Neon-commits
mailing list