r36805 - in /packages/trilinos/trunk/debian: ./ patches/
prudhomm at users.alioth.debian.org
prudhomm at users.alioth.debian.org
Fri Aug 13 11:38:50 UTC 2010
Author: prudhomm
Date: Fri Aug 13 11:38:46 2010
New Revision: 36805
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36805
Log:
[svn-inject] Applying Debian modifications (10.2.0.dfsg-1) to trunk
Added:
packages/trilinos/trunk/debian/ (with props)
packages/trilinos/trunk/debian/README.Debian
packages/trilinos/trunk/debian/README.source
packages/trilinos/trunk/debian/changelog
packages/trilinos/trunk/debian/compat
packages/trilinos/trunk/debian/control
packages/trilinos/trunk/debian/copyright
packages/trilinos/trunk/debian/docs
packages/trilinos/trunk/debian/libtrilinos-dev.install
packages/trilinos/trunk/debian/libtrilinos-doc.docs
packages/trilinos/trunk/debian/libtrilinos-doc.examples
packages/trilinos/trunk/debian/libtrilinos.install
packages/trilinos/trunk/debian/patches/
packages/trilinos/trunk/debian/patches/destdir
packages/trilinos/trunk/debian/patches/gcc43.patch
packages/trilinos/trunk/debian/patches/gcc44.patch
packages/trilinos/trunk/debian/patches/libname.patch
packages/trilinos/trunk/debian/patches/makefile.patch
packages/trilinos/trunk/debian/patches/moocho.patch
packages/trilinos/trunk/debian/patches/python_2.6.patch
packages/trilinos/trunk/debian/patches/series
packages/trilinos/trunk/debian/patches/sharedlibs.patch
packages/trilinos/trunk/debian/patches/soname.patch
packages/trilinos/trunk/debian/patches/trilinosversion.patch
packages/trilinos/trunk/debian/rules (with props)
packages/trilinos/trunk/debian/watch
Propchange: packages/trilinos/trunk/debian/
------------------------------------------------------------------------------
mergeWithUpstream = 1
Added: packages/trilinos/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/README.Debian?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/README.Debian (added)
+++ packages/trilinos/trunk/debian/README.Debian Fri Aug 13 11:38:46 2010
@@ -1,0 +1,45 @@
+trilinos for Debian
+-------------------
+
+Debian provides the following trilinos packages:
+
+ - epetra
+ - teuchos
+ - triutils
+ - anazazi
+ - amesos
+ - nox
+ - loca
+ - thyra
+ - ml
+ - belos
+ - meros
+ - sacado
+
+Debian Trilinos libraries renaming
+==================================
+
+Following a discussion with ftpmaster, the Trilinos libraries have
+been renamed to be less generic. They all use the same prefix now :
+libtrilinos_ . That should also help tremendously with
+ - avoiding conflicts with other libraries/packages
+ - identifying available trilinos libraries
+
+Linking with Trilinos
+=====================
+
+Trilinos provides a lot of libraries and the dependencies between them
+is not so trivial.
+Here is how to do it to compile ex1.cpp an example from NOX
+
+g++ -o ex1 -I/usr/include/trilinos -I/usr/include/mpi -I../../src ex1.cpp
+-ltrilinos_ml -ltrilinos_galeri -ltrilinos_nox -ltrilinos_noxepetra -ltrilinos_noxlapack -ltrilinos_anasazi
+-ltrilinos_ifpack -ltrilinos_amesos -ltrilinos_aztecoo -ltrilinos_epetraext -ltrilinos_triutils -ltrilinos_epetra
+-ltrilinos_teuchos -lexpat -llapack -lblas -lmpi++ -lmpi
+
+All these libraries are not strictly necessary of course.
+
+
+
+
+ -- Christophe Prud'homme <prudhomm at debian.org>, Fri, 22 May 2009 10:41:11 +0200
Added: packages/trilinos/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/README.source?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/README.source (added)
+++ packages/trilinos/trunk/debian/README.source Fri Aug 13 11:38:46 2010
@@ -1,0 +1,17 @@
+# -*- mode: readme-debian -*-
+
+Trilinos source for Debian
+--------------------------
+
+1 - Update of package/*/config/config.{sub,guess} to ensure a
+recent version is available
+
+
+2 - The pdf files that cannot be re-generated from the tarball have been
+ removed from the archive.
+
+3 - Packaging makes use of CDBS and quilt. For the latter see
+`/usr/share/doc/quilt/README.source'.
+
+
+ -- Christophe Prud'homme <prudhomm at debian.org>, Sun, 7 Dec 2008 15:04:38 +0100
Added: packages/trilinos/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/changelog?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/changelog (added)
+++ packages/trilinos/trunk/debian/changelog Fri Aug 13 11:38:46 2010
@@ -1,0 +1,119 @@
+trilinos (10.2.0.dfsg-1) unstable; urgency=low
+
+ [Christophe Prud'homme]
+ * New upstream release
+
+ -- Christophe Prud'homme <prudhomm at debian.org> Sun, 02 May 2010 11:30:09 +0200
+
+trilinos (10.0.4.dfsg-1) unstable; urgency=low
+
+ [Christophe Prud'homme]
+ * New upstream release
+ * debian/control: updated Standard-Version to 3.8.3 (no changes)
+
+ [Johannes Ring]
+ * debian/patches: Update patches for 10.0.4 release.
+ * debian/control:
+ - Add XS-Python-Version field to source package and
+ XB-Python-Version field to binary package python-pytrilinos.
+ - Add python-numpy to Depends for binary package python-pytrilinos.
+ * debian/rules: Fix issue with PyTrilinos and Python 2.6.
+ * Switch from python-support to python-central.
+
+ -- Christophe Prud'homme <prudhomm at debian.org> Sun, 03 Jan 2010 08:25:23 +0100
+
+trilinos (10.0.3.dfsg-2) unstable; urgency=low
+
+ [Christophe Prud'homme]
+ * debian/rules: enable noxlapack
+
+ -- Christophe Prud'homme <prudhomm at debian.org> Mon, 21 Dec 2009 11:04:12 +0100
+
+trilinos (10.0.3.dfsg-1) unstable; urgency=low
+
+ [Christophe Prud'homme]
+ * New upstream release
+
+ [Johannes Ring]
+ * debian/patches/libname.patch: Add prefix 'libtrilinos_' to all
+ libraries.
+ * debian/patches/soname.patch: Add soversion to libraries.
+ * debian/watch: Update download URL.
+ * debian/control:
+ - Remove python-numeric from Build-Depends (virtual package).
+ - Remove automake and autotools from Build-Depends and add cmake to
+ reflect switch to CMake.
+ - Add python-support to Build-Depends.
+ * debian/rules:
+ - Cleanup and updates for switch to CMake.
+
+ -- Christophe Prud'homme <prudhomm at debian.org> Sun, 13 Dec 2009 12:53:22 +0100
+
+trilinos (9.0.3.dfsg-2) unstable; urgency=low
+
+ * debian/rules: fixed lintian warning (package-installs-python-pyc)
+ * debian/control: updated Standard-=Version to 3.8.2 (no change)
+
+ -- Christophe Prud'homme <prudhomm at debian.org> Tue, 14 Jul 2009 08:55:52 +0200
+
+trilinos (9.0.3.dfsg-1) unstable; urgency=low
+
+ [Christophe Prud'homme]
+ * New upstream release
+ * python-pytrilinos: fix lintian warning package-installs-python-pyc
+
+ -- Christophe Prud'homme <prudhomm at debian.org> Fri, 03 Jul 2009 11:26:41 +0200
+
+trilinos (9.0.2.dfsg-5) unstable; urgency=low
+
+ [Fabrice Coutadeur]
+ * Adapt package to python2.6 (LP: #386625):
+ - debian/python-pytrilinos.install: changed python2.5 to python*
+ - debian/control: changed build dependency from python2.5-dev to python-dev
+ - debian/rules: changed reference to python2.5 to python2.6
+ - debian/patches/python_2.6.patch: add --install-layout=deb to setup.py
+ call in Makefile.in and Makefile.am for Packages/PyTrilinos/shared,
+ packages/PyTrilinos/src and packages/Sundance/python/src
+
+ [Christophe Prud'homme]
+ * debian/rules: fix some lintian warnings
+ * Bug fix: "trilinos FTBFS with python2.6", thanks to Fabrice Coutadeur
+ (Closes: #535145).
+
+ -- Christophe Prud'homme <prudhomm at debian.org> Fri, 03 Jul 2009 07:32:36 +0200
+
+trilinos (9.0.2.dfsg-4) unstable; urgency=low
+
+ * debian/rules: added sacado to TRILINOS_PACKAGES and
+ TRILINOS_PACKAGES_LIBS, thanks to Adam for pointing this out.
+ * debian/libtrilinos-dev.install: move /usr/include/*.h to
+ /usr/include/trilinos, thanks to Adam for pointing this out.
+
+ -- Christophe Prud'homme <prudhomm at debian.org> Fri, 22 May 2009 12:09:26 +0200
+
+trilinos (9.0.2.dfsg-3) unstable; urgency=low
+
+ * Added patch to fix gcc 4.4 FTBS
+ * Bug fix: "missing #include", thanks to Martin Michlmayr (Closes:
+ #527210).
+
+ -- Christophe Prud'homme <prudhomm at debian.org> Tue, 12 May 2009 21:02:58 +0200
+
+trilinos (9.0.2.dfsg-2) unstable; urgency=low
+
+ * debian/rules: enable sacado
+ * Bug fix: "Missing Sacado", thanks to Adam C Powell IV (Closes:
+ #527835).
+ * Bug fix: "error when trying to install together", thanks to Ralf
+ Treinen (Closes: #526992).
+
+ -- Christophe Prud'homme <prudhomm at debian.org> Sat, 09 May 2009 14:19:14 +0200
+
+trilinos (9.0.2.dfsg-1) unstable; urgency=low
+
+ * Initial release Closes: #362293
+ * as per discussion with debian ftpmaster, renamed all libraries using
+ prefix libtrilinos_, hence improving the library naming in trilinos
+
+ -- Christophe Prud'homme <prudhomm at debian.org> Thu, 19 Mar 2009 10:50:42 +0100
+
Added: packages/trilinos/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/compat?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/compat (added)
+++ packages/trilinos/trunk/debian/compat Fri Aug 13 11:38:46 2010
@@ -1,0 +1,1 @@
+7
Added: packages/trilinos/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/control?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/control (added)
+++ packages/trilinos/trunk/debian/control Fri Aug 13 11:38:46 2010
@@ -1,0 +1,102 @@
+Source: trilinos
+Section: math
+Priority: extra
+Maintainer: Debian Scientific Computing Team <pkg-scicomp-devel at lists.alioth.debian.org>
+Uploaders: Christophe Prud'homme <prudhomm at debian.org>
+Build-Depends: cdbs, quilt, debhelper (>= 7), cmake, gfortran, libopenmpi-dev, libsuperlu3-dev, libsuitesparse-dev, python-dev, swig1.3, python-numpy, libexpat1-dev, libxml2-dev, python-central
+Standards-Version: 3.8.2
+XS-Python-Version: >= 2.5
+Homepage: http://trilinos.sandia.gov/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-scicomp/trilinos/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-scicomp/trilinos/
+
+Package: libtrilinos
+Section: libs
+Architecture: any
+Depends: libexpat1, ${shlibs:Depends}, ${misc:Depends}
+Suggests: libtrilinos-doc
+Conflicts: libtrilinos6.0, libtrilinos7.0, libtrilinos8.0
+Replaces: libtrilinos6.0, libtrilinos7.0, libtrilinos8.0
+Description: parallel solver libraries within an object-oriented software framework
+ The Trilinos Project is an effort to develop and implement robust
+ parallel algorithms using modern object-oriented software design,
+ while still leveraging the value of established numerical libraries
+ such as PETSc, Aztec, the BLAS and LAPACK. It emphasizes abstract
+ interfaces for maximum flexibility of component interchanging, and
+ provides a full-featured set of concrete classes that implement all
+ abstract interfaces.
+ .
+ This package contains the dynamic libraries.
+
+Package: libtrilinos-dev
+Section: libdevel
+Architecture: any
+Depends: libtrilinos (= ${binary:Version}), libexpat1-dev, ${shlibs:Depends}, ${misc:Depends}
+Suggests: libtrilinos-doc
+Conflicts: libtrilinos6.0-dev, libtrilinos7.0-dev, libtrilinos8.0-dev
+Replaces: libtrilinos6.0-dev, libtrilinos7.0-dev, libtrilinos8.0-dev
+Description: parallel solver libraries within an object-oriented software framework
+ The Trilinos Project is an effort to develop and implement robust
+ parallel algorithms using modern object-oriented software design,
+ while still leveraging the value of established numerical libraries
+ such as PETSc, Aztec, the BLAS and LAPACK. It emphasizes abstract
+ interfaces for maximum flexibility of component interchanging, and
+ provides a full-featured set of concrete classes that implement all
+ abstract interfaces.
+ .
+ This package contains the headers and static libraries.
+
+Package: libtrilinos-dbg
+Section: debug
+Architecture: any
+Depends: libtrilinos (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Suggests: libtrilinos-doc
+Conflicts: libtrilinos6.0-dbg, libtrilinos7.0-dbg, libtrilinos8.0-dbg
+Replaces: libtrilinos6.0-dbg, libtrilinos7.0-dbg, libtrilinos8.0-dbg
+Description: parallel solver libraries within an object-oriented software framework
+ The Trilinos Project is an effort to develop and implement robust
+ parallel algorithms using modern object-oriented software design,
+ while still leveraging the value of established numerical libraries
+ such as PETSc, Aztec, the BLAS and LAPACK. It emphasizes abstract
+ interfaces for maximum flexibility of component interchanging, and
+ provides a full-featured set of concrete classes that implement all
+ abstract interfaces.
+ .
+ This package contains the debug symbols of the dynamic libraries.
+
+Package: python-pytrilinos
+Section: python
+Architecture: any
+XB-Python-Version: ${python:Versions}
+Depends: python-numpy, libtrilinos (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Conflicts: python-pytrilinos7.0, python-pytrilinos8.0
+Replaces: python-pytrilinos7.0, python-pytrilinos8.0
+Description: parallel solver libraries within an object-oriented software framework
+ The Trilinos Project is an effort to develop and implement robust
+ parallel algorithms using modern object-oriented software design,
+ while still leveraging the value of established numerical libraries
+ such as PETSc, Aztec, the BLAS and LAPACK. It emphasizes abstract
+ interfaces for maximum flexibility of component interchanging, and
+ provides a full-featured set of concrete classes that implement all
+ abstract interfaces.
+ .
+ This package contains the Python bindings for trilinos.
+
+
+Package: libtrilinos-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Conflicts: libtrilinos6.0-doc, libtrilinos7.0-doc, libtrilinos8.0-doc
+Replaces: libtrilinos6.0-doc, libtrilinos7.0-doc, libtrilinos8.0-doc
+Description: parallel solver libraries within an object-oriented software framework
+ The Trilinos Project is an effort to develop and implement robust
+ parallel algorithms using modern object-oriented software design,
+ while still leveraging the value of established numerical libraries
+ such as PETSc, Aztec, the BLAS and LAPACK. It emphasizes abstract
+ interfaces for maximum flexibility of component interchanging, and
+ provides a full-featured set of concrete classes that implement all
+ abstract interfaces.
+ .
+ This package contains some documentation and a tutorial.
+
Added: packages/trilinos/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/copyright?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/copyright (added)
+++ packages/trilinos/trunk/debian/copyright Fri Aug 13 11:38:46 2010
@@ -1,0 +1,38 @@
+This package was debianized by Christophe Prud'homme <prudhomm at debian.org> on
+Thu, 13 Apr 2006 07:12:49 +0200.
+
+It was downloaded from http://trilinos.sandia.gov
+
+Copyright:
+
+Copyright (C) 2003-2008 Sandia Corporation
+
+License:
+
+Under terms of Contract DE-AC04-94AL85000, there is a non-exclusive
+license for use of this work by or on behalf of the U.S. Government.
+
+This library is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of the
+License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+USA
+
+Questions? Contact Michael A. Heroux (maherou at sandia.gov)
+
+On Debian systems, the complete text of the GNU Lesser General Public
+License can be found in `/usr/share/common-licenses/LGPL'.
+
+The Debian packaging is (C) 2008, Christophe Prud'homme
+<prudhomm at debian.org> and is licensed under the GPL, see
+`/usr/share/common-licenses/GPL'.
+
Added: packages/trilinos/trunk/debian/docs
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/docs?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/docs (added)
+++ packages/trilinos/trunk/debian/docs Fri Aug 13 11:38:46 2010
@@ -1,0 +1,1 @@
+README
Added: packages/trilinos/trunk/debian/libtrilinos-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/libtrilinos-dev.install?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/libtrilinos-dev.install (added)
+++ packages/trilinos/trunk/debian/libtrilinos-dev.install Fri Aug 13 11:38:46 2010
@@ -1,0 +1,2 @@
+debian/tmp/usr/lib/libtrilinos*.so
+debian/tmp/usr/include/trilinos
Added: packages/trilinos/trunk/debian/libtrilinos-doc.docs
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/libtrilinos-doc.docs?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/libtrilinos-doc.docs (added)
+++ packages/trilinos/trunk/debian/libtrilinos-doc.docs Fri Aug 13 11:38:46 2010
@@ -1,0 +1,1 @@
+
Added: packages/trilinos/trunk/debian/libtrilinos-doc.examples
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/libtrilinos-doc.examples?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/libtrilinos-doc.examples (added)
+++ packages/trilinos/trunk/debian/libtrilinos-doc.examples Fri Aug 13 11:38:46 2010
@@ -1,0 +1,1 @@
+packages/didasko
Added: packages/trilinos/trunk/debian/libtrilinos.install
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/libtrilinos.install?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/libtrilinos.install (added)
+++ packages/trilinos/trunk/debian/libtrilinos.install Fri Aug 13 11:38:46 2010
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/lib*.so.* /usr/lib
Added: packages/trilinos/trunk/debian/patches/destdir
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/destdir?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/patches/destdir (added)
+++ packages/trilinos/trunk/debian/patches/destdir Fri Aug 13 11:38:46 2010
@@ -1,0 +1,25 @@
+Index: trilinos-8.0.4/Makefile.am
+===================================================================
+--- trilinos-8.0.4.orig/Makefile.am 2007-11-20 23:11:38.000000000 +0100
++++ trilinos-8.0.4/Makefile.am 2007-12-19 14:21:28.000000000 +0100
+@@ -112,14 +112,14 @@
+ ## #######################################################################
+
+ install-exec-hook:
+- cp $(top_srcdir)/Trilinos_version.h $(exec_prefix)/include/. ;
+- cp $(top_srcdir)/commonTools/buildTools/strip_dup_incl_paths.pl $(exec_prefix)/include/. ;
+- cp $(top_srcdir)/commonTools/buildTools/strip_dup_libs.pl $(exec_prefix)/include/.
++ cp $(top_srcdir)/Trilinos_version.h $(DESTDIR)$(exec_prefix)/include/trilinos/. ;
++ cp $(top_srcdir)/commonTools/buildTools/strip_dup_incl_paths.pl $(DESTDIR)$(exec_prefix)/include/trilinos/. ;
++ cp $(top_srcdir)/commonTools/buildTools/strip_dup_libs.pl $(DESTDIR)$(exec_prefix)/include/trilinos/.
+
+ uninstall-hook:
+- rm -f $(exec_prefix)/include/Trilinos_version.h
+- rm -f $(exec_prefix)/include/strip_dup_incl_paths.pl
+- rm -f $(exec_prefix)/include/strip_dup_libs.pl
++ rm -f $(DESTDIR)$(exec_prefix)/include/trilinos/Trilinos_version.h
++ rm -f $(DESTDIR)$(exec_prefix)/include/trilinos/strip_dup_incl_paths.pl
++ rm -f $(DESTDIR)$(exec_prefix)/include/trilinos/strip_dup_libs.pl
+
+
+ #
Added: packages/trilinos/trunk/debian/patches/gcc43.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/gcc43.patch?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/patches/gcc43.patch (added)
+++ packages/trilinos/trunk/debian/patches/gcc43.patch Fri Aug 13 11:38:46 2010
@@ -1,0 +1,13 @@
+Index: trilinos-8.0.8/packages/moertel/src/mrtr_functions.cpp
+===================================================================
+--- trilinos-8.0.8.orig/packages/moertel/src/mrtr_functions.cpp 2008-08-11 09:10:16.937730513 +0200
++++ trilinos-8.0.8/packages/moertel/src/mrtr_functions.cpp 2008-08-11 09:10:55.013739025 +0200
+@@ -27,6 +27,8 @@
+ # ************************************************************************
+ #@HEADER
+ */
++#include <cstdlib>
++
+ /* ******************************************************************** */
+ /* See the file COPYRIGHT for a complete copyright notice, contact */
+ /* person and disclaimer. */
Added: packages/trilinos/trunk/debian/patches/gcc44.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/gcc44.patch?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/patches/gcc44.patch (added)
+++ packages/trilinos/trunk/debian/patches/gcc44.patch Fri Aug 13 11:38:46 2010
@@ -1,0 +1,12 @@
+Index: trilinos-9.0.2.dfsg/packages/PyTrilinos/src/FILEstream.cpp
+===================================================================
+--- trilinos-9.0.2.dfsg.orig/packages/PyTrilinos/src/FILEstream.cpp 2009-05-12 06:53:58.000000000 +0200
++++ trilinos-9.0.2.dfsg/packages/PyTrilinos/src/FILEstream.cpp 2009-05-12 06:54:20.000000000 +0200
+@@ -29,6 +29,7 @@
+ #include "FILEstream.h"
+
+ #include <algorithm>
++#include <cstdio>
+ #include <cstring>
+ #include <iostream>
+
Added: packages/trilinos/trunk/debian/patches/libname.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/libname.patch?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/patches/libname.patch (added)
+++ packages/trilinos/trunk/debian/patches/libname.patch Fri Aug 13 11:38:46 2010
@@ -1,0 +1,2350 @@
+diff -Nru trilinos-10.0.4-Source.orig/packages/amesos/src/CMakeLists.txt trilinos-10.0.4-Source/packages/amesos/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/amesos/src/CMakeLists.txt 2010-01-05 14:56:06.000000000 +0100
++++ trilinos-10.0.4-Source/packages/amesos/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -465,7 +465,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- amesos
++ trilinos_amesos
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/anasazi/epetra/src/CMakeLists.txt trilinos-10.0.4-Source/packages/anasazi/epetra/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/anasazi/epetra/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/anasazi/epetra/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -37,8 +37,8 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- anasaziepetra
++ trilinos_anasaziepetra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS anasazi
++ DEPLIBS trilinos_anasazi
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt trilinos-10.0.4-Source/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -55,8 +55,8 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- ModeLaplace
++ trilinos_ModeLaplace
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS anasazi
++ DEPLIBS trilinos_anasazi
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/anasazi/src/CMakeLists.txt trilinos-10.0.4-Source/packages/anasazi/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/anasazi/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/anasazi/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -136,7 +136,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- anasazi
++ trilinos_anasazi
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/anasazi/thyra/src/CMakeLists.txt trilinos-10.0.4-Source/packages/anasazi/thyra/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/anasazi/thyra/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/anasazi/thyra/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -111,7 +111,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- anasazithyra
++ trilinos_anasazithyra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/aztecoo/src/CMakeLists.txt trilinos-10.0.4-Source/packages/aztecoo/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/aztecoo/src/CMakeLists.txt 2010-01-05 14:56:09.000000000 +0100
++++ trilinos-10.0.4-Source/packages/aztecoo/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -173,7 +173,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- aztecoo
++ trilinos_aztecoo
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/belos/epetra/src/CMakeLists.txt trilinos-10.0.4-Source/packages/belos/epetra/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/belos/epetra/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/belos/epetra/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -39,8 +39,8 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- belosepetra
++ trilinos_belosepetra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS belos
++ DEPLIBS trilinos_belos
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/belos/src/CMakeLists.txt trilinos-10.0.4-Source/packages/belos/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/belos/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/belos/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -108,7 +108,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- belos
++ trilinos_belos
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/epetra/src/CMakeLists.txt trilinos-10.0.4-Source/packages/epetra/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/epetra/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/epetra/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -219,7 +219,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- epetra
++ trilinos_epetra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/epetraext/src/CMakeLists.txt trilinos-10.0.4-Source/packages/epetraext/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/epetraext/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/epetraext/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -425,7 +425,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- epetraext
++ trilinos_epetraext
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/fei/base/CMakeLists.txt trilinos-10.0.4-Source/packages/fei/base/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/fei/base/CMakeLists.txt 2010-01-05 14:56:06.000000000 +0100
++++ trilinos-10.0.4-Source/packages/fei/base/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -233,7 +233,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- fei_base
++ trilinos_fei_base
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/fei/support-Trilinos/CMakeLists.txt trilinos-10.0.4-Source/packages/fei/support-Trilinos/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/fei/support-Trilinos/CMakeLists.txt 2010-01-05 14:56:06.000000000 +0100
++++ trilinos-10.0.4-Source/packages/fei/support-Trilinos/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -71,7 +71,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- fei_trilinos
++ trilinos_fei_trilinos
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/fei/test_utils/CMakeLists.txt trilinos-10.0.4-Source/packages/fei/test_utils/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/fei/test_utils/CMakeLists.txt 2010-01-05 14:56:06.000000000 +0100
++++ trilinos-10.0.4-Source/packages/fei/test_utils/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -135,7 +135,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- fei_test_utils
++ trilinos_fei_test_utils
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/fei/utest_cases/CMakeLists.txt trilinos-10.0.4-Source/packages/fei/utest_cases/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/fei/utest_cases/CMakeLists.txt 2010-01-05 14:56:06.000000000 +0100
++++ trilinos-10.0.4-Source/packages/fei/utest_cases/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -73,7 +73,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- fei_utest_cases
++ trilinos_fei_utest_cases
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/galeri/src/CMakeLists.txt trilinos-10.0.4-Source/packages/galeri/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/galeri/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/galeri/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -146,7 +146,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- galeri
++ trilinos_galeri
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/ifpack/src/CMakeLists.txt trilinos-10.0.4-Source/packages/ifpack/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/ifpack/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/ifpack/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -225,7 +225,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- ifpack
++ trilinos_ifpack
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/intrepid/example/Drivers/CMakeLists.txt trilinos-10.0.4-Source/packages/intrepid/example/Drivers/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/intrepid/example/Drivers/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/intrepid/example/Drivers/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -4,7 +4,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_01
+ SOURCES example_01.cpp
+- DEPLIBS epetra epetraext
++ DEPLIBS trilinos_epetra trilinos_epetraext
+ ARGS "10 10 10 0 1.0 10.0 0.0 1.0 -1.0 1.0 -1.0 1.0"
+ NUM_MPI_PROCS 1
+ # PASS_REGULAR_EXPRESSION "TEST PASSED"
+@@ -13,7 +13,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_02
+ SOURCES example_02.cpp
+- DEPLIBS epetra epetraext
++ DEPLIBS trilinos_epetra trilinos_epetraext
+ ARGS "10 10 10 0 1.0 1.0 -1.0 1.0 -1.0 1.0 -1.0 1.0"
+ NUM_MPI_PROCS 1
+ # PASS_REGULAR_EXPRESSION "TEST PASSED"
+@@ -22,7 +22,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_03
+ SOURCES example_03.cpp
+- DEPLIBS epetra epetraext
++ DEPLIBS trilinos_epetra trilinos_epetraext
+ ARGS "10 10 10"
+ NUM_MPI_PROCS 1
+ # PASS_REGULAR_EXPRESSION "TEST PASSED"
+diff -Nru trilinos-10.0.4-Source.orig/packages/intrepid/src/CMakeLists.txt trilinos-10.0.4-Source/packages/intrepid/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/intrepid/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/intrepid/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -181,7 +181,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- intrepid
++ trilinos_intrepid
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/isorropia/example/CMakeLists.txt trilinos-10.0.4-Source/packages/isorropia/example/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/isorropia/example/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/isorropia/example/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -8,6 +8,6 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ matrix_1
+ SOURCES matrix_1.cpp
+- DEPLIBS isorropia_test_utils
++ DEPLIBS trilinos_isorropia_test_utils
+ COMM serial mpi
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/isorropia/example/geometric/CMakeLists.txt trilinos-10.0.4-Source/packages/isorropia/example/geometric/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/isorropia/example/geometric/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/isorropia/example/geometric/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -6,7 +6,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ example_rcb
+ SOURCES example_rcb.cpp
+- DEPLIBS isorropia_test_utils
++ DEPLIBS trilinos_isorropia_test_utils
+ COMM serial mpi
+ )
+
+diff -Nru trilinos-10.0.4-Source.orig/packages/isorropia/example/levelSchedule/CMakeLists.txt trilinos-10.0.4-Source/packages/isorropia/example/levelSchedule/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/isorropia/example/levelSchedule/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/isorropia/example/levelSchedule/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -6,7 +6,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ levelSchedule
+ SOURCES levelSchedule.cpp
+- DEPLIBS isorropia_test_utils
++ DEPLIBS trilinos_isorropia_test_utils
+ COMM serial
+ )
+
+diff -Nru trilinos-10.0.4-Source.orig/packages/isorropia/src/CMakeLists.txt trilinos-10.0.4-Source/packages/isorropia/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/isorropia/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/isorropia/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -102,7 +102,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- isorropia
++ trilinos_isorropia
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/isorropia/test/geometric/CMakeLists.txt trilinos-10.0.4-Source/packages/isorropia/test/geometric/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/isorropia/test/geometric/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/isorropia/test/geometric/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -6,7 +6,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ test_geometric
+ SOURCES test_geometric.cpp
+- DEPLIBS isorropia_test_utils
++ DEPLIBS trilinos_isorropia_test_utils
+ COMM serial mpi
+ ARGS
+ "--f=brack_3D.coords"
+diff -Nru trilinos-10.0.4-Source.orig/packages/isorropia/test/mtx/CMakeLists.txt trilinos-10.0.4-Source/packages/isorropia/test/mtx/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/isorropia/test/mtx/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/isorropia/test/mtx/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -6,7 +6,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ test_balanced_copy
+ SOURCES test_create_balanced_copy.cpp
+- DEPLIBS isorropia_test_utils
++ DEPLIBS trilinos_isorropia_test_utils
+ COMM serial mpi
+ ARGS
+ "--f=simple.mtx"
+@@ -19,7 +19,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ test_simple
+ SOURCES test_simple.cpp
+- DEPLIBS isorropia_test_utils
++ DEPLIBS trilinos_isorropia_test_utils
+ COMM serial mpi
+ ARGS
+ "--f=simple.mtx"
+@@ -31,7 +31,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ test_colorer
+ SOURCES test_colorer.cpp
+- DEPLIBS isorropia_test_utils
++ DEPLIBS trilinos_isorropia_test_utils
+ COMM serial mpi
+ ARGS
+ "--f=simple.mtx"
+diff -Nru trilinos-10.0.4-Source.orig/packages/isorropia/test/part_sizes/CMakeLists.txt trilinos-10.0.4-Source/packages/isorropia/test/part_sizes/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/isorropia/test/part_sizes/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/isorropia/test/part_sizes/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -6,7 +6,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ part_sizes
+ SOURCES part_sizes.cpp
+- DEPLIBS isorropia_test_utils
++ DEPLIBS trilinos_isorropia_test_utils
+ COMM serial mpi
+ ARGS
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/isorropia/test/probing/CMakeLists.txt trilinos-10.0.4-Source/packages/isorropia/test/probing/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/isorropia/test/probing/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/isorropia/test/probing/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -5,7 +5,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ test_probing
+ SOURCES probing.cpp
+- DEPLIBS isorropia_test_utils
++ DEPLIBS trilinos_isorropia_test_utils
+ COMM serial mpi
+ ARGS
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/isorropia/utils/CMakeLists.txt trilinos-10.0.4-Source/packages/isorropia/utils/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/isorropia/utils/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/isorropia/utils/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -33,9 +33,9 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- isorropia_test_utils
++ trilinos_isorropia_test_utils
+ NOINSTALLHEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ TESTONLY
+- DEPLIBS isorropia
++ DEPLIBS trilinos_isorropia
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/kokkos/LinAlg/CMakeLists.txt trilinos-10.0.4-Source/packages/kokkos/LinAlg/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/kokkos/LinAlg/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/kokkos/LinAlg/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -53,10 +53,10 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- kokkoslinalg
++ trilinos_kokkoslinalg
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS kokkos kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkosnodeapi
+ )
+
+ PACKAGE_ADD_TEST_DIRECTORIES(test)
+diff -Nru trilinos-10.0.4-Source.orig/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt trilinos-10.0.4-Source/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -6,7 +6,7 @@
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
+ )
+ PACKAGE_ADD_EXECUTABLE_AND_TEST( CrsMatrix_UnitTests
+ SOURCES
+@@ -15,5 +15,5 @@
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt trilinos-10.0.4-Source/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -6,7 +6,7 @@
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
+ )
+ PACKAGE_ADD_EXECUTABLE_AND_TEST( MultiVector_UnitTests
+ SOURCES
+@@ -15,5 +15,5 @@
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/kokkos/NodeAPI/CMakeLists.txt trilinos-10.0.4-Source/packages/kokkos/NodeAPI/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/kokkos/NodeAPI/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/kokkos/NodeAPI/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -73,10 +73,10 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- kokkosnodeapi
++ trilinos_kokkosnodeapi
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS kokkos
++ DEPLIBS trilinos_kokkos
+ )
+
+ PACKAGE_ADD_TEST_DIRECTORIES(test)
+diff -Nru trilinos-10.0.4-Source.orig/packages/kokkos/NodeAPI/test/CMakeLists.txt trilinos-10.0.4-Source/packages/kokkos/NodeAPI/test/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/kokkos/NodeAPI/test/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/kokkos/NodeAPI/test/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -8,7 +8,7 @@
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkosnodeapi
++ DEPLIBS trilinos_kokkosnodeapi
+ )
+
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+@@ -19,5 +19,5 @@
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkosnodeapi
++ DEPLIBS trilinos_kokkosnodeapi
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/kokkos/src/CMakeLists.txt trilinos-10.0.4-Source/packages/kokkos/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/kokkos/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/kokkos/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -44,7 +44,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- kokkos
++ trilinos_kokkos
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/komplex/src/CMakeLists.txt trilinos-10.0.4-Source/packages/komplex/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/komplex/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/komplex/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -69,7 +69,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- komplex
++ trilinos_komplex
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/meros/src/CMakeLists.txt trilinos-10.0.4-Source/packages/meros/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/meros/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/meros/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -84,7 +84,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- meros
++ trilinos_meros
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/ml/src/CMakeLists.txt trilinos-10.0.4-Source/packages/ml/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/ml/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/ml/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -306,7 +306,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- ml
++ trilinos_ml
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/moertel/src/CMakeLists.txt trilinos-10.0.4-Source/packages/moertel/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/moertel/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/moertel/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -95,7 +95,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- moertel
++ trilinos_moertel
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/moocho/src/CMakeLists.txt trilinos-10.0.4-Source/packages/moocho/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/moocho/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/moocho/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -198,7 +198,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- moocho
++ trilinos_moocho
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/moocho/thyra/src/CMakeLists.txt trilinos-10.0.4-Source/packages/moocho/thyra/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/moocho/thyra/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/moocho/thyra/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -21,8 +21,8 @@
+ APPEND_GLOB(SOURCES ${DIR}/*.cpp)
+
+ PACKAGE_ADD_LIBRARY(
+- moochothyra
++ trilinos_moochothyra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS moocho
++ DEPLIBS trilinos_moocho
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -210,7 +210,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- nox
++ trilinos_nox
+ HEADERS ${HEADERS}
+ NOINSTALLHEADERS ${NOINSTALLHEADERS}
+ SOURCES ${SOURCES}
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src-belos/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src-belos/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/src-belos/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/src-belos/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -23,7 +23,7 @@
+
+ IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_BELOS)
+ PACKAGE_ADD_LIBRARY(
+- noxbelos
++ trilinos_noxbelos
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src-epetra/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src-epetra/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/src-epetra/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/src-epetra/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -75,9 +75,9 @@
+
+ IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA)
+ PACKAGE_ADD_LIBRARY(
+- noxepetra
++ trilinos_noxepetra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS nox
++ DEPLIBS trilinos_nox
+ )
+ ENDIF()
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src-lapack/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src-lapack/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/src-lapack/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/src-lapack/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -22,9 +22,9 @@
+
+ IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK)
+ PACKAGE_ADD_LIBRARY(
+- noxlapack
++ trilinos_noxlapack
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS nox
++ DEPLIBS trilinos_nox
+ )
+ ENDIF()
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src-loca/src/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src-loca/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/src-loca/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/src-loca/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -338,10 +338,10 @@
+
+ IF (NOX_ENABLE_LOCA)
+ PACKAGE_ADD_LIBRARY(
+- loca
++ trilinos_loca
+ HEADERS ${HEADERS}
+ NOINSTALLHEADERS ${NOINSTALLHEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS nox
++ DEPLIBS trilinos_nox
+ )
+ ENDIF()
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src-loca/src-epetra/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src-loca/src-epetra/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/src-loca/src-epetra/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/src-loca/src-epetra/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -80,9 +80,9 @@
+
+ IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_LOCA)
+ PACKAGE_ADD_LIBRARY(
+- locaepetra
++ trilinos_locaepetra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS loca noxepetra nox
++ DEPLIBS trilinos_loca trilinos_noxepetra trilinos_nox
+ )
+ ENDIF()
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src-loca/src-lapack/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src-loca/src-lapack/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/src-loca/src-lapack/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/src-loca/src-lapack/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -24,9 +24,9 @@
+
+ IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK AND NOX_ENABLE_LOCA)
+ PACKAGE_ADD_LIBRARY(
+- localapack
++ trilinos_localapack
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS loca noxlapack nox
++ DEPLIBS trilinos_loca trilinos_noxlapack trilinos_nox
+ )
+ ENDIF()
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src-loca/src-mf/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src-loca/src-mf/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/src-loca/src-mf/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/src-loca/src-mf/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -22,7 +22,7 @@
+
+ IF (NOX_ENABLE_LOCA AND NOX_ENABLE_MF)
+ PACKAGE_ADD_LIBRARY(
+- locamf
++ trilinos_locamf
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src-loca/src-thyra/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src-loca/src-thyra/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/src-loca/src-thyra/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/src-loca/src-thyra/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -19,9 +19,9 @@
+
+ IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_THYRA AND NOX_ENABLE_LOCA)
+ PACKAGE_ADD_LIBRARY(
+- locathyra
++ trilinos_locathyra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS loca noxthyra nox
++ DEPLIBS trilinos_loca trilinos_noxthyra trilinos_nox
+ )
+ ENDIF()
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src-petsc/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src-petsc/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/src-petsc/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/src-petsc/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -25,9 +25,9 @@
+
+ IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_PETSC)
+ PACKAGE_ADD_LIBRARY(
+- noxpetsc
++ trilinos_noxpetsc
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS nox
++ DEPLIBS trilinos_nox
+ )
+-ENDIF()
+\ No newline at end of file
++ENDIF()
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src-thyra/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src-thyra/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/src-thyra/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/src-thyra/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -24,9 +24,9 @@
+
+ IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_THYRA)
+ PACKAGE_ADD_LIBRARY(
+- noxthyra
++ trilinos_noxthyra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS nox
++ DEPLIBS trilinos_nox
+ )
+-ENDIF()
+\ No newline at end of file
++ENDIF()
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -16,7 +16,7 @@
+ Problem_Interface.C
+ brussCont.C
+ COMM serial mpi
+- DEPLIBS noxtestutils
++ DEPLIBS trilinos_noxtestutils
+ NUM_MPI_PROCS 2
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+@@ -36,7 +36,7 @@
+ brussHopfCont.C
+ COMM serial mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils
++ DEPLIBS trilinos_noxtestutils
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -17,7 +17,7 @@
+ brussXYZT_ifpack.C
+ COMM serial mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils
++ DEPLIBS trilinos_noxtestutils
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+@@ -34,7 +34,7 @@
+ brussXYZT_global.C
+ COMM serial mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils
++ DEPLIBS trilinos_noxtestutils
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+@@ -51,7 +51,7 @@
+ brussXYZT_sequential.C
+ COMM serial mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils
++ DEPLIBS trilinos_noxtestutils
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+@@ -68,7 +68,7 @@
+ brussXYZT_sequential_IPS.C
+ COMM serial mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils
++ DEPLIBS trilinos_noxtestutils
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+@@ -85,7 +85,7 @@
+ brussXYZT_sequential_OPS.C
+ COMM serial mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils
++ DEPLIBS trilinos_noxtestutils
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+@@ -102,7 +102,7 @@
+ brussXYZT_parallel.C
+ COMM serial mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils
++ DEPLIBS trilinos_noxtestutils
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+@@ -120,7 +120,7 @@
+ # Problem_Interface.C
+ # brussXYZT_parareal.C
+ # COMM serial mpi
+-# DEPLIBS noxtestutils
++# DEPLIBS trilinos_noxtestutils
+ # ARGS -v
+ # PASS_REGULAR_EXPRESSION "All tests passed"
+ # )
+@@ -137,7 +137,7 @@
+ brussXYZT_blockdiagonal.C
+ COMM serial mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils
++ DEPLIBS trilinos_noxtestutils
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+@@ -154,7 +154,7 @@
+ brussXYZT_bdsdt.C
+ COMM serial mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils
++ DEPLIBS trilinos_noxtestutils
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_EpetraExt_ModelEvaluator/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_EpetraExt_ModelEvaluator/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_EpetraExt_ModelEvaluator/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_EpetraExt_ModelEvaluator/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -12,7 +12,7 @@
+ tcubed.C
+ COMM serial mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils locaepetratestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_locaepetratestproblems
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -13,7 +13,7 @@
+ multipointTcubed.C
+ COMM mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils locaepetratestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_locaepetratestproblems
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -11,7 +11,7 @@
+ Pitchfork.C
+ COMM serial mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils locaepetratestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_locaepetratestproblems
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -11,7 +11,7 @@
+ Tcubed.C
+ COMM serial mpi
+ NUM_MPI_PROCS 4
+- DEPLIBS noxtestutils locaepetratestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_locaepetratestproblems
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+@@ -22,7 +22,7 @@
+ Tcubed_constraint.C
+ COMM serial mpi
+ NUM_MPI_PROCS 4
+- DEPLIBS noxtestutils locaepetratestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_locaepetratestproblems
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+@@ -33,7 +33,7 @@
+ TcubedTP.C
+ COMM serial mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils locaepetratestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_locaepetratestproblems
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -28,7 +28,7 @@
+ IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_LOCA)
+
+ PACKAGE_ADD_LIBRARY(
+- locaepetratestproblems
++ trilinos_locaepetratestproblems
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ TESTONLY
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_Thyra_ModelEvaluator/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_Thyra_ModelEvaluator/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_Thyra_ModelEvaluator/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_Thyra_ModelEvaluator/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -12,7 +12,7 @@
+ tcubed.C
+ COMM serial mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils locaepetratestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_locaepetratestproblems
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+@@ -23,7 +23,7 @@
+ tcubedTP.C
+ COMM serial mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils locaepetratestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_locaepetratestproblems
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -11,7 +11,7 @@
+ HouseholderBorderedSolve.C
+ COMM serial mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils locaepetratestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_locaepetratestproblems
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+@@ -22,7 +22,7 @@
+ HouseholderTransposeBorderedSolve.C
+ COMM serial mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils locaepetratestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_locaepetratestproblems
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+@@ -33,7 +33,7 @@
+ TransposeSolve.C
+ COMM serial mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils locaepetratestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_locaepetratestproblems
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+@@ -44,7 +44,7 @@
+ CompositeConstraint.C
+ COMM serial mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils locaepetratestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_locaepetratestproblems
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+@@ -55,7 +55,7 @@
+ CompositeConstraintMVDX.C
+ COMM serial mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils locaepetratestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_locaepetratestproblems
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+@@ -66,7 +66,7 @@
+ NaturalContResidualFills.C
+ COMM serial mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils locaepetratestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_locaepetratestproblems
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -13,7 +13,7 @@
+ test.C
+ Laplace2D.C
+ Laplace2D.H
+- DEPLIBS noxtestutils
++ DEPLIBS trilinos_noxtestutils
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "Test passed!"
+@@ -23,7 +23,7 @@
+ BroydenOp
+ SOURCES
+ test_BroydenOp.C
+- DEPLIBS noxtestutils
++ DEPLIBS trilinos_noxtestutils
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "Test passed!"
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -10,7 +10,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Epetra_Vector
+ SOURCES test.C
+- DEPLIBS noxtestutils
++ DEPLIBS trilinos_noxtestutils
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "Test passed!"
+@@ -19,7 +19,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Epetra_VectorSpace
+ SOURCES vectorSpace.C
+- DEPLIBS noxtestutils
++ DEPLIBS trilinos_noxtestutils
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "Test passed!"
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -10,7 +10,7 @@
+ SOURCES ChanContinuation.C
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+- DEPLIBS noxtestutils localapacktestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_localapacktestproblems
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+
+@@ -19,7 +19,7 @@
+ SOURCES ChanTPContinuation.C
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+- DEPLIBS noxtestutils localapacktestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_localapacktestproblems
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+
+@@ -28,7 +28,7 @@
+ SOURCES ChanHomotopy.C
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+- DEPLIBS noxtestutils localapacktestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_localapacktestproblems
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -21,7 +21,7 @@
+ IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK AND NOX_ENABLE_LOCA)
+
+ PACKAGE_ADD_LIBRARY(
+- localapacktestproblems
++ trilinos_localapacktestproblems
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ TESTONLY
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -10,7 +10,7 @@
+ SOURCES BorderedSolve.C
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+- DEPLIBS noxtestutils localapacktestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_localapacktestproblems
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+
+@@ -19,7 +19,7 @@
+ SOURCES TransposeBorderedSolve.C
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+- DEPLIBS noxtestutils localapacktestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_localapacktestproblems
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+
+@@ -30,7 +30,7 @@
+ SOURCES AnasaziJacobianInverse.C
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+- DEPLIBS noxtestutils localapacktestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_localapacktestproblems
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+
+@@ -39,7 +39,7 @@
+ SOURCES AnasaziNotConverged.C
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+- DEPLIBS noxtestutils localapacktestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_localapacktestproblems
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/lapack/NOX/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/lapack/NOX/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/test/lapack/NOX/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/test/lapack/NOX/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -10,7 +10,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ rosenbrock
+ SOURCES Rosenbrock.C
+- DEPLIBS noxtestutils
++ DEPLIBS trilinos_noxtestutils
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "Test passed!"
+@@ -19,7 +19,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ broyden
+ SOURCES Broyden.C
+- DEPLIBS noxtestutils
++ DEPLIBS trilinos_noxtestutils
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "Test passed!"
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/lapack/StatusTests/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/lapack/StatusTests/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/test/lapack/StatusTests/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/test/lapack/StatusTests/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -10,7 +10,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ StatusTests
+ SOURCES StatusTests.C
+- DEPLIBS noxtestutils
++ DEPLIBS trilinos_noxtestutils
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "Test passed!"
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -10,7 +10,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ UserDefinedObjects
+ SOURCES UserDefinedObjects.C
+- DEPLIBS noxtestutils
++ DEPLIBS trilinos_noxtestutils
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "Test passed!"
+diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/utils/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/utils/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/nox/test/utils/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/nox/test/utils/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -24,7 +24,7 @@
+ ENDIF()
+
+ PACKAGE_ADD_LIBRARY(
+- noxtestutils
++ trilinos_noxtestutils
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ TESTONLY
+diff -Nru trilinos-10.0.4-Source.orig/packages/pamgen/src/CMakeLists.txt trilinos-10.0.4-Source/packages/pamgen/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/pamgen/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/pamgen/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -208,13 +208,13 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- pamgen
++ trilinos_pamgen
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- pamgen_extras
++ trilinos_pamgen_extras
+ HEADERS ${PE_HEADERS}
+ SOURCES ${PE_SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/phalanx/src/CMakeLists.txt trilinos-10.0.4-Source/packages/phalanx/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/phalanx/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/phalanx/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -90,7 +90,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- phalanx
++ trilinos_phalanx
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/phalanx/test/DataContainer/CMakeLists.txt trilinos-10.0.4-Source/packages/phalanx/test/DataContainer/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/phalanx/test/DataContainer/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/phalanx/test/DataContainer/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -8,8 +8,8 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ data_container
+ SOURCES DataContainer.cpp
+- DEPLIBS phalanx_test_utilities
++ DEPLIBS trilinos_phalanx_test_utilities
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "Test passed!"
+- )
+\ No newline at end of file
++ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/phalanx/test/EvaluatorManager/CMakeLists.txt trilinos-10.0.4-Source/packages/phalanx/test/EvaluatorManager/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/phalanx/test/EvaluatorManager/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/phalanx/test/EvaluatorManager/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -8,7 +8,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ evaluator_manager
+ SOURCES EvaluatorManager.cpp
+- DEPLIBS phalanx_test_utilities
++ DEPLIBS trilinos_phalanx_test_utilities
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "Test passed!"
+diff -Nru trilinos-10.0.4-Source.orig/packages/phalanx/test/Field/CMakeLists.txt trilinos-10.0.4-Source/packages/phalanx/test/Field/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/phalanx/test/Field/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/phalanx/test/Field/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -9,7 +9,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ field
+ SOURCES Field.cpp
+- DEPLIBS phalanx_test_utilities
++ DEPLIBS trilinos_phalanx_test_utilities
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "Test passed!"
+@@ -18,7 +18,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ mdfield
+ SOURCES MDField.cpp
+- DEPLIBS phalanx_test_utilities
++ DEPLIBS trilinos_phalanx_test_utilities
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "Test passed!"
+@@ -27,7 +27,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ mdfield_runtime
+ SOURCES MDField_Runtime.cpp
+- DEPLIBS phalanx_test_utilities
++ DEPLIBS trilinos_phalanx_test_utilities
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "Test passed!"
+@@ -37,7 +37,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ mdfield_simulated_intrepid
+ SOURCES MDField_SimulatedIntrepid.cpp
+- DEPLIBS phalanx_test_utilities
++ DEPLIBS trilinos_phalanx_test_utilities
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "Test passed!"
+@@ -52,7 +52,7 @@
+ # PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ # mdfield_intrepid
+ # SOURCES MDField_Intrepid.cpp
+-# DEPLIBS phalanx_test_utilities
++# DEPLIBS trilinos_phalanx_test_utilities
+ # COMM serial mpi
+ # NUM_MPI_PROCS 1
+ # PASS_REGULAR_EXPRESSION "Test passed!"
+@@ -88,4 +88,4 @@
+ # DEST_DIR "${CMAKE_CURRENT_BINARY_DIR}/testdata"
+ #)
+ #
+-#ENDIF(Phalanx_ENABLE_Intrepid)
+\ No newline at end of file
++#ENDIF(Phalanx_ENABLE_Intrepid)
+diff -Nru trilinos-10.0.4-Source.orig/packages/phalanx/test/FieldTag/CMakeLists.txt trilinos-10.0.4-Source/packages/phalanx/test/FieldTag/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/phalanx/test/FieldTag/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/phalanx/test/FieldTag/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -8,7 +8,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ field_tag
+ SOURCES FieldTag.cpp
+- DEPLIBS phalanx_test_utilities
++ DEPLIBS trilinos_phalanx_test_utilities
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "Test passed!"
+diff -Nru trilinos-10.0.4-Source.orig/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt trilinos-10.0.4-Source/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -13,10 +13,10 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ intrepid_interoperability
+ SOURCES IntrepidInteroperability.cpp
+- DEPLIBS phalanx_test_utilities
++ DEPLIBS trilinos_phalanx_test_utilities
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "Test passed!"
+ )
+
+-ENDIF(Phalanx_ENABLE_Intrepid)
+\ No newline at end of file
++ENDIF(Phalanx_ENABLE_Intrepid)
+diff -Nru trilinos-10.0.4-Source.orig/packages/phalanx/test/Performance/Allocators/CMakeLists.txt trilinos-10.0.4-Source/packages/phalanx/test/Performance/Allocators/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/phalanx/test/Performance/Allocators/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/phalanx/test/Performance/Allocators/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -8,8 +8,8 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ performance_allocators
+ SOURCES Performance_Allocators.cpp
+- DEPLIBS phalanx_test_utilities
++ DEPLIBS trilinos_phalanx_test_utilities
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "Test passed!"
+- )
+\ No newline at end of file
++ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt trilinos-10.0.4-Source/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -6,8 +6,8 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ performance_bracket_operator
+ SOURCES Performance_BracketOperator.cpp
+- DEPLIBS phalanx_test_utilities
++ DEPLIBS trilinos_phalanx_test_utilities
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "Test passed!"
+- )
+\ No newline at end of file
++ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/phalanx/test/Utilities/CMakeLists.txt trilinos-10.0.4-Source/packages/phalanx/test/Utilities/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/phalanx/test/Utilities/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/phalanx/test/Utilities/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -32,7 +32,7 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- phalanx_test_utilities
++ trilinos_phalanx_test_utilities
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ TESTONLY
+@@ -41,8 +41,8 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ test_utilitites_algebraic_types
+ SOURCES Test_Utilities_AlgebraicTypes.cpp
+- DEPLIBS phalanx_test_utilities
++ DEPLIBS trilinos_phalanx_test_utilities
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "Test passed!"
+- )
+\ No newline at end of file
++ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/phdmesh/src/CMakeLists.txt trilinos-10.0.4-Source/packages/phdmesh/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/phdmesh/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/phdmesh/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -193,31 +193,31 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- phdelement_mesh
++ trilinos_phdelement_mesh
+ HEADERS ${ELEMENT_HEADERS}
+ SOURCES ${ELEMENT_SOURCES}
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- phdmesh_util
++ trilinos_phdmesh_util
+ HEADERS ${UTIL_HEADERS}
+ SOURCES ${UTIL_SOURCES}
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- phdmesh_mesh
++ trilinos_phdmesh_mesh
+ HEADERS ${MESH_HEADERS}
+ SOURCES ${MESH_SOURCES}
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- phdmesh_meshio
++ trilinos_phdmesh_meshio
+ HEADERS ${MESH_IO_HEADERS}
+ SOURCES ${MESH_IO_SOURCES}
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- phdmesh_txblas
++ trilinos_phdmesh_txblas
+ HEADERS ${TXBLAS_HEADERS}
+ SOURCES ${TXBLAS_SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/pliris/src/CMakeLists.txt trilinos-10.0.4-Source/packages/pliris/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/pliris/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/pliris/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -145,7 +145,7 @@
+ MESSAGE(" Building the Z Complex library")
+ ADD_DEFINITIONS(-DZCPLX)
+ PACKAGE_ADD_LIBRARY(
+- zpliris
++ trilinos_zpliris
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+@@ -154,7 +154,7 @@
+ MESSAGE(" Building the S Complex library")
+ ADD_DEFINITIONS(-DSCPLX)
+ PACKAGE_ADD_LIBRARY(
+- cpliris
++ trilinos_cpliris
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+@@ -163,7 +163,7 @@
+ MESSAGE(" Building the single precision library")
+ ADD_DEFINITIONS(-DSREAL)
+ PACKAGE_ADD_LIBRARY(
+- spliris
++ trilinos_spliris
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+@@ -172,7 +172,7 @@
+ MESSAGE(" Building the double precision(default) library")
+ ADD_DEFINITIONS(-DDREAL)
+ PACKAGE_ADD_LIBRARY(
+- dpliris
++ trilinos_dpliris
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/PyTrilinos/src/CMakeLists.txt trilinos-10.0.4-Source/packages/PyTrilinos/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/PyTrilinos/src/CMakeLists.txt 2010-01-05 14:56:06.000000000 +0100
++++ trilinos-10.0.4-Source/packages/PyTrilinos/src/CMakeLists.txt 2010-01-08 14:15:01.000000000 +0100
+@@ -171,12 +171,12 @@
+ #
+ # Define the targets for the PyTrilinos library
+ PACKAGE_ADD_LIBRARY(
+- pytrilinos
++ trilinos_pytrilinos
+ HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${SWIG_RUNTIME}
+ SOURCES ${SOURCES}
+ )
+
+-SET_TARGET_PROPERTIES(pytrilinos
++SET_TARGET_PROPERTIES(trilinos_pytrilinos
+ PROPERTIES LINK_FLAGS "${EXTRA_LINK_ARGS}"
+ )
+
+@@ -220,7 +220,7 @@
+ # Add the SWIG module
+ SWIG_ADD_MODULE(${PyTrilinos_TARGET_NAME} python "${MODULE_OUTDIR}"
+ "${MODULE_NAME}" ${MODULE}.i)
+- SWIG_LINK_LIBRARIES(${PyTrilinos_TARGET_NAME} pytrilinos)
++ SWIG_LINK_LIBRARIES(${PyTrilinos_TARGET_NAME} trilinos_pytrilinos)
+ #
+ # Choosing the Trilinos libraries to link against, the python module
+ # to byte-compile and the installation rules requires a little bit
+diff -Nru trilinos-10.0.4-Source.orig/packages/rtop/src/CMakeLists.txt trilinos-10.0.4-Source/packages/rtop/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/rtop/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/rtop/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -151,7 +151,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- rtop
++ trilinos_rtop
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/adapters/gaasp/src/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/adapters/gaasp/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/rythmos/adapters/gaasp/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/rythmos/adapters/gaasp/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -31,10 +31,10 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- rythmosgaasp
++ trilinos_rythmosgaasp
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS rythmos gaasp
++ DEPLIBS trilinos_rythmos gaasp
+ )
+
+
+diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/adapters/gaasp/test/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/adapters/gaasp/test/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/rythmos/adapters/gaasp/test/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/rythmos/adapters/gaasp/test/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -8,7 +8,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ test_gaasp_adapters
+ SOURCES ${SOURCES}
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ COMM serial
+ STANDARD_PASS_OUTPUT
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -27,7 +27,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- gaasp
++ trilinos_gaasp
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/example/diagonalTransient/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/example/diagonalTransient/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/rythmos/example/diagonalTransient/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/rythmos/example/diagonalTransient/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -10,7 +10,7 @@
+ PACKAGE_ADD_EXECUTABLE(
+ diagonalTransient
+ SOURCES ${SOURCES}
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ COMM serial mpi
+ )
+
+diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -10,7 +10,7 @@
+ PACKAGE_ADD_EXECUTABLE(
+ 1DfemTransient
+ SOURCES ${SOURCES}
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ COMM serial mpi
+ )
+
+diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -10,7 +10,7 @@
+ PACKAGE_ADD_EXECUTABLE(
+ timeDiscretizedBackwardEuler
+ SOURCES ${SOURCES}
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ COMM serial mpi
+ )
+
+diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/src/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/rythmos/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/rythmos/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -31,7 +31,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- rythmos
++ trilinos_rythmos
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+@@ -96,11 +96,11 @@
+ ENDIF()
+
+ PACKAGE_ADD_LIBRARY(
+- rythmos_test_models
++ trilinos_rythmos_test_models
+ NOINSTALLHEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ TESTONLY
+- DEPLIBS rythmos
++ DEPLIBS trilinos_rythmos
+ )
+
+
+diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/test/Charon/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/test/Charon/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/rythmos/test/Charon/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/rythmos/test/Charon/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -9,7 +9,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ CharonRythmos_UnitTest
+ SOURCES ${SOURCES}
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ COMM serial
+ STANDARD_PASS_OUTPUT
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/test/ConvergenceTest/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/test/ConvergenceTest/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/rythmos/test/ConvergenceTest/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/rythmos/test/ConvergenceTest/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -23,7 +23,7 @@
+ SOURCES
+ ${COMMON_SOURCES}
+ Rythmos_${TEST_NAME}_ConvergenceTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ COMM serial
+ STANDARD_PASS_OUTPUT
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -10,7 +10,7 @@
+ PACKAGE_ADD_EXECUTABLE(
+ vdp
+ SOURCES ${SOURCES}
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ COMM serial mpi
+ )
+
+diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/test/simpleAdjoint/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/test/simpleAdjoint/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/rythmos/test/simpleAdjoint/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/rythmos/test/simpleAdjoint/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -10,7 +10,7 @@
+ PACKAGE_ADD_EXECUTABLE(
+ simpleAdjoint
+ SOURCES ${SOURCES}
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ COMM serial mpi
+ )
+
+diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/test/ThetaStepper/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/test/ThetaStepper/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/rythmos/test/ThetaStepper/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/rythmos/test/ThetaStepper/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -10,7 +10,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ ThetaStepper_UnitTest
+ SOURCES ${SOURCES}
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ COMM serial
+ STANDARD_PASS_OUTPUT
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/test/UnitTest/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/test/UnitTest/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/rythmos/test/UnitTest/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/rythmos/test/UnitTest/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -15,7 +15,7 @@
+ #PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ # UnitTest
+ # SOURCES ${SOURCES}
+-# DEPLIBS rythmos_test_models
++# DEPLIBS trilinos_rythmos_test_models
+ # COMM serial
+ # STANDARD_PASS_OUTPUT
+ # )
+@@ -23,7 +23,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ ConvergenceTestHelpers_UnitTest
+ SOURCES Rythmos_ConvergenceTestHelpers_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -31,7 +31,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ CubicSplineInterpolator_UnitTest
+ SOURCES Rythmos_CubicSplineInterpolator_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -39,7 +39,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ DataStore_UnitTest
+ SOURCES Rythmos_DataStore_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -47,7 +47,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ DefaultIntegrator_UnitTest
+ SOURCES Rythmos_DefaultIntegrator_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -55,7 +55,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ ExplicitRK_UnitTest
+ SOURCES Rythmos_ExplicitRK_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -63,7 +63,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ ForwardSensitivity_UnitTest
+ SOURCES Rythmos_ForwardSensitivity_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -71,7 +71,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ HermiteInterpolator_UnitTest
+ SOURCES Rythmos_HermiteInterpolator_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -79,7 +79,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ ImplicitBDF_UnitTest
+ SOURCES Rythmos_ImplicitBDF_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -87,7 +87,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ ImplicitRK_UnitTest
+ SOURCES Rythmos_ImplicitRK_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ COMM serial
+ STANDARD_PASS_OUTPUT
+ )
+@@ -95,7 +95,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ IntegratorBuilder_UnitTest
+ SOURCES Rythmos_IntegratorBuilder_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ COMM serial
+ STANDARD_PASS_OUTPUT
+ )
+@@ -103,7 +103,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ InterpolationBuffer_UnitTest
+ SOURCES Rythmos_InterpolationBuffer_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -111,7 +111,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ LinearInterpolator_UnitTest
+ SOURCES Rythmos_LinearInterpolator_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -120,7 +120,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Quadrature_UnitTest
+ SOURCES Rythmos_Quadrature_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -129,7 +129,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ RKButcherTableau_UnitTest
+ SOURCES Rythmos_RKButcherTableau_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -138,7 +138,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ SinCosModel_UnitTest
+ SOURCES Rythmos_SinCosModel_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -147,7 +147,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ VanderPolModel_UnitTest
+ SOURCES Rythmos_VanderPolModel_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -156,7 +156,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ StepperBuilder_UnitTest
+ SOURCES Rythmos_StepperBuilder_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -165,7 +165,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ StepperHelpers_UnitTest
+ SOURCES Rythmos_StepperHelpers_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -174,7 +174,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ TimeRange_UnitTest
+ SOURCES Rythmos_TimeRange_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -182,7 +182,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ PointwiseInterpolationBufferAppender_UnitTest
+ SOURCES Rythmos_PointwiseInterpolationBufferAppender_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -190,7 +190,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ StepperValidator_UnitTest
+ SOURCES Rythmos_StepperValidator_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -198,7 +198,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ GlobalErrorEstimator_UnitTest
+ SOURCES Rythmos_GlobalErrorEstimator_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -206,7 +206,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Thyra_UnitTest
+ SOURCES Rythmos_Thyra_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -214,7 +214,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ AdjointModelEvaluator_UnitTest
+ SOURCES Rythmos_AdjointModelEvaluator_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -222,7 +222,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ ForwardEulerStepper_UnitTest
+ SOURCES Rythmos_ForwardEuler_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -230,7 +230,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ BackwardEulerStepper_UnitTest
+ SOURCES Rythmos_BackwardEuler_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -238,7 +238,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ ForwardSensitivityExplicitModelEvaluator_UnitTest
+ SOURCES Rythmos_ForwardSensitivityExplicitModelEvaluator_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -246,7 +246,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ ForwardSensitivityImplicitModelEvaluator_UnitTest
+ SOURCES Rythmos_ForwardSensitivityImplicitModelEvaluator_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -254,7 +254,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ StateSerializerStrategy_UnitTest
+ SOURCES Rythmos_StateSerializerStrategy_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -262,7 +262,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ ForwardSensitivityStepperTester_UnitTest
+ SOURCES Rythmos_ForwardSensitivityStepperTester_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -270,7 +270,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ BasicDiscreteAdjointStepperTester_UnitTest
+ SOURCES Rythmos_BasicDiscreteAdjointStepperTester_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -278,7 +278,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ TestModelBuilder_UnitTest
+ SOURCES Rythmos_TestModelBuilder_UnitTest.cpp Rythmos_UnitTest.cpp Rythmos_UnitTestModels.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/sacado/example/FEApp/CMakeLists.txt trilinos-10.0.4-Source/packages/sacado/example/FEApp/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/sacado/example/FEApp/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/sacado/example/FEApp/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -100,7 +100,7 @@
+ IF(Sacado_ENABLE_FEApp)
+
+ PACKAGE_ADD_LIBRARY(
+- FEApp
++ trilinos_FEApp
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/sacado/src/CMakeLists.txt trilinos-10.0.4-Source/packages/sacado/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/sacado/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/sacado/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -239,7 +239,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- sacado
++ trilinos_sacado
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/sacado/test/utils/CMakeLists.txt trilinos-10.0.4-Source/packages/sacado/test/utils/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/sacado/test/utils/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/sacado/test/utils/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -35,9 +35,9 @@
+ #
+
+ #PACKAGE_ADD_LIBRARY(
+-# sacadoutils
++# trilinos_sacadoutils
+ # HEADERS ${HEADERS}
+ # SOURCES ${SOURCES}
+-# DEPLIBS sacado
++# DEPLIBS trilinos_sacado
+ # TESTONLY
+ # )
+diff -Nru trilinos-10.0.4-Source.orig/packages/shards/src/CMakeLists.txt trilinos-10.0.4-Source/packages/shards/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/shards/src/CMakeLists.txt 2010-01-05 14:56:06.000000000 +0100
++++ trilinos-10.0.4-Source/packages/shards/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -49,7 +49,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- shards
++ trilinos_shards
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/stokhos/src/CMakeLists.txt trilinos-10.0.4-Source/packages/stokhos/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/stokhos/src/CMakeLists.txt 2010-01-05 14:56:06.000000000 +0100
++++ trilinos-10.0.4-Source/packages/stokhos/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -103,7 +103,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- stokhos
++ trilinos_stokhos
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/stratimikos/adapters/amesos/src/CMakeLists.txt trilinos-10.0.4-Source/packages/stratimikos/adapters/amesos/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/stratimikos/adapters/amesos/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/stratimikos/adapters/amesos/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -16,7 +16,7 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- stratimikosamesos
++ trilinos_stratimikosamesos
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt trilinos-10.0.4-Source/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -16,7 +16,7 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- stratimikosaztecoo
++ trilinos_stratimikosaztecoo
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/stratimikos/adapters/belos/src/CMakeLists.txt trilinos-10.0.4-Source/packages/stratimikos/adapters/belos/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/stratimikos/adapters/belos/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/stratimikos/adapters/belos/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -16,7 +16,7 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- stratimikosbelos
++ trilinos_stratimikosbelos
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt trilinos-10.0.4-Source/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -12,7 +12,7 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- stratimikosifpack
++ trilinos_stratimikosifpack
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/stratimikos/adapters/ml/src/CMakeLists.txt trilinos-10.0.4-Source/packages/stratimikos/adapters/ml/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/stratimikos/adapters/ml/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/stratimikos/adapters/ml/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -12,7 +12,7 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- stratimikosml
++ trilinos_stratimikosml
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/stratimikos/src/CMakeLists.txt trilinos-10.0.4-Source/packages/stratimikos/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/stratimikos/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/stratimikos/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+@@ -45,33 +45,33 @@
+
+ ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos)
+ IF (${PACKAGE_NAME}_ENABLE_Amesos)
+- APPEND_SET(DEPLIBS stratimikosamesos)
++ APPEND_SET(DEPLIBS trilinos_stratimikosamesos)
+ ENDIF()
+
+ ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_AztecOO)
+ IF (${PACKAGE_NAME}_ENABLE_AztecOO)
+- APPEND_SET(DEPLIBS stratimikosaztecoo)
++ APPEND_SET(DEPLIBS trilinos_stratimikosaztecoo)
+ ENDIF()
+
+ ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Belos)
+ IF (${PACKAGE_NAME}_ENABLE_Belos)
+- APPEND_SET(DEPLIBS stratimikosbelos)
++ APPEND_SET(DEPLIBS trilinos_stratimikosbelos)
+ ENDIF()
+
+ ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Ifpack)
+ IF (${PACKAGE_NAME}_ENABLE_Ifpack)
+- APPEND_SET(DEPLIBS stratimikosifpack)
++ APPEND_SET(DEPLIBS trilinos_stratimikosifpack)
+ ENDIF()
+
+ ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_ML)
+ IF (${PACKAGE_NAME}_ENABLE_ML)
+- APPEND_SET(DEPLIBS stratimikosml)
++ APPEND_SET(DEPLIBS trilinos_stratimikosml)
+ ENDIF()
+
+ # ToDo: Add other solvers and preconditioners
+
+ PACKAGE_ADD_LIBRARY(
+- stratimikos
++ trilinos_stratimikos
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ DEPLIBS ${DEPLIBS}
+diff -Nru trilinos-10.0.4-Source.orig/packages/Sundance/src-core/CMakeLists.txt trilinos-10.0.4-Source/packages/Sundance/src-core/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/Sundance/src-core/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/Sundance/src-core/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+@@ -349,7 +349,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- sundanceCore
++ trilinos_sundanceCore
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/Sundance/src-interop/CMakeLists.txt trilinos-10.0.4-Source/packages/Sundance/src-interop/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/Sundance/src-interop/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/Sundance/src-interop/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+@@ -50,7 +50,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- sundanceInterop
++ trilinos_sundanceInterop
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/Sundance/src-solvers/CMakeLists.txt trilinos-10.0.4-Source/packages/Sundance/src-solvers/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/Sundance/src-solvers/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/Sundance/src-solvers/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+@@ -324,7 +324,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- TSFExtended
++ trilinos_TSFExtended
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/Sundance/src-std-framework/CMakeLists.txt trilinos-10.0.4-Source/packages/Sundance/src-std-framework/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/Sundance/src-std-framework/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/Sundance/src-std-framework/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+@@ -262,7 +262,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- sundanceStdFwk
++ trilinos_sundanceStdFwk
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/Sundance/src-std-mesh/CMakeLists.txt trilinos-10.0.4-Source/packages/Sundance/src-std-mesh/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/Sundance/src-std-mesh/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/Sundance/src-std-mesh/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+@@ -233,7 +233,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- sundanceStdMesh
++ trilinos_sundanceStdMesh
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/Sundance/src-utils/CMakeLists.txt trilinos-10.0.4-Source/packages/Sundance/src-utils/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/Sundance/src-utils/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/Sundance/src-utils/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+@@ -94,7 +94,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- sundanceUtils
++ trilinos_sundanceUtils
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/teuchos/src/CMakeLists.txt trilinos-10.0.4-Source/packages/teuchos/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/teuchos/src/CMakeLists.txt 2010-01-05 14:56:09.000000000 +0100
++++ trilinos-10.0.4-Source/packages/teuchos/src/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+@@ -289,7 +289,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- teuchos
++ trilinos_teuchos
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/ThreadPool/src/CMakeLists.txt trilinos-10.0.4-Source/packages/ThreadPool/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/ThreadPool/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/ThreadPool/src/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+@@ -64,7 +64,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- tpi
++ trilinos_tpi
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/thyra/adapters/epetra/src/CMakeLists.txt trilinos-10.0.4-Source/packages/thyra/adapters/epetra/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/thyra/adapters/epetra/src/CMakeLists.txt 2010-01-05 14:56:09.000000000 +0100
++++ trilinos-10.0.4-Source/packages/thyra/adapters/epetra/src/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+@@ -25,8 +25,8 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- thyraepetra
++ trilinos_thyraepetra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS thyra
++ DEPLIBS trilinos_thyra
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/thyra/adapters/epetraext/src/CMakeLists.txt trilinos-10.0.4-Source/packages/thyra/adapters/epetraext/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/thyra/adapters/epetraext/src/CMakeLists.txt 2010-01-05 14:56:09.000000000 +0100
++++ trilinos-10.0.4-Source/packages/thyra/adapters/epetraext/src/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+@@ -13,8 +13,8 @@
+ APPEND_GLOB(SOURCES ${DIR}/*.cpp)
+
+ PACKAGE_ADD_LIBRARY(
+- thyraepetraext
++ trilinos_thyraepetraext
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS thyraepetra
++ DEPLIBS trilinos_thyraepetra
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/thyra/src/CMakeLists.txt trilinos-10.0.4-Source/packages/thyra/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/thyra/src/CMakeLists.txt 2010-01-05 14:56:09.000000000 +0100
++++ trilinos-10.0.4-Source/packages/thyra/src/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+@@ -71,7 +71,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- thyra
++ trilinos_thyra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/thyra/test/nonlinear/models/CMakeLists.txt trilinos-10.0.4-Source/packages/thyra/test/nonlinear/models/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/thyra/test/nonlinear/models/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/thyra/test/nonlinear/models/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+@@ -10,11 +10,11 @@
+ APPEND_GLOB(SOURCES *.cpp)
+
+ PACKAGE_ADD_LIBRARY(
+- thyra_nonlinear_test_models
++ trilinos_thyra_nonlinear_test_models
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ TESTONLY
+- DEPLIBS thyra
++ DEPLIBS trilinos_thyra
+ )
+
+ ADD_SUBDIRECTORY(UnitTests)
+diff -Nru trilinos-10.0.4-Source.orig/packages/thyra/test/nonlinear/models/UnitTests/CMakeLists.txt trilinos-10.0.4-Source/packages/thyra/test/nonlinear/models/UnitTests/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/thyra/test/nonlinear/models/UnitTests/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/thyra/test/nonlinear/models/UnitTests/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+@@ -6,7 +6,7 @@
+ SOURCES
+ Simple2DModelEvaluator_UnitTests.cpp
+ ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
+- DEPLIBS thyra_nonlinear_test_models
++ DEPLIBS trilinos_thyra_nonlinear_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/tpetra/src/CMakeLists.txt trilinos-10.0.4-Source/packages/tpetra/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/tpetra/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/tpetra/src/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+@@ -80,7 +80,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- tpetra
++ trilinos_tpetra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/tpetra/test/MultiVector/CMakeLists.txt trilinos-10.0.4-Source/packages/tpetra/test/MultiVector/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/tpetra/test/MultiVector/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/tpetra/test/MultiVector/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+@@ -9,5 +9,5 @@
+ ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
+ COMM serial mpi
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/trilinoscouplings/examples/scaling/CMakeLists.txt trilinos-10.0.4-Source/packages/trilinoscouplings/examples/scaling/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/trilinoscouplings/examples/scaling/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/trilinoscouplings/examples/scaling/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+@@ -8,21 +8,21 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_Poisson
+ SOURCES example_Poisson.cpp
+- DEPLIBS epetra epetraext pamgen aztecoo amesos ml
++ DEPLIBS trilinos_epetra trilinos_epetraext trilinos_pamgen trilinos_aztecoo trilinos_amesos trilinos_ml
+ NUM_MPI_PROCS 1
+ ADD_DIR_TO_NAME
+ )
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_DivLSFEM
+ SOURCES example_DivLSFEM.cpp
+- DEPLIBS epetra epetraext pamgen aztecoo amesos ml
++ DEPLIBS trilinos_epetra trilinos_epetraext trilinos_pamgen trilinos_aztecoo trilinos_amesos trilinos_ml
+ NUM_MPI_PROCS 1
+ ADD_DIR_TO_NAME
+ )
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_CurlLSFEM
+ SOURCES example_CurlLSFEM.cpp
+- DEPLIBS epetra epetraext pamgen aztecoo amesos ml
++ DEPLIBS trilinos_epetra trilinos_epetraext trilinos_pamgen trilinos_aztecoo trilinos_amesos trilinos_ml
+ NUM_MPI_PROCS 1
+ ADD_DIR_TO_NAME
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/trilinoscouplings/src/CMakeLists.txt trilinos-10.0.4-Source/packages/trilinoscouplings/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/trilinoscouplings/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/trilinoscouplings/src/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+@@ -153,7 +153,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- trilinoscouplings
++ trilinos_trilinoscouplings
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/triutils/src/CMakeLists.txt trilinos-10.0.4-Source/packages/triutils/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/triutils/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
++++ trilinos-10.0.4-Source/packages/triutils/src/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+@@ -78,7 +78,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- triutils
++ trilinos_triutils
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt trilinos-10.0.4-Source/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+@@ -466,7 +466,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- simpi
++ trilinos_simpi
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.0.4-Source.orig/packages/zoltan/src/CMakeLists.txt trilinos-10.0.4-Source/packages/zoltan/src/CMakeLists.txt
+--- trilinos-10.0.4-Source.orig/packages/zoltan/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
++++ trilinos-10.0.4-Source/packages/zoltan/src/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+@@ -744,7 +744,7 @@
+ ENDIF()
+
+ PACKAGE_ADD_LIBRARY(
+- zoltan
++ trilinos_zoltan
+ HEADERS ${HEADERS}
+ NOINSTALLHEADERS ${NOINSTALLHEADERS}
+ SOURCES ${SOURCES}
Added: packages/trilinos/trunk/debian/patches/makefile.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/makefile.patch?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/patches/makefile.patch (added)
+++ packages/trilinos/trunk/debian/patches/makefile.patch Fri Aug 13 11:38:46 2010
@@ -1,0 +1,13 @@
+Index: trilinos/packages/PyTrilinos/shared/Makefile.am
+===================================================================
+--- trilinos.orig/packages/PyTrilinos/shared/Makefile.am 2007-12-18 21:28:53.000000000 +0100
++++ trilinos/packages/PyTrilinos/shared/Makefile.am 2007-12-19 08:27:42.000000000 +0100
+@@ -250,7 +250,7 @@
+ $(PYTHON) $(srcdir)/setup.py build
+
+ install:
+- $(PYTHON) $(srcdir)/setup.py install
++# $(PYTHON) $(srcdir)/setup.py install
+
+ uninstall:
+ $(PYTHON) $(srcdir)/setup.py uninstall
Added: packages/trilinos/trunk/debian/patches/moocho.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/moocho.patch?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/patches/moocho.patch (added)
+++ packages/trilinos/trunk/debian/patches/moocho.patch Fri Aug 13 11:38:46 2010
@@ -1,0 +1,31 @@
+Index: trilinos-8.0.8/packages/moocho/src/Makefile.am
+===================================================================
+--- trilinos-8.0.8.orig/packages/moocho/src/Makefile.am 2008-08-11 09:59:37.526493057 +0200
++++ trilinos-8.0.8/packages/moocho/src/Makefile.am 2008-08-11 09:59:52.537986530 +0200
+@@ -40,16 +40,16 @@
+ # ------------------------------------------------------------------------
+
+ install-data-local:
+- $(mkinstalldirs) $(exec_prefix)/tools/moocho ; \
+- $(mkinstalldirs) $(exec_prefix)/tools/moocho/Shared ; \
+- $(mkinstalldirs) $(exec_prefix)/tools/moocho/MamaJama ; \
+- $(mkinstalldirs) $(exec_prefix)/tools/moocho/IpConfig ; \
+- cp $(srcdir)/MoochoPack/configurations/generate-opt-file.pl $(exec_prefix)/tools/moocho/. ; \
+- chmod a+x $(exec_prefix)/tools/moocho/generate-opt-file.pl ; \
+- cp $(srcdir)/MoochoPack/configurations/Moocho.opt.MoochoSolver $(exec_prefix)/tools/moocho/. ; \
+- cp $(srcdir)/MoochoPack/configurations/Shared/Moocho.opt.DecompositionSystemStateStepBuilderStd $(exec_prefix)/tools/moocho/Shared/. ; \
+- cp $(srcdir)/MoochoPack/configurations/MamaJama/Moocho.opt.NLPAlgoConfigMamaJama $(exec_prefix)/tools/moocho/MamaJama/. ; \
+- cp $(srcdir)/MoochoPack/configurations/IpConfig/Moocho.opt.NLPAlgoConfigIP $(exec_prefix)/tools/moocho/IpConfig/.
++ $(mkinstalldirs) $(DESTDIR)$(exec_prefix)/share/moocho ; \
++ $(mkinstalldirs) $(DESTDIR)$(exec_prefix)/share/moocho/Shared ; \
++ $(mkinstalldirs) $(DESTDIR)$(exec_prefix)/share/moocho/MamaJama ; \
++ $(mkinstalldirs) $(DESTDIR)$(exec_prefix)/share/moocho/IpConfig ; \
++ cp $(srcdir)/MoochoPack/configurations/generate-opt-file.pl $(DESTDIR)$(exec_prefix)/share/moocho/. ; \
++ chmod a+x $(DESTDIR)$(exec_prefix)/share/moocho/generate-opt-file.pl ; \
++ cp $(srcdir)/MoochoPack/configurations/Moocho.opt.MoochoSolver $(DESTDIR)$(exec_prefix)/share/moocho/. ; \
++ cp $(srcdir)/MoochoPack/configurations/Shared/Moocho.opt.DecompositionSystemStateStepBuilderStd $(DESTDIR)$(exec_prefix)/share/moocho/Shared/. ; \
++ cp $(srcdir)/MoochoPack/configurations/MamaJama/Moocho.opt.NLPAlgoConfigMamaJama $(DESTDIR)$(exec_prefix)/share/moocho/MamaJama/. ; \
++ cp $(srcdir)/MoochoPack/configurations/IpConfig/Moocho.opt.NLPAlgoConfigIP $(DESTDIR)$(exec_prefix)/share/moocho/IpConfig/.
+
+ # Above, I need to just copy the generate-opt-file.pl file stright over to
+ # keep its execute permissions!
Added: packages/trilinos/trunk/debian/patches/python_2.6.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/python_2.6.patch?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/patches/python_2.6.patch (added)
+++ packages/trilinos/trunk/debian/patches/python_2.6.patch Fri Aug 13 11:38:46 2010
@@ -1,0 +1,84 @@
+Index: trilinos-9.0.2.dfsg/packages/PyTrilinos/shared/Makefile.in
+===================================================================
+--- trilinos-9.0.2.dfsg.orig/packages/PyTrilinos/shared/Makefile.in 2009-06-15 22:27:13.000000000 +0200
++++ trilinos-9.0.2.dfsg/packages/PyTrilinos/shared/Makefile.in 2009-06-15 22:42:28.000000000 +0200
+@@ -510,7 +510,7 @@
+ $(PYTHON) $(srcdir)/setup.py build
+
+ install:
+- $(PYTHON) $(srcdir)/setup.py install --destdir=$(DESTDIR)
++ $(PYTHON) $(srcdir)/setup.py install --install-layout=deb --destdir=$(DESTDIR)
+
+ uninstall:
+ $(PYTHON) $(srcdir)/setup.py uninstall
+Index: trilinos-9.0.2.dfsg/packages/PyTrilinos/shared/Makefile.am
+===================================================================
+--- trilinos-9.0.2.dfsg.orig/packages/PyTrilinos/shared/Makefile.am 2009-06-15 22:27:13.000000000 +0200
++++ trilinos-9.0.2.dfsg/packages/PyTrilinos/shared/Makefile.am 2009-06-15 22:42:28.000000000 +0200
+@@ -250,7 +250,7 @@
+ $(PYTHON) $(srcdir)/setup.py build
+
+ install:
+- $(PYTHON) $(srcdir)/setup.py install --destdir=$(DESTDIR)
++ $(PYTHON) $(srcdir)/setup.py install --install-layout=deb --destdir=$(DESTDIR)
+
+ uninstall:
+ $(PYTHON) $(srcdir)/setup.py uninstall
+Index: trilinos-9.0.2.dfsg/packages/PyTrilinos/src/Makefile.am
+===================================================================
+--- trilinos-9.0.2.dfsg.orig/packages/PyTrilinos/src/Makefile.am 2009-06-15 22:27:13.000000000 +0200
++++ trilinos-9.0.2.dfsg/packages/PyTrilinos/src/Makefile.am 2009-06-15 22:42:28.000000000 +0200
+@@ -325,9 +325,9 @@
+
+ install: package
+ if test -z '$(DESTDIR)'; then \
+- $(PYTHON) $(srcdir)/setup.py install --prefix $(PYTHON_PREFIX); \
++ $(PYTHON) $(srcdir)/setup.py install --install-layout=deb --prefix $(PYTHON_PREFIX); \
+ else \
+- $(PYTHON) $(srcdir)/setup.py install --root $(DESTDIR); \
++ $(PYTHON) $(srcdir)/setup.py install --install-layout=deb --root $(DESTDIR); \
+ fi
+
+ uninstall:
+Index: trilinos-9.0.2.dfsg/packages/PyTrilinos/src/Makefile.in
+===================================================================
+--- trilinos-9.0.2.dfsg.orig/packages/PyTrilinos/src/Makefile.in 2009-06-15 22:27:13.000000000 +0200
++++ trilinos-9.0.2.dfsg/packages/PyTrilinos/src/Makefile.in 2009-06-15 22:42:28.000000000 +0200
+@@ -708,9 +708,9 @@
+
+ install: package
+ if test -z '$(DESTDIR)'; then \
+- $(PYTHON) $(srcdir)/setup.py install --prefix $(PYTHON_PREFIX); \
++ $(PYTHON) $(srcdir)/setup.py install --install-layout=deb --prefix $(PYTHON_PREFIX); \
+ else \
+- $(PYTHON) $(srcdir)/setup.py install --root $(DESTDIR); \
++ $(PYTHON) $(srcdir)/setup.py install --install-layout=deb --root $(DESTDIR); \
+ fi
+
+ uninstall:
+Index: trilinos-9.0.2.dfsg/packages/Sundance/python/src/Makefile.am
+===================================================================
+--- trilinos-9.0.2.dfsg.orig/packages/Sundance/python/src/Makefile.am 2009-06-15 22:42:42.000000000 +0200
++++ trilinos-9.0.2.dfsg/packages/Sundance/python/src/Makefile.am 2009-06-15 22:43:14.000000000 +0200
+@@ -75,7 +75,7 @@
+ $(PYTHON) $(srcdir)/setup.py build
+
+ install: build
+- $(PYTHON) $(srcdir)/setup.py install --prefix=$(PYTHON_PREFIX)
++ $(PYTHON) $(srcdir)/setup.py install --install-layout=deb --prefix=$(PYTHON_PREFIX)
+
+ clean-local:
+ $(PYTHON) $(srcdir)/setup.py clean
+Index: trilinos-9.0.2.dfsg/packages/Sundance/python/src/Makefile.in
+===================================================================
+--- trilinos-9.0.2.dfsg.orig/packages/Sundance/python/src/Makefile.in 2009-06-15 22:42:38.000000000 +0200
++++ trilinos-9.0.2.dfsg/packages/Sundance/python/src/Makefile.in 2009-06-15 22:42:57.000000000 +0200
+@@ -479,7 +479,7 @@
+ $(PYTHON) $(srcdir)/setup.py build
+
+ install: build
+- $(PYTHON) $(srcdir)/setup.py install --prefix=$(PYTHON_PREFIX)
++ $(PYTHON) $(srcdir)/setup.py install --install-layout=deb --prefix=$(PYTHON_PREFIX)
+
+ clean-local:
+ $(PYTHON) $(srcdir)/setup.py clean
Added: packages/trilinos/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/series?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/patches/series (added)
+++ packages/trilinos/trunk/debian/patches/series Fri Aug 13 11:38:46 2010
@@ -1,0 +1,4 @@
+soname.patch
+trilinosversion.patch
+libname.patch
+
Added: packages/trilinos/trunk/debian/patches/sharedlibs.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/sharedlibs.patch?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/patches/sharedlibs.patch (added)
+++ packages/trilinos/trunk/debian/patches/sharedlibs.patch Fri Aug 13 11:38:46 2010
@@ -1,0 +1,16 @@
+Index: trilinos-8.0.8/packages/PyTrilinos/shared/setup.py
+===================================================================
+--- trilinos-8.0.8.orig/packages/PyTrilinos/shared/setup.py 2008-08-05 06:40:32.000000000 +0200
++++ trilinos-8.0.8/packages/PyTrilinos/shared/setup.py 2008-08-05 06:54:30.000000000 +0200
+@@ -96,7 +96,10 @@
+ # Determine the installation information
+ mkdir = makeMacros["mkdir_p"]
+ libDir = makeMacros["libdir"]
+- installDir = os.path.join(destdir, libDir)
++ installDir = destdir+libDir #os.path.join(destdir, libDir)
++ print "\ndestdir: ", destdir, destdir+libDir
++ print "\nlibDir: ", libDir
++ print "\ninstallDir: ", installDir
+
+ ######################################################
+ # Build/clean/install/uninstall the shared libraries #
Added: packages/trilinos/trunk/debian/patches/soname.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/soname.patch?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/patches/soname.patch (added)
+++ packages/trilinos/trunk/debian/patches/soname.patch Fri Aug 13 11:38:46 2010
@@ -1,0 +1,16 @@
+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
++ ${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})
+
Added: packages/trilinos/trunk/debian/patches/trilinosversion.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/trilinosversion.patch?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/patches/trilinosversion.patch (added)
+++ packages/trilinos/trunk/debian/patches/trilinosversion.patch Fri Aug 13 11:38:46 2010
@@ -1,0 +1,22 @@
+Index: trilinos-10.2.0.dfsg/cmake/TrilinosVersion.cmake
+===================================================================
+--- trilinos-10.2.0.dfsg.orig/cmake/TrilinosVersion.cmake 2010-05-02 11:52:26.000000000 +0200
++++ trilinos-10.2.0.dfsg/cmake/TrilinosVersion.cmake 2010-05-02 11:54:17.000000000 +0200
+@@ -11,3 +11,17 @@
+ SET(TRILINOS_MAJOR_VERSION TRUE)
+ SET(TRILINOS_MAJOR_MINOR_VERSION TRUE)
+ SET(TRILINOS_VERSION_STRING TRUE)
++
++SET(Trilinos_VERSION_MAJOR 10)
++SET(Trilinos_VERSION_MINOR 2)
++SET(Trilinos_VERSION_PATCH 0)
++
++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)
++
Added: packages/trilinos/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/rules?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/rules (added)
+++ packages/trilinos/trunk/debian/rules Fri Aug 13 11:38:46 2010
@@ -1,0 +1,78 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses cdbs. Originaly written by Robert Millan.
+# This file is public domain.
+
+DEB_AUTO_CLEANUP_RCS := yes
+DEB_BUILDDIR := $(DEB_SRCDIR)/
+DEB_MAKE_CLEAN_TARGET := clean
+DEB_MAKE_BUILD_TARGET := default
+DEB_COMPRESS_EXCLUDE := .pdf
+PYVER = $(shell pyversions -dv)
+TRILINOS_HOME = $(CURDIR)/$(DEB_SRCDIR)
+
+include /usr/share/cdbs/1/class/cmake.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+export CC=/usr/bin/mpicc
+export CXX=/usr/bin/mpic++
+export CFLAGS=-g -fPIC -O2
+export CXXFLAGS=-g -fPIC -O2
+export FFLAGS=-g -fPIC -O2
+
+version=1.0
+version_major=1
+
+DEB_CMAKE_EXTRA_FLAGS= \
+ -D Trilinos_ENABLE_ALL_PACKAGES:BOOL=ON \
+ -D Trilinos_ENABLE_PyTrilinos:BOOL=ON \
+ -D Trilinos_ENABLE_TESTS:BOOL=OFF \
+ -D Trilinos_ENABLE_EXAMPLES:BOOL=OFF \
+ -D CMAKE_BUILD_TYPE:STRING=DEBUG \
+ -D BUILD_SHARED_LIBS:BOOL=ON \
+ -D Trilinos_INSTALL_INCLUDE_DIR:PATH=include/trilinos \
+ -D TPL_ENABLE_MPI:BOOL=ON \
+ -DNOX_ENABLE_LAPACK:BOOL=ON \
+ $(TRILINOS_HOME)
+
+clean::
+ -find $(CURDIR) -name "*.pyc" | xargs rm -f
+ -find $(CURDIR) -name "Makefile.orig" | xargs rm -f
+
+install/python-pytrilinos::
+ if [ $(PYVER) = "2.6" ]; then \
+ dh_install -ppython-pytrilinos -X.pyc \
+ debian/tmp/usr/lib/python$(PYVER)/site-packages/PyTrilinos \
+ usr/lib/python$(PYVER)/dist-packages; \
+ else \
+ dh_install -ppython-pytrilinos -X.pyc \
+ debian/tmp/usr/lib/python$(PYVER)/site-packages/PyTrilinos \
+ usr/lib/python$(PYVER)/site-packages; \
+ fi
+ dh_pycentral -ppython-pytrilinos
+
+install/libtrilinos-doc::
+ -chmod -x packages/didasko/doc/DoxyfileWeb
+
+DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.dfsg.*$$//p')
+
+.PHONY: get-orig-source
+get-orig-source:
+# uscan --force-download --symlink --check-dirname-level 0 --destdir "$$TMPDIR" ;
+ set -ex ;
+ -test -d $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig && rm -rf $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig;
+ TMPDIR="$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig"; \
+ mkdir $$TMPDIR; \
+ cp ../tarballs/$(DEB_SOURCE_PACKAGE)_$(DEB_STRIPPED_UPSTREAM_VERSION).orig.tar.gz "$$TMPDIR"; \
+ tar -C "$$TMPDIR" --strip-components 1 -xzf "$$TMPDIR"/$(DEB_SOURCE_PACKAGE)_$(DEB_STRIPPED_UPSTREAM_VERSION).orig.tar.gz ; \
+ rm -f "$$TMPDIR"/$(DEB_SOURCE_PACKAGE)*.tar.gz ; \
+ rm -f "$$TMPDIR"/packages/didasko/src/Trilinos90Tutorial.pdf; \
+ rm -f "$$TMPDIR"/packages/amesos/doc/AmesosReferenceGuide/AmesosReferenceGuide.pdf; \
+ rm -f "$$TMPDIR"/packages/ml/doc/mlguide.pdf; \
+ rm -f "$$TMPDIR"/packages/ml/doc/mlguide.pdf; \
+ GZIP=-9 tar -czf \
+ $(CURDIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
+ $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig ; \
+ rm -rf "$$TMPDIR"
+
+
Propchange: packages/trilinos/trunk/debian/rules
------------------------------------------------------------------------------
svn:executable = *
Added: packages/trilinos/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/watch?rev=36805&op=file
==============================================================================
--- packages/trilinos/trunk/debian/watch (added)
+++ packages/trilinos/trunk/debian/watch Fri Aug 13 11:38:46 2010
@@ -1,0 +1,6 @@
+# this requires that upstream stays with x.0.y
+# but it will catch 10.0.y and higher too
+
+version=3
+opts=dversionmangle=s/\.dfsg$//,downloadurlmangle=s/login.html\?tid=tr(\d+)(0)(0|(?!0)\d+)$/files\/trilinos-$1.$2.$3-Source.tar.gz/,filenamemangle=s/login.html\?tid=tr(\d+)(0)(0|(?!0)\d+)$/trilinos-$1.$2.$3-Source.tar.gz/ \
+ http://trilinos.sandia.gov/download/ login.html\?tid=tr(\d+)(0)(0|(?!0)\d+)$
More information about the debian-science-commits
mailing list