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

Pino Toscano pino at alioth.debian.org
Thu Sep 29 12:28:08 UTC 2011


The following commit has been merged in the master branch:
commit f66a43d308df19a62e4b13b3378539e171e3f0b6
Author: Pino Toscano <pino at debian.org>
Date:   Thu Sep 29 14:27:51 2011 +0200

    add patch destdir.diff to respect the DESTDIR envvar
---
 debian/changelog            |    1 +
 debian/patches/destdir.diff |   39 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series       |    1 +
 3 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 453bb2e..292bb9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,5 +4,6 @@ libindi (0.8-0r1) UNRELEASED; urgency=low
   * Add patches:
     - format-security.diff: fix string literals for snprintf() invocations
     - libdir.diff: respect the LIB_DESTINATION cmake variable
+    - destdir.diff: respect the DESTDIR envvar
 
  -- Pino Toscano <pino at debian.org>  Thu, 29 Sep 2011 10:53:33 +0200
diff --git a/debian/patches/destdir.diff b/debian/patches/destdir.diff
new file mode 100644
index 0000000..24cd761
--- /dev/null
+++ b/debian/patches/destdir.diff
@@ -0,0 +1,39 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Respect the envvar DESTIR
+ When installing, use the DESTDIR envvar to setup the symlinks in
+ BIN_INSTALL_DIR.
+Last-Update: 2011-09-29
+Forwarded: no
+
+---
+ CMakeLists.txt |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -212,11 +212,11 @@ endif (NOVA_FOUND)
+ install(TARGETS indi_lx200generic RUNTIME DESTINATION bin )
+ 
+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake
+-"exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200classic)


+-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200autostar)


+-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200_16)


+-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200gps)


+-exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_lx200ap)


++"exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200classic)


++exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200autostar)


++exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200_16)


++exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200gps)


++exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_lx200ap)


+ ")
+ set_target_properties(indi_lx200generic PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake)
+ #################################################################################
+@@ -405,7 +405,7 @@ endif (NOVA_FOUND)
+ install(TARGETS indi_tcfs_focus RUNTIME DESTINATION bin )
+ 
+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_tcfs_symlink.cmake
+-"exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_tcfs_focus ${BUILD_ROOT}${BIN_INSTALL_DIR}/indi_tcfs3_focus)
")
++"exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_tcfs_focus \$ENV{DESTDIR}${BIN_INSTALL_DIR}/indi_tcfs3_focus)
")
+ set_target_properties(indi_tcfs_focus PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_tcfs_symlink.cmake)
+ 
+ #################################################################################
diff --git a/debian/patches/series b/debian/patches/series
index d144b26..7cb7567 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 format-security.diff
 libdir.diff
+destdir.diff

-- 
libindi packaging



More information about the pkg-kde-commits mailing list