r43878 - in /packages/fenics/syfi/trunk/debian: changelog patches/ patches/incdir.patch patches/series

[johannr-guest at users.alioth.debian.org]

Author: johannr-guest
Date: Mon Sep  5 13:50:06 2011
New Revision: 43878

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=43878
Log:
Add patch to fix incdirs in config files.

Added:
    packages/fenics/syfi/trunk/debian/patches/
    packages/fenics/syfi/trunk/debian/patches/incdir.patch
    packages/fenics/syfi/trunk/debian/patches/series
Modified:
    packages/fenics/syfi/trunk/debian/changelog

Modified: packages/fenics/syfi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/syfi/trunk/debian/changelog?rev=43878&op=diff
==============================================================================
--- packages/fenics/syfi/trunk/debian/changelog (original)
+++ packages/fenics/syfi/trunk/debian/changelog Mon Sep  5 13:50:06 2011
@@ -27,6 +27,8 @@
       libsyfi1.0-dev in debian/control. Update Conflicts, Replaces, and
       Provides as necessary.
   * Add lintian override syfi-dev: empty-binary-package.
+  * Add patch for removing unnecessary include directories from
+    pkgconfig file (syfi.pc) and CMake config file (syfi-config.cmake).
 
  -- Johannes Ring <johannr at simula.no>  Fri, 02 Sep 2011 13:40:57 +0200
 

Added: packages/fenics/syfi/trunk/debian/patches/incdir.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/syfi/trunk/debian/patches/incdir.patch?rev=43878&op=file
==============================================================================
--- packages/fenics/syfi/trunk/debian/patches/incdir.patch (added)
+++ packages/fenics/syfi/trunk/debian/patches/incdir.patch Mon Sep  5 13:50:06 2011
@@ -1,0 +1,34 @@
+Make sure Python and NumPy include directories are only added when
+generating the SWIG module. This is for not cluttering syfi.pc and
+syfi-config.cmake with unnecessary include directories.
+
+=== modified file 'CMakeLists.txt'
+--- CMakeLists.txt	2011-09-01 07:28:38 +0000
++++ CMakeLists.txt	2011-09-05 13:33:22 +0000
+@@ -101,8 +101,6 @@
+ 
+ set(SYFI_INCLUDE_DIRECTORIES
+   ${GINAC_INCLUDE_DIRS}
+-  ${PYTHON_INCLUDE_DIRS}
+-  ${NUMPY_INCLUDE_DIRS}
+   )
+ 
+ set(SYFI_TARGET_LINK_LIBRARIES
+
+=== modified file 'syfi/swig/CMakeLists.txt'
+--- syfi/swig/CMakeLists.txt	2011-05-29 08:43:07 +0000
++++ syfi/swig/CMakeLists.txt	2011-09-05 13:34:23 +0000
+@@ -20,6 +20,12 @@
+   )
+ set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR})
+ 
++# Add needed include directories
++include_directories(
++  ${PYTHON_INCLUDE_DIRS}
++  ${NUMPY_INCLUDE_DIRS}
++)
++
+ # Get all SWIG interface files
+ file(GLOB SYFI_SWIG_INTERFACE_FILES "*.i")
+ 
+

Added: packages/fenics/syfi/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/syfi/trunk/debian/patches/series?rev=43878&op=file
==============================================================================
--- packages/fenics/syfi/trunk/debian/patches/series (added)
+++ packages/fenics/syfi/trunk/debian/patches/series Mon Sep  5 13:50:06 2011
@@ -1,0 +1,1 @@
+incdir.patch