[SCM] libindi packaging branch, master, updated. debian/0.9.8.1-4-8-g7621026

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 4d722a9cf02500bb19ed86d407eb825b781c05b3
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sat Aug 30 04:28:04 2014 +0200

    Reorder freebsd patch
---
 debian/patches/freebsd_support | 102 ++++++++++++-----------------------------
 1 file changed, 29 insertions(+), 73 deletions(-)

diff --git a/debian/patches/freebsd_support b/debian/patches/freebsd_support
index 909a8c3..a94b61a 100644
--- a/debian/patches/freebsd_support
+++ b/debian/patches/freebsd_support
@@ -1,88 +1,44 @@
 Index: libindi/cmake_modules/FindUSB-1.cmake
 ===================================================================
 --- libindi.orig/cmake_modules/FindUSB-1.cmake	2014-08-30 03:56:46.016848990 +0200
-+++ libindi/cmake_modules/FindUSB-1.cmake	2014-08-30 04:13:30.331844482 +0200
-@@ -46,38 +46,47 @@
++++ libindi/cmake_modules/FindUSB-1.cmake	2014-08-30 04:26:46.311326552 +0200
+@@ -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
++
+   find_path(LIBUSB_1_INCLUDE_DIR
+     NAMES
 -	libusb.h
--    PATHS
--      /usr/include
--      /usr/local/include
--      /opt/local/include
--      /sw/include
++        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
--    NAMES
--      usb-1.0
--    PATHS
--      /usr/lib
--      /usr/local/lib
--      /opt/local/lib
--      /sw/lib
--  )
--
--  set(LIBUSB_1_INCLUDE_DIRS
--    ${LIBUSB_1_INCLUDE_DIR}
--  )
--  set(LIBUSB_1_LIBRARIES
--    ${LIBUSB_1_LIBRARY}
+   )
+ 
+   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)
--  endif (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})
-+
-+  if (NOT LIBUSB_1_FOUND)
-+
-+    find_path(LIBUSB_1_INCLUDE_DIR
-+      NAMES
-+          libusb.h
-+      PATHS
-+        /usr/include
-+        /usr/local/include
-+        /opt/local/include
-+        /sw/include
-+          PATH_SUFFIXES
-+            libusb-1.0
-+    )
-+
-+    find_library(LIBUSB_1_LIBRARY
-+      NAMES
-+        usb-1.0
-+      PATHS
-+        /usr/lib
-+        /usr/local/lib
-+        /opt/local/lib
-+        /sw/lib
-+    )
-+
-+    set(LIBUSB_1_INCLUDE_DIRS
-+      ${LIBUSB_1_INCLUDE_DIR}
-+    )
-+    set(LIBUSB_1_LIBRARIES
-+      ${LIBUSB_1_LIBRARY}
-+    )
-+
-+    if (LIBUSB_1_INCLUDE_DIRS AND LIBUSB_1_LIBRARIES)
-+       set(LIBUSB_1_FOUND TRUE)
-+    endif (LIBUSB_1_INCLUDE_DIRS AND LIBUSB_1_LIBRARIES)
-+
-+  endif (NOT LIBUSB_1_FOUND)
++  )
+ 
+   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)
-     if (NOT USB-1_FIND_QUIETLY)
-@@ -88,13 +97,13 @@
+@@ -88,13 +92,13 @@
      set(CMAKE_REQUIRED_INCLUDES ${LIBUSB_1_INCLUDE_DIRS})
      set(CMAKE_REQUIRED_LIBRARIES ${LIBUSB_1_LIBRARIES})
      include (CheckCXXSourceCompiles)

-- 
libindi packaging