[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=fe4bc23

The following commit has been merged in the master branch:
commit fe4bc23018bcd109c96e916464c4b5779c20f2b9
Author: Pino Toscano <pino at debian.org>
Date:   Thu Nov 23 08:05:00 2017 +0100

    update the patches
    
    - freebsd_support: drop, applied/fixed upstream
---
 debian/changelog               |   2 +
 debian/patches/freebsd_support | 110 -----------------------------------------
 debian/patches/series          |   1 -
 3 files changed, 2 insertions(+), 111 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 215ca08..fe52052 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libindi (1.4.1-0r1) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * New upstream release.
+  * Update the patches:
+    - freebsd_support: drop, applied/fixed upstream
 
  -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Thu, 23 Nov 2017 07:38:00 +0100
 
diff --git a/debian/patches/freebsd_support b/debian/patches/freebsd_support
deleted file mode 100644
index 71a9e9d..0000000
--- a/debian/patches/freebsd_support
+++ /dev/null
@@ -1,110 +0,0 @@
---- a/cmake_modules/FindUSB-1.cmake
-+++ b/cmake_modules/FindUSB-1.cmake
-@@ -46,16 +46,16 @@
-   # in cache already
-   set(LIBUSB_FOUND TRUE)
- else (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
-+
-   find_path(LIBUSB_1_INCLUDE_DIR
-     NAMES
--	libusb.h
-+        libusb.h
-     PATHS
-       /usr/include
-+      /usr/include/libusb-1.0
-       /usr/local/include
-       /opt/local/include
-       /sw/include
--	PATH_SUFFIXES
--	  libusb-1.0
-   )
- 
-   find_library(LIBUSB_1_LIBRARY
-@@ -73,10 +73,14 @@
-   )
-   set(LIBUSB_1_LIBRARIES
-     ${LIBUSB_1_LIBRARY}
--)
-+  )
- 
-   if (LIBUSB_1_INCLUDE_DIRS AND LIBUSB_1_LIBRARIES)
-      set(LIBUSB_1_FOUND TRUE)
-+  else (LIBUSB_1_INCLUDE_DIRS AND LIBUSB_1_LIBRARIES)
-+     find_package(PkgConfig)
-+     pkg_check_modules(LIBUSB_1 QUIET libusb-1.0)
-+     set(LIBUSB_1_DEFINITIONS ${LIBUSB_1_CFLAGS} ${LIBUSB_1_CFLAGS_OTHER})
-   endif (LIBUSB_1_INCLUDE_DIRS AND LIBUSB_1_LIBRARIES)
- 
-   if (LIBUSB_1_FOUND)
-@@ -89,7 +93,7 @@
-     set(CMAKE_REQUIRED_LIBRARIES ${LIBUSB_1_LIBRARIES})
-     if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-       include (CheckCXXSourceCompiles)
--      check_cxx_source_compiles("#include <libusb-1.0/libusb.h> 
-+      check_cxx_source_compiles("#include <libusb.h> 
-         int main() { libusb_error_name(0); return 0; }" ERROR_NAME_COMPILE)
-       if (NOT ERROR_NAME_COMPILE)
-         add_definitions("-DNO_ERROR_NAME")
---- a/libs/indibase/indiusbdevice.h
-+++ b/libs/indibase/indiusbdevice.h
-@@ -1,6 +1,6 @@
- /*******************************************************************************
-  Copyright(c) 2011 Gerry Rozema. All rights reserved.
-- 
-+
-  Upgrade to libusb 1.0 by CloudMakers, s. r. o.
-  Copyright(c) 2013 CloudMakers, s. r. o. All rights reserved.
- 
-@@ -32,7 +32,7 @@
- #ifdef OSX_EMBEDED_MODE
- #include <libusb.h>
- #else
--#include <libusb-1.0/libusb.h>
-+#include <libusb.h>
- #endif
- 
- #include "indibase.h"
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -78,6 +78,7 @@
-   include_directories(${CFITSIO_INCLUDE_DIR})
- endif (CFITSIO_FOUND)
- 
-+include_directories(${LIBUSB_1_INCLUDE_DIRS})
- include_directories(${NOVA_INCLUDE_DIR})
- 
- set(liblilxml_SRCS  ${CMAKE_SOURCE_DIR}/libs/lilxml.c )
-@@ -204,9 +205,9 @@
- ##################################################
- ########### INDI Alignment Subsystem #############
- ##################################################
--if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+# if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- add_subdirectory(${CMAKE_SOURCE_DIR}/libs/indibase/alignment)
--endif()
-+# endif()
- 
- #####################################
- ######## AGENT GROUP #########
---- a/libs/indibase/hid_libusb.c
-+++ b/libs/indibase/hid_libusb.c
-@@ -52,7 +52,7 @@
- #include <wchar.h>
- 
- /* GNU / LibUSB */
--#include "libusb-1.0/libusb.h"
-+#include <libusb.h>
- #include "iconv.h"
- 
- #include "hidapi.h"
---- a/drivers/focuser/smartfocus.cpp
-+++ b/drivers/focuser/smartfocus.cpp
-@@ -20,7 +20,7 @@
- #include "indicom.h"
- 
- #include <fcntl.h>
--#include <termio.h>
-+#include <termios.h>
- #include <unistd.h>
- 
- #include <memory>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 773e432..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-freebsd_support

-- 
libindi packaging