r45984 - in /packages/mrmpi/trunk/debian: changelog patches/series patches/tweakcmake.patch watch

[malat at users.alioth.debian.org]

Author: malat
Date: Sun Jun  9 09:07:30 2013
New Revision: 45984

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45984
Log:
New upload

Modified:
    packages/mrmpi/trunk/debian/changelog
    packages/mrmpi/trunk/debian/patches/series
    packages/mrmpi/trunk/debian/patches/tweakcmake.patch
    packages/mrmpi/trunk/debian/watch

Modified: packages/mrmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/mrmpi/trunk/debian/changelog?rev=45984&op=diff
==============================================================================
--- packages/mrmpi/trunk/debian/changelog (original)
+++ packages/mrmpi/trunk/debian/changelog Sun Jun  9 09:07:30 2013
@@ -1,3 +1,10 @@
+mrmpi (1.0~20130311-2) unstable; urgency=low
+
+  * Make sure to remove mpi exported symbols
+  * Fix d/watch
+
+ -- Mathieu Malaterre <malat at debian.org>  Sun, 09 Jun 2013 11:04:43 +0200
+
 mrmpi (1.0~20130311-1) unstable; urgency=low
 
   * New upstream. Add d/watch helper

Modified: packages/mrmpi/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/mrmpi/trunk/debian/patches/series?rev=45984&op=diff
==============================================================================
--- packages/mrmpi/trunk/debian/patches/series (original)
+++ packages/mrmpi/trunk/debian/patches/series Sun Jun  9 09:07:30 2013
@@ -1,3 +1,3 @@
 addcmake.patch
+add_config.patch
 tweakcmake.patch
-add_config.patch

Modified: packages/mrmpi/trunk/debian/patches/tweakcmake.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/mrmpi/trunk/debian/patches/tweakcmake.patch?rev=45984&op=diff
==============================================================================
--- packages/mrmpi/trunk/debian/patches/tweakcmake.patch (original)
+++ packages/mrmpi/trunk/debian/patches/tweakcmake.patch Sun Jun  9 09:07:30 2013
@@ -1,7 +1,7 @@
 Index: mrmpi-1.0~20130311/CMakeLists.txt
 ===================================================================
---- mrmpi-1.0~20130311.orig/CMakeLists.txt	2013-06-07 16:01:17.357093289 +0200
-+++ mrmpi-1.0~20130311/CMakeLists.txt	2013-06-07 16:01:18.185093280 +0200
+--- mrmpi-1.0~20130311.orig/CMakeLists.txt	2013-06-09 10:51:46.530520058 +0200
++++ mrmpi-1.0~20130311/CMakeLists.txt	2013-06-09 10:51:46.554520058 +0200
 @@ -1,6 +1,8 @@
 +CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2)
  PROJECT (MAPREDUCE)
@@ -13,8 +13,8 @@
    IF (MPI_LIBRARY)
 Index: mrmpi-1.0~20130311/mpistubs/CMakeLists.txt
 ===================================================================
---- mrmpi-1.0~20130311.orig/mpistubs/CMakeLists.txt	2013-06-07 16:01:17.357093289 +0200
-+++ mrmpi-1.0~20130311/mpistubs/CMakeLists.txt	2013-06-07 16:01:18.185093280 +0200
+--- mrmpi-1.0~20130311.orig/mpistubs/CMakeLists.txt	2013-06-09 10:51:46.530520058 +0200
++++ mrmpi-1.0~20130311/mpistubs/CMakeLists.txt	2013-06-09 10:51:46.554520058 +0200
 @@ -1,6 +1,6 @@
  SET (mpistubs_SOURCES mpi.cpp)
  
@@ -25,9 +25,9 @@
    SET_TARGET_PROPERTIES(mpistubs PROPERTIES ${VTK_LIBRARY_PROPERTIES})
 Index: mrmpi-1.0~20130311/src/CMakeLists.txt
 ===================================================================
---- mrmpi-1.0~20130311.orig/src/CMakeLists.txt	2013-06-07 16:01:17.357093289 +0200
-+++ mrmpi-1.0~20130311/src/CMakeLists.txt	2013-06-07 16:01:18.185093280 +0200
-@@ -4,10 +4,11 @@
+--- mrmpi-1.0~20130311.orig/src/CMakeLists.txt	2013-06-09 10:51:46.530520058 +0200
++++ mrmpi-1.0~20130311/src/CMakeLists.txt	2013-06-09 10:52:07.646520046 +0200
+@@ -4,14 +4,16 @@
          keymultivalue.cpp
          irregular.cpp
          hash.cpp
@@ -40,3 +40,8 @@
  TARGET_LINK_LIBRARIES (MapReduceMPI ${mrmpi_LIBS})
  IF(VTK_LIBRARY_PROPERTIES)
    SET_TARGET_PROPERTIES(MapReduceMPI PROPERTIES ${VTK_LIBRARY_PROPERTIES})
+ ENDIF(VTK_LIBRARY_PROPERTIES)
++set_property(TARGET MapReduceMPI PROPERTY LINK_INTERFACE_LIBRARIES "")
+ 
+ IF(NOT VTK_INSTALL_NO_LIBRARIES)
+   INSTALL(TARGETS MapReduceMPI

Modified: packages/mrmpi/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/mrmpi/trunk/debian/watch?rev=45984&op=diff
==============================================================================
--- packages/mrmpi/trunk/debian/watch (original)
+++ packages/mrmpi/trunk/debian/watch Sun Jun  9 09:07:30 2013
@@ -1,3 +1,4 @@
 version=3
+opts=uversionmangle=s/^(\d{2})([A-Za-z]+)2?0?(\d{2})/20$3$2$1/ \
 http://mapreduce.sandia.gov/bug.html \
   patches/files.(.*)