[libcerf] 02/05: Fixed debian/copyright file

[Eugen Wintersberger]

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

eugenwintersberger-guest pushed a commit to branch master
in repository libcerf.

commit a8a01a0fa40006047aa316a82272672ef8003d36
Author: Eugen Wintersberger <eugen.wintersberger at gmail.com>
Date:   Mon Jul 28 10:12:25 2014 +0200

    Fixed debian/copyright file
    
    .) Removed redundant license entries.
    .) use now correct short_name for Creative Commons Attribution Share-Alike
---
 debian/copyright | 68 ++++++++++++--------------------------------------------
 1 file changed, 14 insertions(+), 54 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index ada89d3..c0ddd90 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,16 @@ Files: *
 Copyright: 2012 Massachusetts Institute of Technology 
            2013 Forschungszentrum Jülich GmbH
 License: MIT
+
+Files: fortran/*
+Copyright: 2013 Antonio Cervellino
+License: MIT
+
+Files: debian/*
+Copyright: 2013 Eugen Wintersberger <eugen.wintersberger at gmail.com>
+License: MIT
+
+License: MIT
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
  * "Software"), to deal in the Software without restriction, including
@@ -28,20 +38,13 @@ License: MIT
 Files: man/*
 Copyright: 2012 Massachusetts Institute of Technology
            2013 Forschungszentrum Juelich GmbH
-License: Creative Commons Attribution Share Alike
- * THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
- * COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
- * COPYRIGHT AND/OR *OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
- * AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
- *
- * BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE 
- * TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE
- * CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED 
- * HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+License: CC-BY-SA
 
 Files: man/voigt.*
 Copyright: 2013 Forschungszentrum Juelich GmbH
-License: Creative Commons Attribution Share Alike
+License: CC-BY-SA
+
+License: CC-BY-SA
  * THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
  * COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
  * COPYRIGHT AND/OR *OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
@@ -52,47 +55,4 @@ License: Creative Commons Attribution Share Alike
  * CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED 
  * HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
 
-Files: fortran/*
-Copyright: 2013 Antonio Cervellino
-License: MIT
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
-
-Files: debian/*
-Copyright: 2013 Eugen Wintersberger <eugen.wintersberger at gmail.com>
-License: MIT
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libcerf.git