[SCM] libindi packaging branch, master, updated. debian/0.9.1-2-11-g752746a
Maximiliano Curia
maxy at alioth.debian.org
Wed Nov 6 20:12:14 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/libindi.git;a=commitdiff;h=8b1e172
The following commit has been merged in the master branch:
commit 8b1e1722c019d7693b6066f358bdf93a292f5467
Author: Maximiliano Curia <maxy at debian.org>
Date: Wed Nov 6 17:32:15 2013 +0100
Refresh patches.
---
debian/changelog | 1 +
debian/patches/abi.diff | 26 ++++++++++++++------------
debian/patches/libdir.diff | 8 +++++---
3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1eac245..8955d3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libindi (0.9.6-1) UNRELEASED; urgency=low
* New patch: getINDIproperty_mayhem_fix.diff fix for
http://www.forallsecure.com/bug-
reports/3ef71f68767fec365de8eb61f91a4ca0be01b5fc/
+ * Refresh patches.
-- Maximiliano Curia <maxy at debian.org> Wed, 06 Nov 2013 17:00:53 +0100
diff --git a/debian/patches/abi.diff b/debian/patches/abi.diff
index debfe96..11d0a6f 100644
--- a/debian/patches/abi.diff
+++ b/debian/patches/abi.diff
@@ -6,28 +6,30 @@ Origin: vendor
Last-Update: 2012-03-23
Forwarded: not-needed
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,11 +2,12 @@ cmake_minimum_required(VERSION 2.4.7)
- PROJECT(libindi C CXX)
+Index: libindi/CMakeLists.txt
+===================================================================
+--- libindi.orig/CMakeLists.txt 2013-11-06 18:43:55.472802336 +0100
++++ libindi/CMakeLists.txt 2013-11-06 18:48:55.160547857 +0100
+@@ -3,10 +3,12 @@
################## INDI version ################################
--set(INDI_SOVERSION "0")
-+set(INDI_SOVERSION "0b")
+ set(INDI_SOVERSION "0")
++set(CLIENT_INDI_SOVERSION "0b")
set(CMAKE_INDI_VERSION_MAJOR 0)
set(CMAKE_INDI_VERSION_MINOR 9)
- set(CMAKE_INDI_VERSION_RELEASE 0)
+ set(CMAKE_INDI_VERSION_RELEASE 6)
set(CMAKE_INDI_VERSION_STRING "${CMAKE_INDI_VERSION_MAJOR}.${CMAKE_INDI_VERSION_MINOR}.${CMAKE_INDI_VERSION_RELEASE}")
-+set(CMAKE_INDI_LIBVERSION_STRING "${INDI_SOVERSION}.${CMAKE_INDI_VERSION_MINOR}.${CMAKE_INDI_VERSION_RELEASE}")
++set(CMAKE_INDI_CLIENT_VERSION_STRING "${CLIENT_INDI_SOVERSION}.${CMAKE_INDI_VERSION_MINOR}.${CMAKE_INDI_VERSION_RELEASE}")
################## Paths ################################
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/")
-@@ -138,7 +139,7 @@ target_link_libraries(indi ${CFITSIO_LIB
+@@ -147,7 +149,8 @@
endif(CFITSIO_FOUND)
install(TARGETS indi LIBRARY DESTINATION ${LIB_DESTINATION})
-set_target_properties(indi PROPERTIES VERSION ${CMAKE_INDI_VERSION_STRING} SOVERSION ${INDI_SOVERSION})
-+set_target_properties(indi PROPERTIES VERSION ${CMAKE_INDI_LIBVERSION_STRING} SOVERSION ${INDI_SOVERSION})
++set_target_properties(indi PROPERTIES VERSION ${CMAKE_INDI_CLIENT_VERSION_STRING}
++ SOVERSION ${CLIENT_INDI_SOVERSION})
- ##################################################
- ############ INDI Main Static Library ############
+ ###################################################
+ ############ INDI Main Shared Library #############
diff --git a/debian/patches/libdir.diff b/debian/patches/libdir.diff
index cae3ba8..2376f15 100644
--- a/debian/patches/libdir.diff
+++ b/debian/patches/libdir.diff
@@ -9,9 +9,11 @@ Forwarded: no
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
+Index: libindi/CMakeLists.txt
+===================================================================
+--- libindi.orig/CMakeLists.txt 2013-11-06 17:30:59.715963317 +0100
++++ libindi/CMakeLists.txt 2013-11-06 17:30:59.711963476 +0100
+@@ -25,7 +25,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")
--
libindi packaging
More information about the pkg-kde-commits
mailing list