[SCM] libindi packaging branch, master, updated. debian/0.8-1-7-g57804ae
Pino Toscano
pino at alioth.debian.org
Mon Jan 16 13:05:34 UTC 2012
The following commit has been merged in the master branch:
commit cc30fec2108483ef4bd66b7ddb3ea4624109247a
Author: Pino Toscano <pino at debian.org>
Date: Mon Jan 16 12:05:06 2012 +0100
update the patches
- destdir.diff: drop, applied upstream
- fix-pkgconfig.diff: drop, applied upstream
- format-security.diff: drop, applied upstream
- libdir.diff: refresh, dropping the applied parts
---
debian/changelog | 5 ++++
debian/patches/destdir.diff | 39 --------------------------------
debian/patches/fix-pkgconfig.diff | 26 ---------------------
debian/patches/format-security.diff | 26 ---------------------
debian/patches/libdir.diff | 42 +++-------------------------------
debian/patches/series | 3 --
6 files changed, 9 insertions(+), 132 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2d340e5..b40f599 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
libindi (0.9-0r1) UNRELEASED; urgency=low
* New upstream release.
+ * Update the patches:
+ - destdir.diff: drop, applied upstream
+ - fix-pkgconfig.diff: drop, applied upstream
+ - format-security.diff: drop, applied upstream
+ - libdir.diff: refresh, dropping the applied parts
-- Pino Toscano <pino at debian.org> Mon, 16 Jan 2012 11:48:20 +0100
diff --git a/debian/patches/destdir.diff b/debian/patches/destdir.diff
deleted file mode 100644
index 24cd761..0000000
--- a/debian/patches/destdir.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-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/fix-pkgconfig.diff b/debian/patches/fix-pkgconfig.diff
deleted file mode 100644
index db2fefb..0000000
--- a/debian/patches/fix-pkgconfig.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: fix the pkgconfig file
- - add a missing 'I' for one of the -I include dirs
- - use the ${includedir} and ${libdir} variables
- - fix the URL field
-Last-Update: 2011-10-01
-Forwarded: no
-
----
- libindi.pc.cmake | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/libindi.pc.cmake
-+++ b/libindi.pc.cmake
-@@ -5,8 +5,8 @@ includedir=@INCLUDE_INSTALL_DIR@
-
- Name: libindi
- Description: Instrument Neutral Distributed Interface
--URL=http://www.indilib.org/
-+URL: http://www.indilib.org/
- Version: @CMAKE_INDI_VERSION_STRING@
--Libs: -L at LIB_DESTINATION@ -lindi
--Cflags: -I at INCLUDE_INSTALL_DIR@ - at INCLUDE_INSTALL_DIR@/libindi
-+Libs: -L${libdir} -lindi
-+Cflags: -I${includedir} -I${includedir}/libindi
-
diff --git a/debian/patches/format-security.diff b/debian/patches/format-security.diff
deleted file mode 100644
index 2ddfbd1..0000000
--- a/debian/patches/format-security.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: fix literal strings for string printf-like format
- Make the text buffers const, so they can be properly handled as string
- literals for snprintf().
-Last-Update: 2011-09-29
-Forwarded: no
-
----
- tools/compiler.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/tools/compiler.c
-+++ b/tools/compiler.c
-@@ -266,9 +266,9 @@ double value;
- static int
- next_token ()
- {
-- static char toomv[] = "More than %d variables";
-- static char toomc[] = "More than %d constants";
-- static char badop[] = "Illegal operator";
-+ static const char toomv[] = "More than %d variables";
-+ static const char toomc[] = "More than %d constants";
-+ static const char badop[] = "Illegal operator";
- int tok = ERR; /* just something illegal */
- char c;
-
diff --git a/debian/patches/libdir.diff b/debian/patches/libdir.diff
index c4278d2..9c69503 100644
--- a/debian/patches/libdir.diff
+++ b/debian/patches/libdir.diff
@@ -2,16 +2,16 @@ 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
+Last-Update: 2012-01-16
Forwarded: no
---
- CMakeLists.txt | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -20,7 +20,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define
+@@ -19,7 +19,7 @@ set (LIB_SUFFIX "" CACHE STRING "Define
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")
@@ -20,37 +20,3 @@ Forwarded: no
################## Includes ################################
Include (CheckCXXSourceCompiles)
-@@ -145,7 +145,7 @@ if (CFITSIO_FOUND)
- 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 @@ set_target_properties(indi PROPERTIES VE
- # 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 90fa91c..b7e163a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-format-security.diff
libdir.diff
-destdir.diff
-fix-pkgconfig.diff
--
libindi packaging
More information about the pkg-kde-commits
mailing list