[neon/neon-packaging/kdsoap/Neon/unstable] debian/patches: make it diff instead

[Carlos De Maine]

Git commit 969865134136cf78acc1bacb8b8157ab61f41e36 by Carlos De Maine.
Committed on 14/07/2023 at 15:09.
Pushed by carlosdem into branch 'Neon/unstable'.

make it diff instead

R  +38   -26   debian/patches/dual_headers.diff [from: debian/patches/dual_headers.patch - 080% similarity]
M  +1    -1    debian/patches/series

https://invent.kde.org/neon/neon-packaging/kdsoap/-/commit/969865134136cf78acc1bacb8b8157ab61f41e36

diff --git a/debian/patches/dual_headers.patch b/debian/patches/dual_headers.diff
similarity index 80%
rename from debian/patches/dual_headers.patch
rename to debian/patches/dual_headers.diff
index be57d30..cf88a02 100644
--- a/debian/patches/dual_headers.patch
+++ b/debian/patches/dual_headers.diff
@@ -1,27 +1,7 @@
-diff --git a/src/KDSoapClient/CMakeLists.txt b/src/KDSoapClient/CMakeLists.txt
-index b81ed4ae..4ecbb1ef 100644
---- a/src/KDSoapClient/CMakeLists.txt
-+++ b/src/KDSoapClient/CMakeLists.txt
-@@ -107,7 +107,7 @@ if(KDSoap_IS_ROOT_PROJECT)
-               KDSoapEndpointReference.h
-               KDQName.h
-               KDSoapUdpClient.h
--        DESTINATION ${INSTALL_INCLUDE_DIR}/KDSoapClient
-+        DESTINATION "${INSTALL_INCLUDE_DIR}/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}/KDSoapClient"
-     )
- 
-     install(
-
-@@ -88,7 +88,7 @@ if(KDSoap_IS_ROOT_PROJECT)
-               KDSoapServerObjectInterface.h
-               KDSoapServerGlobal.h
-               KDSoapThreadPool.h
--        DESTINATION ${INSTALL_INCLUDE_DIR}/KDSoapServer
-+        DESTINATION "${INSTALL_INCLUDE_DIR}/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}/KDSoapServer"
-     )
- 
-     install(
-
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 489af811..0b536483 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -207,7 +207,7 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
          COMPATIBILITY
          AnyNewerVersion
@@ -31,7 +11,6 @@ index b81ed4ae..4ecbb1ef 100644
  
      configure_file(
          "${CMAKE_CURRENT_SOURCE_DIR}/KDSoapConfig-buildtree.cmake.in"
-
 @@ -221,7 +221,7 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
          "${CMAKE_CURRENT_SOURCE_DIR}/KDSoapConfig.cmake.in"
          "${CMAKE_CURRENT_BINARY_DIR}/install/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}Config.cmake"
@@ -41,6 +20,13 @@ index b81ed4ae..4ecbb1ef 100644
      )
  
      install(
+@@ -308,4 +308,4 @@ if(${PROJECT_NAME}_IS_ROOT_PROJECT)
+     include(ECMUninstallTarget)
+ endif()
+ 
+-feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
++feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
+\ No newline at end of file
 diff --git a/KDSoapConfig-buildtree.cmake.in b/KDSoapConfig-buildtree.cmake.in
 index 0bdf5fca..716ffb97 100644
 --- a/KDSoapConfig-buildtree.cmake.in
@@ -66,4 +52,30 @@ index d20649a4..229605b3 100644
 +set_and_check(KDSoap_INCLUDE_DIR "@PACKAGE_INSTALL_INCLUDE_DIR at KDSoap${${PROJECT_NAME}_LIBRARY_QTID}")
  
  set(KDSoap_INCLUDE_DIRS "${KDSoap_INCLUDE_DIR}")
- set(KDSoap_CODEGENERATOR KDSoap::kdwsdl2cpp)
\ No newline at end of file
+ set(KDSoap_CODEGENERATOR KDSoap::kdwsdl2cpp)
+diff --git a/src/KDSoapClient/CMakeLists.txt b/src/KDSoapClient/CMakeLists.txt
+index b81ed4ae..4ecbb1ef 100644
+--- a/src/KDSoapClient/CMakeLists.txt
++++ b/src/KDSoapClient/CMakeLists.txt
+@@ -107,7 +107,7 @@ if(KDSoap_IS_ROOT_PROJECT)
+               KDSoapEndpointReference.h
+               KDQName.h
+               KDSoapUdpClient.h
+-        DESTINATION ${INSTALL_INCLUDE_DIR}/KDSoapClient
++        DESTINATION "${INSTALL_INCLUDE_DIR}/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}/KDSoapClient"
+     )
+ 
+     install(
+diff --git a/src/KDSoapServer/CMakeLists.txt b/src/KDSoapServer/CMakeLists.txt
+index a4a0e812..2e145b02 100644
+--- a/src/KDSoapServer/CMakeLists.txt
++++ b/src/KDSoapServer/CMakeLists.txt
+@@ -88,7 +88,7 @@ if(KDSoap_IS_ROOT_PROJECT)
+               KDSoapServerObjectInterface.h
+               KDSoapServerGlobal.h
+               KDSoapThreadPool.h
+-        DESTINATION ${INSTALL_INCLUDE_DIR}/KDSoapServer
++        DESTINATION "${INSTALL_INCLUDE_DIR}/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}/KDSoapServer"
+     )
+ 
+     install(
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index a3d1572..aeb33cf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-dual_headers.patch
+dual_headers.diff