[sundials] 04/04: removed extra debian/copyright from the merge

[Dima Kogan]

This is an automated email from the git hooks/post-receive script.

dkogan pushed a commit to branch master
in repository sundials.

commit 8a93e41d94c789945dcc9a9e5d4f908180aaec2d
Author: Dima Kogan <dima at secretsauce.net>
Date:   Sat Sep 16 21:31:34 2017 -0700

    removed extra debian/copyright from the merge
    
    The other side of the merge had a few additions to debian/copyright, but it was
    incomplete
---
 debian/copyright | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 2568ffc..9dd795f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -121,31 +121,6 @@ Files: src/sundials/sundials_spfgmr.c
 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