[sundials] 03/04: Merge remote-tracking branch 'origin/master'
Dima Kogan
dima at secretsauce.net
Sun Sep 17 04:38:10 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkogan pushed a commit to branch master
in repository sundials.
commit b4acc20a249870827e85c1506620e23d2ae78a8d
Merge: adf77d6 b365a36
Author: Dima Kogan <dima at secretsauce.net>
Date: Sat Sep 16 21:14:22 2017 -0700
Merge remote-tracking branch 'origin/master'
.gitignore | 44 +++++++++++++++
debian/changelog | 44 +++++++++++++--
debian/control | 3 +-
debian/copyright | 25 ++++++++
...bsundials-nvecparallel-hypre2.lintian-overrides | 1 +
...libsundials-nvecparallel-mpi2.lintian-overrides | 1 +
...sundials-nvecparallel-openmp2.lintian-overrides | 1 +
...bsundials-nvecparallel-petsc2.lintian-overrides | 1 +
...undials-nvecparallel-pthread2.lintian-overrides | 1 +
debian/rules | 66 +++++++++-------------
debian/sundials-config.1 | 57 -------------------
11 files changed, 142 insertions(+), 102 deletions(-)
diff --cc debian/copyright
index 9dd795f,cac700d..2568ffc
--- a/debian/copyright
+++ b/debian/copyright
@@@ -3,124 -3,35 +3,149 @@@ Upstream-Name: SUNDIAL
Source: http://computation.llnl.gov/projects/sundials/sundials-software
Files-Excluded: *.pdf
-Files: *
+Files: src/cvode/*
+ src/cvodes/*
+ include/cvode/*
+ include/cvodes/*
+ examples/cvode/*
+ examples/cvodes/*
+Copyright: 2002-2015 Lawrence Livermore National Security
+License: BSD-3-clause-LLNS-additional-notice
+
+Files: examples/cvode/fcmix_serial/fcvRoberts_klu.f
+ examples/cvode/fcmix_serial/fcvRoberts_sps.f
+Copyright: 2016 Southern Methodist University
+License: BSD-3-clause-LLNS-additional-notice
+
+Files: examples/cvode/C_openmp/CMakeLists.txt
+ examples/cvodes/C_openmp/CMakeLists.txt
+Copyright: 2013,2015 Southern Methodist University
+ 2015 Livermore National Security
+License: BSD-3-clause-LLNS-additional-notice
+
+
+Files: src/ida/*
+ src/idas/*
+ src/kinsol/*
+ include/ida/*
+ include/idas/*
+ include/kinsol/*
+ examples/ida/*
+ examples/idas/*
+ examples/kinsol/*
+Copyright: 2002-2015 Lawrence Livermore National Security
+License: BSD-3-clause-UC-additional-notice
+
+Files: examples/idas/C_openmp/CMakeLists.txt
+Copyright: 2013,2015 Southern Methodist University
+ 2015 Livermore National Security
+License: BSD-3-clause-UC-additional-notice
+
+Files: src/kinsol/kinsol_bbdpre.c
+Copyright: 2002 The Regents of the University of California
+License: BSD-3-clause-UC-additional-notice
+
+Files: examples/kinsol/C_openmp/CMakeLists.txt
+Copyright: 2013,2015 Southern Methodist University
+ 2015 Livermore National Security
+License: BSD-3-clause-UC-additional-notice
+
+
+Files: src/arkode/*
+ include/arkode/*
+ examples/arkode/*
+ src/arkode/CMakeLists.txt
+Copyright: 2013,2015 Southern Methodist University
+ 2015 Livermore National Security
+License: BSD-3-clause-SMU
+
+Files: examples/arkode/F90_serial/ark_bruss1D_FEM_klu.f90
+Copyright: 2016 Southern Methodist University
+License: BSD-3-clause-SMU
+
+Files: src/arkode/fcmix/CMakeLists.txt
+Copyright: 2013 Southern Methodist University
+License: BSD-3-clause-SMU
+
+
+Files: src/nvec_openmp/*
+ src/nvec_par/*
+ src/nvec_parhyp/*
+ src/nvec_petsc/*
+ src/nvec_pthreads/*
+ src/nvec_ser/*
+ src/sundials/*
+ include/nvector/*
+ include/sundials/*
+ examples/nvector/*
+ CMakeLists.txt
+ src/nvec_openmp/CMakeLists.txt
+ src/nvec_par/CMakeLists.txt
+ src/nvec_parhyp/CMakeLists.txt
+ src/nvec_petsc/CMakeLists.txt
+ src/nvec_pthreads/CMakeLists.txt
+ src/nvec_ser/CMakeLists.txt
+ src/sundials/CMakeLists.txt
+ config/FindHypre.cmake
+ config/FindKLU.cmake
+ config/FindPETSc.cmake
+ config/SundialsAddTest.cmake
+ config/SundialsHypre.cmake
+ config/SundialsPETSc.cmake
Copyright: 2002-2016 Lawrence Livermore National Security
-License: BSD-3-clause
+License: BSD-3-clause-LLNS-additional-notice
+Files: cmakelists_*
+ */cmakelists_*
+ makefile_*
+ */makefile_*
+ config/FindSUPERLUMT.cmake
+ config/SundialsFortran.cmake
+ config/SundialsKLU.cmake
+ config/SundialsLapack.cmake
+ config/SundialsMPIC.cmake
+ config/SundialsMPIF.cmake
+ config/SundialsSuperLUMT.cmake
+ include/sundials/sundials_config.in
+ include/sundials/sundials_types.h
+Copyright: 2002-2014 The Regents of the University of California
+License: BSD-3-clause-LLNS-additional-notice
+
+Files: src/sundials/sundials_spfgmr.c
+ src/sundials/sundials_pcg.c
+ include/sundials/sundials_spfgmr.h
+ include/sundials/sundials_pcg.h
+ config/SundialsCXX.cmake
+ config/SundialsFortran90.cmake
+ config/SundialsMPICXX.cmake
+ config/SundialsMPIF90.cmake
+Copyright: 2011,2013 Southern Methodist University
+License: BSD-3-clause-LLNS-additional-notice
+ Files: config/SundialsSuperLUMT.cmake config/FindSUPERLUMT.cmake
+ config/SundialsMPIC.cmake config/SundialsLapack.cmake config/SundialsKLU.cmake
+ config/SundialsMPIF.cmake config/SundialsFortran.cmake
+ src/kinsol/kinsol_bbdpre.c include/sundials/sundials_config.in
+ include/sundials/sundials_types.h examples/templates/*
+ Copyright: 2002-2014 The Regents of the University of California
+ License: BSD-3-clause
+
+ Files: src/arkode/* include/arkode/* examples/arkode/*
+ examples/cvodes/C_openmp/CMakeLists.txt
+ examples/idas/C_openmp/CMakeLists.txt
+ examples/kinsol/C_openmp/CMakeLists.txt
+ Copyright: 2015-2016 Southern Methodist University and Lawrence Livermore
+ National Security
+ License: BSD-3-clause
+
+ Files: config/SundialsFortran90.cmake config/SundialsMPICXX.cmake
+ config/SundialsMPIF90.cmake config/SundialsCXX.cmake
+ src/arkode/fcmix/CMakeLists.txt src/sundials/sundials_spfgmr.c
+ src/sundials/sundials_pcg.c include/sundials/sundials_pcg.h
+ include/sundials/sundials_spfgmr.h examples/cvode/fcmix_serial/fcvRoberts_sps.f
+ examples/cvode/fcmix_serial/fcvRoberts_klu.f
+ Copyright: 2011-2016 Southern Methodist University
+ License: BSD-3-clause
+
Files: debian/*
Copyright: 2005 Andrey Romanenko <andrey at enginum.com>
2006-2009 Rafael Laboissiere <rafael at debian.org>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sundials.git
More information about the debian-science-commits
mailing list