[med-svn] [sphinxcontrib-bibtex] 02/02: Fix d/copyright short names & debian/* license

[Kevin Murray]

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

daube-guest pushed a commit to branch master
in repository sphinxcontrib-bibtex.

commit a45a7b930350b48642a4d651407981264059ea8f
Author: Kevin Murray <spam at kdmurray.id.au>
Date:   Fri Oct 9 21:44:40 2015 +1100

    Fix d/copyright short names & debian/* license
---
 debian/copyright | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 1a39666..142f1f6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,13 +4,7 @@ Source: https://github.com/mcmtroffaes/sphinxcontrib-bibtex
 
 Files: *
 Copyright: 2011-2014 by Matthias C. M. Troffaes
-License: BSD
-
-Files: debian/*
-Copyright: 2015 Kevin Murray <spam at kdmurray.id.au>
-License: BSD
-
-License: BSD
+License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
  met:
@@ -34,3 +28,24 @@ License: BSD
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+Files: debian/*
+Copyright: 2015 Kevin Murray <spam at kdmurray.id.au>
+License: Expat
+ 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-med/sphinxcontrib-bibtex.git