[neon/neon-packaging/vector-blf/Neon/unstable] debian/patches: refresh patches

[Carlos De Maine]

Git commit 15e2bb1c4eadc5b3006ba58fcf908529456baa31 by Carlos De Maine.
Committed on 01/04/2023 at 04:58.
Pushed by carlosdem into branch 'Neon/unstable'.

refresh patches

M  +1    -13   debian/patches/0001_labplot_patches
M  +3    -23   debian/patches/0002_labplot_patches
C  +0    -13   debian/patches/0002_labplot_patches_master [from: debian/patches/0002_labplot_patches - 079% similarity]
M  +1    -1    debian/patches/series

https://invent.kde.org/neon/neon-packaging/vector-blf/commit/15e2bb1c4eadc5b3006ba58fcf908529456baa31

diff --git a/debian/patches/0001_labplot_patches b/debian/patches/0001_labplot_patches
index d188a2c..734c4d9 100644
--- a/debian/patches/0001_labplot_patches
+++ b/debian/patches/0001_labplot_patches
@@ -1,18 +1,6 @@
-From 8e6cf6460c8c8959d5a89c4c7fe02145698c4e91 Mon Sep 17 00:00:00 2001
-From: Martin Marmsoler <martin.marmsoler at gmail.com>
-Date: Tue, 31 Jan 2023 17:32:05 +0100
-Subject: [PATCH] do not change install destination, because dlls are stored
- then also in libdir instead in the default runtime dir "bin"
-
----
- src/Vector/BLF/CMakeLists.txt | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/Vector/BLF/CMakeLists.txt b/src/Vector/BLF/CMakeLists.txt
-index b028ea11..590715a1 100644
 --- a/src/Vector/BLF/CMakeLists.txt
 +++ b/src/Vector/BLF/CMakeLists.txt
-@@ -341,8 +341,7 @@ endif()
+@@ -328,8 +328,7 @@
  
  # install
  install(
diff --git a/debian/patches/0002_labplot_patches b/debian/patches/0002_labplot_patches
index 7e15081..9ec0bb5 100644
--- a/debian/patches/0002_labplot_patches
+++ b/debian/patches/0002_labplot_patches
@@ -1,21 +1,6 @@
-From b7a419c4d8edbf495ab309b57a380a2444ee2730 Mon Sep 17 00:00:00 2001
-From: Martin Marmsoler <martin.marmsoler at gmail.com>
-Date: Thu, 2 Mar 2023 19:34:58 +0100
-Subject: [PATCH] Install files only if not FETCH_CONTENT_INCLUSION, because
- when including the project into another project with FecthContent the headers
- are only needed during build but not after installation
-
----
- CMakeLists.txt                |  2 ++
- src/Vector/BLF/CMakeLists.txt | 21 ++++++++++++---------
- src/Vector/CMakeLists.txt     |  8 +++++---
- 3 files changed, 19 insertions(+), 12 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3bb50c75..16a7920f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -21,6 +21,8 @@ option(OPTION_BUILD_TESTS "Build tests" OFF)
+@@ -20,6 +20,8 @@
  option(OPTION_USE_GCOV "Build with gcov to generate coverage data on execution" OFF)
  option(OPTION_USE_GPROF "Build with gprof" OFF)
  option(OPTION_ADD_LCOV "Add lcov targets to generate HTML coverage report" OFF)
@@ -24,11 +9,9 @@ index 3bb50c75..16a7920f 100644
  
  # directories
  include(GNUInstallDirs)
-diff --git a/src/Vector/BLF/CMakeLists.txt b/src/Vector/BLF/CMakeLists.txt
-index 590715a1..71cd1d71 100644
 --- a/src/Vector/BLF/CMakeLists.txt
 +++ b/src/Vector/BLF/CMakeLists.txt
-@@ -342,15 +342,18 @@ endif()
+@@ -329,15 +329,18 @@
  # install
  install(
      TARGETS ${PROJECT_NAME})
@@ -56,12 +39,9 @@ index 590715a1..71cd1d71 100644
  
  # sub directories
  add_subdirectory(docs)
-diff --git a/src/Vector/CMakeLists.txt b/src/Vector/CMakeLists.txt
-index d321b47d..e3cca81e 100644
 --- a/src/Vector/CMakeLists.txt
 +++ b/src/Vector/CMakeLists.txt
-@@ -4,6 +4,8 @@
- 
+@@ -1,5 +1,7 @@
  add_subdirectory(BLF)
  
 -install(
diff --git a/debian/patches/0002_labplot_patches b/debian/patches/0002_labplot_patches_master
similarity index 79%
copy from debian/patches/0002_labplot_patches
copy to debian/patches/0002_labplot_patches_master
index 7e15081..fd15845 100644
--- a/debian/patches/0002_labplot_patches
+++ b/debian/patches/0002_labplot_patches_master
@@ -1,16 +1,3 @@
-From b7a419c4d8edbf495ab309b57a380a2444ee2730 Mon Sep 17 00:00:00 2001
-From: Martin Marmsoler <martin.marmsoler at gmail.com>
-Date: Thu, 2 Mar 2023 19:34:58 +0100
-Subject: [PATCH] Install files only if not FETCH_CONTENT_INCLUSION, because
- when including the project into another project with FecthContent the headers
- are only needed during build but not after installation
-
----
- CMakeLists.txt                |  2 ++
- src/Vector/BLF/CMakeLists.txt | 21 ++++++++++++---------
- src/Vector/CMakeLists.txt     |  8 +++++---
- 3 files changed, 19 insertions(+), 12 deletions(-)
-
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 3bb50c75..16a7920f 100644
 --- a/CMakeLists.txt
diff --git a/debian/patches/series b/debian/patches/series
index adf7292..95d6749 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 0001_labplot_patches
-0002_labplot_patches
\ No newline at end of file
+0002_labplot_patches