[SCM] libindi packaging branch, master, updated. f66a43d308df19a62e4b13b3378539e171e3f0b6

[Pino Toscano]

The following commit has been merged in the master branch:
commit b2bde5ec19bf3103817847354a30e01d1ecbd1a4
Author: Pino Toscano <pino at debian.org>
Date:   Thu Sep 29 13:02:32 2011 +0200

    add patch libdir.diff to respect the LIB_DESTINATION cmake variable
---
 debian/changelog           |    1 +
 debian/patches/libdir.diff |   52 ++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |    1 +
 3 files changed, 54 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 76fb72d..453bb2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,5 +3,6 @@ libindi (0.8-0r1) UNRELEASED; urgency=low
   * Initial release.
   * Add patches:
     - format-security.diff: fix string literals for snprintf() invocations
+    - libdir.diff: respect the LIB_DESTINATION cmake variable
 
  -- Pino Toscano <pino at debian.org>  Thu, 29 Sep 2011 10:53:33 +0200
diff --git a/debian/patches/libdir.diff b/debian/patches/libdir.diff
new file mode 100644
index 0000000..978a208
--- /dev/null
+++ b/debian/patches/libdir.diff
@@ -0,0 +1,52 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Respect the LIB_DESTINATION cmake variable
+ Use the LIB_DESTINATION in install() calls, instead of hardcoding lib$SUFFIX
+ everywhere.
+Last-Update: 2011-09-29
+Forwarded: no
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,7 +20,7 @@
+ set (LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name")
+ ## the following are directories where stuff will be installed to
+ set(INCLUDE_INSTALL_DIR      "${CMAKE_INSTALL_PREFIX}/include/" CACHE PATH "The subdirectory to the header prefix")
+-set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files")
++set(PKGCONFIG_INSTALL_PREFIX "${LIB_DESTINATION}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files")
+ 
+ ##################  Includes  ################################
+ Include (CheckCXXSourceCompiles)
+@@ -145,7 +145,7 @@
+ target_link_libraries(indi ${CFITSIO_LIBRARIES})
+ endif(CFITSIO_FOUND)
+ 
+-install(TARGETS indi LIBRARY DESTINATION lib${LIB_POSTFIX})
++install(TARGETS indi LIBRARY DESTINATION ${LIB_DESTINATION})
+ set_target_properties(indi PROPERTIES VERSION ${CMAKE_INDI_VERSION_STRING} SOVERSION ${INDI_SOVERSION})
+ 
+ ##################################################
+@@ -153,21 +153,21 @@
+ # To link with main() for 3rd party drivers      #
+ ##################################################
+ add_library(indimain STATIC ${indimain_SRCS})
+-install(TARGETS indimain ARCHIVE DESTINATION lib${LIB_POSTFIX})
++install(TARGETS indimain ARCHIVE DESTINATION ${LIB_DESTINATION})
+ 
+ ##################################################
+ ###### INDI Default Driver Static Library ########
+ # To link with main() and indibase classes       #
+ ##################################################
+ add_library(indidriver STATIC ${indimain_SRCS} ${indidriver_SRCS})
+-install(TARGETS indidriver ARCHIVE DESTINATION lib${LIB_POSTFIX})
++install(TARGETS indidriver ARCHIVE DESTINATION ${LIB_DESTINATION})
+ 
+ ##################################################
+ ########### INDI Client Static Library ###########
+ ##################################################
+ add_library(indiclient STATIC ${indiclient_SRCS})
+ target_link_libraries(indiclient indi pthread)
+-install(TARGETS indiclient ARCHIVE DESTINATION lib${LIB_POSTFIX})
++install(TARGETS indiclient ARCHIVE DESTINATION ${LIB_DESTINATION})
+ 
+ #####################################
+ ########## TELESCOPE GROUP ##########
diff --git a/debian/patches/series b/debian/patches/series
index ad58f69..d144b26 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 format-security.diff
+libdir.diff

-- 
libindi packaging