[SCM] libindi packaging branch, master, updated. debian/0.9.7-1-8-g220c762

Maximiliano Curia maxy at moszumanska.debian.org
Tue Apr 1 15:55:43 UTC 2014


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

The following commit has been merged in the master branch:
commit a7b89eb911be8e7017428e59e825583cb926339c
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Apr 1 15:59:23 2014 +0200

    Remove patches applied upstream, refresh abi.diff.
---
 debian/changelog                               |  4 ++++
 debian/patches/abi.diff                        | 30 +++++++++++++-------------
 debian/patches/getINDIproperty_mayhem_fix.diff | 17 ---------------
 debian/patches/libdir.diff                     | 24 ---------------------
 debian/patches/series                          |  3 ---
 debian/patches/setINDIproperty_mayhem_fix.diff | 24 ---------------------
 6 files changed, 19 insertions(+), 83 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f00624..2b4d316 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ libindi (0.9.8.1-1) UNRELEASED; urgency=medium
 
   * Update watch file.
   * New upstream release.
+  * Remove patch: libdir.diff, applied by upstream.
+  * Remove patch: setINDIproperty_mayhem_fix.diff, applied by upstream.
+  * Remove patch: getINDIproperty_mayhem_fix.diff, applied by upstream.
+  * Refresh patches.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Apr 2014 11:27:40 +0200
 
diff --git a/debian/patches/abi.diff b/debian/patches/abi.diff
index cf3e111..0c6234e 100644
--- a/debian/patches/abi.diff
+++ b/debian/patches/abi.diff
@@ -8,9 +8,9 @@ Forwarded: not-needed
 
 Index: libindi/CMakeLists.txt
 ===================================================================
---- libindi.orig/CMakeLists.txt	2013-11-20 12:45:10.520532610 +0100
-+++ libindi/CMakeLists.txt	2013-11-20 12:47:45.466313430 +0100
-@@ -3,10 +3,16 @@
+--- libindi.orig/CMakeLists.txt	2014-04-01 15:42:57.788088964 +0200
++++ libindi/CMakeLists.txt	2014-04-01 15:52:19.949524550 +0200
+@@ -5,10 +5,16 @@
  
  ##################  INDI version  ################################
  set(INDI_SOVERSION "0")
@@ -18,7 +18,7 @@ Index: libindi/CMakeLists.txt
 +set(DRIVER_INDI_SOVERSION "0b")
  set(CMAKE_INDI_VERSION_MAJOR 0)
  set(CMAKE_INDI_VERSION_MINOR 9)
- set(CMAKE_INDI_VERSION_RELEASE 7)
+ set(CMAKE_INDI_VERSION_RELEASE 8)
  set(CMAKE_INDI_VERSION_STRING "${CMAKE_INDI_VERSION_MAJOR}.${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}")
@@ -27,8 +27,8 @@ Index: libindi/CMakeLists.txt
  
  ##################  Paths  ################################
  set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/")
-@@ -136,7 +142,8 @@
- endif(CFITSIO_FOUND)
+@@ -147,7 +153,8 @@
+ target_link_libraries(indi ${NOVA_LIBRARIES} ${M_LIB} ${ZLIB_LIBRARY} ${CFITSIO_LIBRARIES})
  
  install(TARGETS indi LIBRARY DESTINATION ${LIB_DESTINATION})
 -set_target_properties(indi PROPERTIES VERSION ${CMAKE_INDI_VERSION_STRING} SOVERSION ${INDI_SOVERSION})
@@ -37,14 +37,14 @@ Index: libindi/CMakeLists.txt
  
  ###################################################
  ############ INDI Main Shared Library #############
-@@ -163,7 +170,9 @@
- target_link_libraries(indidriver ${CFITSIO_LIBRARIES})
- endif(CFITSIO_FOUND)
- install(TARGETS indidriver LIBRARY DESTINATION ${LIB_DESTINATION})
--set_target_properties(indidriver PROPERTIES VERSION ${CMAKE_INDI_VERSION_STRING} SOVERSION ${INDI_SOVERSION})
-+set_target_properties(indidriver PROPERTIES
+@@ -175,7 +182,9 @@
+ add_library(indidriverstatic STATIC ${libindicom_SRCS} ${liblilxml_SRCS} ${indimain_SRCS} ${indidriver_SRCS})
+ target_link_libraries(indidriverstatic ${LIBUSB_1_LIBRARIES} ${NOVA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${CFITSIO_LIBRARIES} ${M_LIB} ${ZLIB_LIBRARY})
+ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+-set_target_properties(indidriver indidriverstatic PROPERTIES VERSION ${CMAKE_INDI_VERSION_STRING} SOVERSION ${INDI_SOVERSION} OUTPUT_NAME indidriver)
++set_target_properties(indidriver indidriverstatic PROPERTIES
 +    VERSION ${CMAKE_INDI_DRIVER_VERSION_STRING}
-+    SOVERSION ${DRIVER_INDI_SOVERSION})
- 
- #install(TARGETS indidriver ARCHIVE DESTINATION ${LIB_DESTINATION})
++    SOVERSION ${DRIVER_INDI_SOVERSION} OUTPUT_NAME indidriver)
+ install(TARGETS indidriver LIBRARY DESTINATION ${LIB_DESTINATION})
+ install(TARGETS indidriverstatic ARCHIVE DESTINATION ${LIB_DESTINATION})
  
diff --git a/debian/patches/getINDIproperty_mayhem_fix.diff b/debian/patches/getINDIproperty_mayhem_fix.diff
deleted file mode 100644
index b662715..0000000
--- a/debian/patches/getINDIproperty_mayhem_fix.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: libindi-0.9.1/tools/getINDIproperty.c
-===================================================================
---- libindi-0.9.1.orig/tools/getINDIproperty.c	2013-07-01 16:55:16.669691659 +0200
-+++ libindi-0.9.1/tools/getINDIproperty.c	2013-07-01 16:56:01.787933173 +0200
-@@ -189,11 +189,11 @@
- 	if (directfd >= 0) {
- 	    svrwfp = fdopen (directfd, "w");
- 	    svrrfp = fdopen (directfd, "r");
--	    setbuf (svrrfp, NULL);	/* don't absorb next guy's stuff */
- 	    if (!svrwfp || !svrrfp) {
- 		fprintf (stderr, "Direct fd %d: %s
",directfd,strerror(errno));
- 		exit(1);
- 	    }
-+	    setbuf (svrrfp, NULL);	/* don't absorb next guy's stuff */
- 	    if (verbose)
- 		fprintf (stderr, "Using direct fd %d
", directfd);
- 	} else {
diff --git a/debian/patches/libdir.diff b/debian/patches/libdir.diff
deleted file mode 100644
index d880b41..0000000
--- a/debian/patches/libdir.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-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: 2012-01-16
-Forwarded: no
-
----
- CMakeLists.txt |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: libindi/CMakeLists.txt
-===================================================================
---- libindi.orig/CMakeLists.txt	2013-11-20 12:47:59.317757554 +0100
-+++ libindi/CMakeLists.txt	2013-11-20 12:47:59.313757721 +0100
-@@ -29,7 +29,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")
- set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d" CACHE STRING "Base directory for udev rules")
- 
- ##################  Includes  ################################
diff --git a/debian/patches/series b/debian/patches/series
index 3c22838..7896ccf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
 abi.diff
-libdir.diff
-setINDIproperty_mayhem_fix.diff
-getINDIproperty_mayhem_fix.diff
diff --git a/debian/patches/setINDIproperty_mayhem_fix.diff b/debian/patches/setINDIproperty_mayhem_fix.diff
deleted file mode 100644
index b9ac11f..0000000
--- a/debian/patches/setINDIproperty_mayhem_fix.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/tools/setINDIproperty.c b/tools/setINDIproperty.c
-index 25ae44c..0ce02e0 100644
---- a/tools/setINDIproperty.c
-+++ b/tools/setINDIproperty.c
-@@ -243,7 +243,7 @@ crackSpec (int *acp, char **avp[])
- 	INDIDef *dp = NULL;
- 
- 	/* check if first arg is type indicator */
--	if (spec[0] == '-') {
-+	if ((*acp > 0) && (spec[0] == '-')) {
- 	    switch (spec[1]) {
- 	    case 'x':	dp = &defs[0]; break;
- 	    case 'n':	dp = &defs[1]; break;
-@@ -256,6 +256,10 @@ crackSpec (int *acp, char **avp[])
- 	    (*avp)++;
- 	    spec = *avp[0];
- 	}
-+        if (*acp <= 0) {
-+            fprintf (stderr, "Missing spec
");
-+            usage();
-+        }
- 
- 	/* then scan arg for property spec */
- 	if (sscanf (spec, "%[^.].%[^.].%s", d, p, ev) != 3) {

-- 
libindi packaging



More information about the pkg-kde-commits mailing list