[neon/extras/plasma-pass/Neon/stable] debian/patches: remove patch in branch

Jonathan Riddell null at kde.org
Mon Oct 18 11:33:54 BST 2021


Git commit b249557ea8edbe99702dcddccc45b08a02d0e9b4 by Jonathan Riddell.
Committed on 18/10/2021 at 10:33.
Pushed by jriddell into branch 'Neon/stable'.

remove patch in branch

D  +0    -1    debian/patches/series
D  +0    -31   debian/patches/upstream_cmake-install-plasma-pass.categories-in-newer-locati.patch

https://invent.kde.org/neon/extras/plasma-pass/commit/b249557ea8edbe99702dcddccc45b08a02d0e9b4

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 44e3db4..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_cmake-install-plasma-pass.categories-in-newer-locati.patch
diff --git a/debian/patches/upstream_cmake-install-plasma-pass.categories-in-newer-locati.patch b/debian/patches/upstream_cmake-install-plasma-pass.categories-in-newer-locati.patch
deleted file mode 100644
index a38d31b..0000000
--- a/debian/patches/upstream_cmake-install-plasma-pass.categories-in-newer-locati.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5f62fcc30e7d6c8248dfb6a263ee4a49e7c19e3b Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Wed, 17 Feb 2021 21:02:08 +0100
-Subject: [PATCH] cmake: install plasma-pass.categories in newer location
-
-Install plasma-pass.categories in the proper location for it, in case
-ECM >= 5.59.0 is used.
----
- CMakeLists.txt | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c0bed60..c32b637 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,7 +53,11 @@ add_subdirectory(plugin)
- if (BUILD_TESTING)
-     add_subdirectory(tests)
- endif()
--install( FILES plasma-pass.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
-+if(ECM_VERSION VERSION_GREATER_EQUAL 5.59)
-+    install(FILES plasma-pass.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
-+else()
-+    install(FILES plasma-pass.categories DESTINATION ${KDE_INSTALL_CONFDIR})
-+endif()
- 
- if(ECM_VERSION VERSION_GREATER_EQUAL 5.79)
-     kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
--- 
-2.30.1
-


More information about the Neon-commits mailing list