[SCM] libindi packaging branch, master, updated. debian/1.1.0-2

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 396e1d48e38d0b3c40cd231272d7429c9d1385dd
Author: Steven Chamberlain <steven at pyro.eu.org>
Date:   Tue Mar 1 08:49:32 2016 +0100

    Update patch freebsd_support, use system includes for the libusb.h header
---
 debian/changelog               |  3 ++-
 debian/patches/freebsd_support | 29 +++++++++++++++++------------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dc52ee9..19250eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libindi (1.1.0-2~) UNRELEASED; urgency=medium
 
-  * 
+  * Update patch freebsd_support, use system includes for the libusb.h
+    header
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Mar 2016 08:46:58 +0100
 
diff --git a/debian/patches/freebsd_support b/debian/patches/freebsd_support
index ba831a5..fe59be5 100644
--- a/debian/patches/freebsd_support
+++ b/debian/patches/freebsd_support
@@ -1,7 +1,5 @@
-Index: libindi/cmake_modules/FindUSB-1.cmake
-===================================================================
---- libindi.orig/cmake_modules/FindUSB-1.cmake	2016-01-18 15:14:27.504507896 +0100
-+++ libindi/cmake_modules/FindUSB-1.cmake	2016-01-18 15:14:27.460509736 +0100
+--- a/cmake_modules/FindUSB-1.cmake
++++ b/cmake_modules/FindUSB-1.cmake
 @@ -46,16 +46,16 @@
    # in cache already
    set(LIBUSB_FOUND TRUE)
@@ -47,10 +45,8 @@ Index: libindi/cmake_modules/FindUSB-1.cmake
          int main() { libusb_error_name(0); return 0; }" ERROR_NAME_COMPILE)
        if (NOT ERROR_NAME_COMPILE)
          add_definitions("-DNO_ERROR_NAME")
-Index: libindi/libs/indibase/indiusbdevice.h
-===================================================================
---- libindi.orig/libs/indibase/indiusbdevice.h	2016-01-18 15:14:27.504507896 +0100
-+++ libindi/libs/indibase/indiusbdevice.h	2016-01-18 15:14:27.492508398 +0100
+--- a/libs/indibase/indiusbdevice.h
++++ b/libs/indibase/indiusbdevice.h
 @@ -1,6 +1,6 @@
  /*******************************************************************************
   Copyright(c) 2011 Gerry Rozema. All rights reserved.
@@ -68,10 +64,8 @@ Index: libindi/libs/indibase/indiusbdevice.h
  #endif
  
  #include "indibase.h"
-Index: libindi/CMakeLists.txt
-===================================================================
---- libindi.orig/CMakeLists.txt	2016-01-18 15:14:27.504507896 +0100
-+++ libindi/CMakeLists.txt	2016-01-18 15:14:27.500508063 +0100
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -78,6 +78,7 @@
    include_directories(${CFITSIO_INCLUDE_DIR})
  endif (CFITSIO_FOUND)
@@ -80,3 +74,14 @@ Index: libindi/CMakeLists.txt
  include_directories(${NOVA_INCLUDE_DIR})
  
  set(liblilxml_SRCS  ${CMAKE_SOURCE_DIR}/libs/lilxml.c )
+--- 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"

-- 
libindi packaging