[Plplot-cvs] SF.net SVN: plplot:[12184] trunk/debian/patches

[<and...@us...>]

Revision: 12184
          http://plplot.svn.sourceforge.net/plplot/?rev=12184&view=rev
Author:   andrewross
Date:     2012-02-28 11:48:16 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
Update Debian patches.

Modified Paths:
--------------
    trunk/debian/patches/02_unset-python-path.diff
    trunk/debian/patches/08_nn_link_libm.diff

Modified: trunk/debian/patches/02_unset-python-path.diff
===================================================================
--- trunk/debian/patches/02_unset-python-path.diff	2012-02-28 11:36:40 UTC (rev 12183)
+++ trunk/debian/patches/02_unset-python-path.diff	2012-02-28 11:48:16 UTC (rev 12184)
@@ -7,12 +7,14 @@
 
 @DPATCH@
 
---- plplot/examples/python/CMakeLists.txt.old
-+++ plplot/examples/python/CMakeLists.txt
-@@ -214,7 +214,7 @@
+Index: plplot-5.9.9/examples/python/CMakeLists.txt
+===================================================================
+--- plplot-5.9.9.orig/examples/python/CMakeLists.txt	2012-02-28 11:40:09.000000000 +0000
++++ plplot-5.9.9/examples/python/CMakeLists.txt	2012-02-28 11:42:31.000000000 +0000
+@@ -241,7 +241,7 @@
      @ONLY
      )
-
+ 
 -  set(python_location1 ${PYTHON_INSTDIR})
 +  set(python_location1)
    set(python_location2)

Modified: trunk/debian/patches/08_nn_link_libm.diff
===================================================================
--- trunk/debian/patches/08_nn_link_libm.diff	2012-02-28 11:36:40 UTC (rev 12183)
+++ trunk/debian/patches/08_nn_link_libm.diff	2012-02-28 11:48:16 UTC (rev 12184)
@@ -3,13 +3,28 @@
 #
 Index: plplot-5.9.9/lib/nn/CMakeLists.txt
 ===================================================================
---- plplot-5.9.9.orig/lib/nn/CMakeLists.txt	2012-02-27 21:27:23.839569576 +0000
-+++ plplot-5.9.9/lib/nn/CMakeLists.txt	2012-02-27 21:28:06.623570811 +0000
-@@ -38,6 +38,15 @@
+--- plplot-5.9.9.orig/lib/nn/CMakeLists.txt	2012-02-28 11:40:08.000000000 +0000
++++ plplot-5.9.9/lib/nn/CMakeLists.txt	2012-02-28 11:45:48.000000000 +0000
+@@ -38,6 +38,7 @@
    endif(BUILD_SHARED_LIBS)
  
    add_library(csironn ${csironn_LIB_SRCS})
 +
+   set_target_properties(
+     csironn
+     PROPERTIES
+@@ -46,7 +47,22 @@
+     COMPILE_FLAGS "-I${QHULL_INCLUDE_DIRS}"
+     INSTALL_NAME_DIR "${LIB_DIR}"
+     )
+-  target_link_libraries(csironn ${QHULL_LIBRARIES})
++
++  set(
++    csironn_LINK_LIBRARIES
++    ${csironn_LINK_LIBRARIES}
++    ${QHULL_LIBRARIES}
++  )
++
 +  if(MATH_LIB)
 +    set(
 +      csironn_LINK_LIBRARIES
@@ -18,6 +33,7 @@
 +      )
 +  endif(MATH_LIB)
 +
-   set_target_properties(
-     csironn
-     PROPERTIES
++  target_link_libraries(csironn ${csironn_LINK_LIBRARIES})
+   install(TARGETS csironn
+     EXPORT export_plplot
+     ARCHIVE DESTINATION ${LIB_DIR}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.