[Pkg-scicomp-commits] trilinos/trunk/debian/patches

[Christophe Prud'homme]

SVN commit 4942 by prudhomm:

update patch

libname still needs to be updated for 10.2.0


 M  +2 -0      trilinos/trunk/debian/patches/series  
 M  +6 -32     trilinos/trunk/debian/patches/soname.patch  
 A             trilinos/trunk/debian/patches/trilinosversion.patch  


--- trilinos/trunk/debian/patches/series #4941:4942
@@ -1,2 +1,4 @@
 soname.patch
+trilinosversion.patch
 libname.patch
+
--- trilinos/trunk/debian/patches/soname.patch #4941:4942
@@ -1,42 +1,16 @@
-diff -Nru trilinos-10.0.4-Source.orig/cmake/package_arch/PackageLibraryMacros.cmake trilinos-10.0.4-Source/cmake/package_arch/PackageLibraryMacros.cmake
---- trilinos-10.0.4-Source.orig/cmake/package_arch/PackageLibraryMacros.cmake	2010-01-05 14:56:06.000000000 +0100
-+++ trilinos-10.0.4-Source/cmake/package_arch/PackageLibraryMacros.cmake	2010-01-05 15:18:17.000000000 +0100
+diff -Nru trilinos-10.2.0-Source.orig/cmake/package_arch/PackageLibraryMacros.cmake trilinos-10.2.0-Source/cmake/package_arch/PackageLibraryMacros.cmake
+--- trilinos-10.2.0-Source.orig/cmake/package_arch/PackageLibraryMacros.cmake	2009-12-08 19:34:03.000000000 +0100
++++ trilinos-10.2.0-Source/cmake/package_arch/PackageLibraryMacros.cmake	2009-12-15 12:17:13.000000000 +0100
 @@ -147,6 +147,12 @@
    SET_PROPERTY(TARGET ${LIBRARY_NAME} APPEND PROPERTY
      LABELS ${PACKAGE_NAME})
- 
+
 +  # Apply user-defined properties to the library target.
 +  IF(Trilinos_LIBRARY_PROPERTIES)
-+    SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES 
++    SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES
 +      ${Trilinos_LIBRARY_PROPERTIES})
 +  ENDIF(Trilinos_LIBRARY_PROPERTIES)
 +
    PREPEND_GLOBAL_SET(${PACKAGE_NAME}_LIB_TARGETS ${LIBRARY_NAME})
    PREPEND_GLOBAL_SET(${PACKAGE_NAME}_ALL_TARGETS ${LIBRARY_NAME})
-   
-diff -Nru trilinos-10.0.4-Source.orig/CMakeLists.txt trilinos-10.0.4-Source/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/CMakeLists.txt	2010-01-05 14:56:09.000000000 +0100
-+++ trilinos-10.0.4-Source/CMakeLists.txt	2010-01-05 15:18:17.000000000 +0100
-@@ -13,7 +13,21 @@
- 
- PROJECT(Trilinos NONE)
- 
--SET(Trilinos_VERSION "10.0.4")
-+SET(Trilinos_VERSION_MAJOR 10)
-+SET(Trilinos_VERSION_MINOR 0)
-+SET(Trilinos_VERSION_PATCH 4)
-+SET(Trilinos_VERSION
-+    "${Trilinos_VERSION_MAJOR}.${Trilinos_VERSION_MINOR}.${Trilinos_VERSION_PATCH}")
-+
-+IF(NOT Trilinos_NO_LIBRARY_VERSION)
-+  # This setting of SOVERSION assumes that any API change
-+  # will increment either the minor or major version number of ITK.
-+  SET(Trilinos_LIBRARY_PROPERTIES
-+      VERSION "${Trilinos_VERSION_MAJOR}.${Trilinos_VERSION_MINOR}.${Trilinos_VERSION_PATCH}"
-+      SOVERSION "${Trilinos_VERSION_MAJOR}.${Trilinos_VERSION_MINOR}"
-+     )
-+ENDIF(NOT Trilinos_NO_LIBRARY_VERSION)
-+
- SET(TRILINOS_HOME_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
- SET(TRILINOS_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE INTERNAL "")
- # Above, we put these in the cache so we can grep them out
+