[neon/extras/calamares/Neon/release] debian/patches: remove patch now in branch

Jonathan Esk-Riddell null at kde.org
Fri Dec 2 15:10:59 GMT 2022


Git commit 473e2c74a79ce30caa1f3f60be43910046a8f496 by Jonathan Esk-Riddell.
Committed on 02/12/2022 at 14:34.
Pushed by jriddell into branch 'Neon/release'.

remove patch now in branch

D  +0    -1    debian/patches/series
D  +0    -17   debian/patches/settings.conf.diff

https://invent.kde.org/neon/extras/calamares/commit/473e2c74a79ce30caa1f3f60be43910046a8f496

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 718ef9e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-settings.conf.diff
diff --git a/debian/patches/settings.conf.diff b/debian/patches/settings.conf.diff
deleted file mode 100644
index e2fe297..0000000
--- a/debian/patches/settings.conf.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 289aab268..abc89af8c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -585,9 +585,9 @@ install(
- ### Miscellaneous installs
- #
- #
--if( settings.conf IS_NEWER_THAN ${CMAKE_BINARY_DIR}/settings.conf )
--    install(FILES settings.conf DESTINATION ${CMAKE_BINARY_DIR})
--endif()
-+#if( settings.conf IS_NEWER_THAN ${CMAKE_BINARY_DIR}/settings.conf )
-+#    install(FILES settings.conf DESTINATION ${CMAKE_BINARY_DIR})
-+#endif()
- 
- if(INSTALL_POLKIT)
-     install(FILES com.github.calamares.calamares.policy DESTINATION "${POLKITQT-1_POLICY_FILES_INSTALL_DIR}")


More information about the Neon-commits mailing list