r43986 - in /packages/mrmpi/trunk/debian: patches/tweakcmake.patch rules

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

Author: malat-guest
Date: Wed Oct 26 19:16:19 2011
New Revision: 43986

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=43986
Log:
final touch

Modified:
    packages/mrmpi/trunk/debian/patches/tweakcmake.patch
    packages/mrmpi/trunk/debian/rules

Modified: packages/mrmpi/trunk/debian/patches/tweakcmake.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/mrmpi/trunk/debian/patches/tweakcmake.patch?rev=43986&op=diff
==============================================================================
--- packages/mrmpi/trunk/debian/patches/tweakcmake.patch (original)
+++ packages/mrmpi/trunk/debian/patches/tweakcmake.patch Wed Oct 26 19:16:19 2011
@@ -25,8 +25,12 @@
 Index: mrmpi-1.0~20110620/src/CMakeLists.txt
 ===================================================================
 --- mrmpi-1.0~20110620.orig/src/CMakeLists.txt	2011-10-26 20:59:30.000000000 +0200
-+++ mrmpi-1.0~20110620/src/CMakeLists.txt	2011-10-26 20:59:33.000000000 +0200
-@@ -7,7 +7,7 @@
++++ mrmpi-1.0~20110620/src/CMakeLists.txt	2011-10-26 21:15:22.000000000 +0200
+@@ -4,10 +4,11 @@
+         keymultivalue.cpp
+         irregular.cpp
+         hash.cpp
++	spool.cpp
          memory.cpp
          error.cpp)
  

Modified: packages/mrmpi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/mrmpi/trunk/debian/rules?rev=43986&op=diff
==============================================================================
--- packages/mrmpi/trunk/debian/rules (original)
+++ packages/mrmpi/trunk/debian/rules Wed Oct 26 19:16:19 2011
@@ -7,6 +7,11 @@
 	-DCMAKE_BUILD_TYPE:STRING=RELEASE \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
 	-DBUILD_SHARED_LIBS:BOOL=ON \
+	-DVTK_INSTALL_EXPORT_NAME:STRING=mrmpi \
+	-DVTK_LIBRARY_PROPERTIES:STRING="VERSION;1;SOVERSION;1.0" \
+	-DVTK_INSTALL_INCLUDE_DIR_CM24:STRING=include \
+	-DVTK_INSTALL_BIN_DIR_CM24:STRING=bin \
+	-DVTK_INSTALL_LIB_DIR_CM24:STRING=lib \
 	-DVTK_USE_MPI:BOOL=ON
 
 pkg_run = mrmpi
@@ -21,10 +26,10 @@
 override_dh_install:
 	# Runtime Package
 	dh_install -p$(pkg_run) usr/bin
-	dh_install -p$(pkg_run) usr/lib/CableSwig
+	dh_install -p$(pkg_run) usr/lib/lib*.so
 	# Development Package
 	dh_install -p$(pkg_dev) usr/include
-	dh_install -p$(pkg_dev) --autodest usr/lib/lib*.a
+	dh_install -p$(pkg_dev) usr/lib/lib*.so.*
 
 VER_FULL = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-)