r45202 - in /packages/trilinos/trunk/debian: changelog libtrilinos.install patches/series patches/soname.patch
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Tue Jul 3 08:53:37 UTC 2012
Author: trophime-guest
Date: Tue Jul 3 08:53:36 2012
New Revision: 45202
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45202
Log:
minor fixes and cleanup
Modified:
packages/trilinos/trunk/debian/changelog
packages/trilinos/trunk/debian/libtrilinos.install
packages/trilinos/trunk/debian/patches/series
packages/trilinos/trunk/debian/patches/soname.patch
Modified: packages/trilinos/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/changelog?rev=45202&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/changelog (original)
+++ packages/trilinos/trunk/debian/changelog Tue Jul 3 08:53:36 2012
@@ -1,3 +1,13 @@
+trilinos (10.8.5.dfsg-2) UNRELEASED; urgency=low
+
+ * debian/control: update Standard-Version to 3.9.3
+ * debian/rules:
+ - add override_dh_strip target to create dbg package
+ * Add python-pytrilinos.pyinstall
+ * Remove python-pytrilinos.install
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Tue, 03 Jul 2012 10:45:21 +0200
+
trilinos (10.8.5.dfsg-1) unstable; urgency=low
[Christophe Trophime]
@@ -21,7 +31,7 @@
- Replace libopenmpi-dev with mpi-default-dev in Build-Depends.
- Add mpi-default-bin to Build-Depends.
- -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Fri, 02 Dec 2011 10:55:54 +0200
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Fri, 02 Dec 2011 10:55:54 +0200
trilinos (10.4.0.dfsg-1) unstable; urgency=low
Modified: packages/trilinos/trunk/debian/libtrilinos.install
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/libtrilinos.install?rev=45202&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/libtrilinos.install (original)
+++ packages/trilinos/trunk/debian/libtrilinos.install Tue Jul 3 08:53:36 2012
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/lib*.so.* /usr/lib
+debian/tmp/usr/lib/lib*.so.*
Modified: packages/trilinos/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/series?rev=45202&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/patches/series (original)
+++ packages/trilinos/trunk/debian/patches/series Tue Jul 3 08:53:36 2012
@@ -1,2 +1,2 @@
soname.patch
-#libname.patch
+libname.patch
Modified: packages/trilinos/trunk/debian/patches/soname.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/soname.patch?rev=45202&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/patches/soname.patch (original)
+++ packages/trilinos/trunk/debian/patches/soname.patch Tue Jul 3 08:53:36 2012
@@ -1,7 +1,7 @@
-diff -Nru trilinos-10.8.5.dfsg.orig/tribits/cmake/package_arch/TribitsLibraryMacros.cmake trilinos-10.8.5.dfsg/tribits/cmake/package_arch/TribitsLibraryMacros.cmake
---- trilinos-10.8.5.dfsg.orig/cmake/tribits/package_arch/TribitsLibraryMacros.cmake 2012-01-09 18:08:07.000000000 +0100
-+++ trilinos-10.8.5.dfsg/cmake/tribits/package_arch/TribitsLibraryMacros.cmake 2012-02-06 12:41:29.407281506 +0100
-@@ -298,6 +298,12 @@
+diff -Nru trilinos-10.8.5.dfsg.orig/cmake/package_arch/PackageLibraryMacros.cmake trilinos-10.8.5.dfsg/cmake/package_arch/PackageLibraryMacros.cmake
+--- trilinos-10.8.5.dfsg.orig/cmake/package_arch/PackageLibraryMacros.cmake 2012-01-09 18:08:07.000000000 +0100
++++ trilinos-10.8.5.dfsg/cmake/package_arch/PackageLibraryMacros.cmake 2012-02-06 12:41:29.407281506 +0100
+@@ -255,6 +255,12 @@
SET_PROPERTY(TARGET ${LIBRARY_NAME} APPEND PROPERTY
LABELS ${PACKAGE_NAME})
@@ -11,26 +11,23 @@
+ ${Trilinos_LIBRARY_PROPERTIES})
+ ENDIF(Trilinos_LIBRARY_PROPERTIES)
+
- PREPEND_GLOBAL_SET(${PARENT_PACKAGE_NAME}_LIB_TARGETS ${LIBRARY_NAME})
- PREPEND_GLOBAL_SET(${PARENT_PACKAGE_NAME}_ALL_TARGETS ${LIBRARY_NAME})
+ PREPEND_GLOBAL_SET(${PACKAGE_NAME}_LIB_TARGETS ${LIBRARY_NAME})
+ PREPEND_GLOBAL_SET(${PACKAGE_NAME}_ALL_TARGETS ${LIBRARY_NAME})
-diff -Nru trilinos-10.10.2.dfsg.orig/Version.cmake trilinos-10.10.2.dfsg/Version.cmake
---- trilinos-10.10.2.dfsg.orig/Version.cmake.orig 2012-05-09 09:43:40.000000000 +0200
-+++ trilinos-10.10.2.dfsg.orig/Version.cmake 2012-05-09 09:45:55.000000000 +0200
-@@ -65,6 +65,16 @@
- SET(Trilinos_VERSION_STRING "10.10.2")
- SET(Trilinos_ENABLE_DEVELOPMENT_MODE_DEFAULT OFF) # Change to 'OFF' for a release
-
+diff -Nru trilinos-10.8.5.dfsg.orig/cmake/TrilinosVersion.cmake trilinos-10.8.5.dfsg/cmake/TrilinosVersion.cmake
+--- trilinos-10.8.5.dfsg.orig/cmake/TrilinosVersion.cmake 2012-01-09 18:08:07.000000000 +0100
++++ trilinos-10.8.5.dfsg/cmake/TrilinosVersion.cmake 2012-02-06 12:45:47.471272379 +0100
+@@ -72,3 +72,13 @@
+ SET(TRILINOS_MAJOR_VERSION TRUE)
+ SET(TRILINOS_MAJOR_MINOR_VERSION TRUE)
+ SET(TRILINOS_VERSION_STRING TRUE)
++
+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 Trilinos.
++ # will increment either the minor or major version number of Trilinos.
+ STRING(REGEX REPLACE "(.+)\\.(.+)\\.(.+)" "\\2" Trilinos_MINOR_VERSION "${Trilinos_VERSION_STRING}")
+ SET(Trilinos_LIBRARY_PROPERTIES
+ VERSION "${Trilinos_VERSION}"
+ SOVERSION "${Trilinos_MAJOR_VERSION}.${Trilinos_MINOR_VERSION}"
+ )
+ENDIF(NOT Trilinos_NO_LIBRARY_VERSION)
-+
- # Used by testing scripts and should not be used elsewhere
- SET(Trilinos_REPOSITORY_BRANCH "trilinos-release-10-10-branch" CACHE INTERNAL "")
- SET(Trilinos_TESTING_TRACK "Nightly Release 10.10" CACHE INTERNAL "")
More information about the debian-science-commits
mailing list