[SCM] libindi packaging branch, master, updated. debian/1.4.1+dfsg-3

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/libindi.git;a=commitdiff;h=18961cc

The following commit has been merged in the master branch:
commit 18961ccb73d928f524e77cc25e162650c0cf6a47
Author: Pino Toscano <pino at debian.org>
Date:   Sat Nov 25 08:54:20 2017 +0100

    restore one needed hunk in a patch
---
 .../patches/upstream_cmake-rewrite-libusb-1.0-search.patch   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/patches/upstream_cmake-rewrite-libusb-1.0-search.patch b/debian/patches/upstream_cmake-rewrite-libusb-1.0-search.patch
index 52d1289..7d0bafd 100644
--- a/debian/patches/upstream_cmake-rewrite-libusb-1.0-search.patch
+++ b/debian/patches/upstream_cmake-rewrite-libusb-1.0-search.patch
@@ -253,7 +253,7 @@ file which is used where needed.
  find_package(CURL REQUIRED)
  find_package(GSL REQUIRED)
  # libjpeg for V4L2
-@@ -229,7 +229,7 @@ include_directories( ${CMAKE_CURRENT_SOU
+@@ -229,13 +229,15 @@ include_directories( ${CMAKE_CURRENT_SOU
  include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/libs/indibase)
  include_directories( ${CFITSIO_INCLUDE_DIR})
  include_directories( ${NOVA_INCLUDE_DIR})
@@ -262,7 +262,15 @@ file which is used where needed.
  include_directories( ${GSL_INCLUDE_DIRS})
  if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
  include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/libs/webcam)
-@@ -300,20 +300,20 @@ add_definitions(-U__STRICT_ANSI__)
+   include_directories( ${JPEG_INCLUDE_DIR} )
+ endif()
+ 
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-usb.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-usb.h)
++
+ ###################################################################################################
+ ########################################  Sources  ################################################
+ ###################################################################################################
+@@ -300,20 +302,20 @@ add_definitions(-U__STRICT_ANSI__)
  find_package(Iconv REQUIRED)
  add_library(indidriver STATIC ${indidriver_SRCS} ${hidapi_SRCS})
  set_target_properties(indidriver PROPERTIES VERSION ${CMAKE_INDI_VERSION_STRING} SOVERSION ${INDI_SOVERSION} OUTPUT_NAME indidriver)

-- 
libindi packaging