[SCM] libebur128/master: fix debian/copyright

[andrewrk-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 94065fc40562ba3c4ef563e4e27a765f3b904a5a
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Mon Feb 17 15:14:27 2014 +0000

    fix debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 05603f0..e149878 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,30 +2,13 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: libebur128
 Source: https://github.com/jiixyj/libebur128
 
-Files: debian/*
-Copyright: 2014 Andrew Kelley
-License: MIT 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.
+Files: *
+Copyright: 2011 Jan Kokemüller
+License: Expat
 
 Files: ebur128/queue/sys/queue.h
 Copyright: 1993 The Regents of the University of California
-License: Modified BSD License
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -50,9 +33,11 @@ License: Modified BSD License
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-Files: *
-Copyright: 2011 Jan Kokemüller
-License: MIT License (Expat)
+Files: debian/*
+Copyright: 2014 Andrew Kelley
+License: Expat
+
+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

-- 
libebur128 packaging