[SCM] projectm/master: Fix lintian warnings

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9a0b93b9daa867a6d410d443dad05ae53bcc2d29
Author: Sebastian Ramacher <sebastian at ramacher.at>
Date:   Sun Aug 2 18:45:31 2015 +0200

    Fix lintian warnings

diff --git a/debian/copyright b/debian/copyright
index abbaf7f..246c52d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -109,8 +109,7 @@ Copyright: 2007 The Khronos Group Inc
  1999-2007 Brian Paul
  2002-2008, Milan Ikits <milan ikits at ieee org>
  2002, Lev Povalahev
-License: MIT
- BSD-2-clause
+License: MIT and BSD-3-clause
 
 Files: src/projectM-qt/*
  src/projectM-pulseaudio/*
@@ -120,8 +119,7 @@ License: GPL-2+
 
 Files: src/projectM-pulseaudio/qprojectM-pulseaudio.cpp
 Copyright: 2003-2004 projectM Team
-License: LGPL-2.1+
- GPL-2+
+License: LGPL-2.1+ and GPL-2+
 
 Files: src/projectM-test/projectM-test-memleak.cpp
  src/projectM-test/projectM-test-texture.cpp
@@ -199,6 +197,30 @@ License: BSD-2-clause
  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+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:
+ .
+ * Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+ * The name of the author may be used to endorse or promote products
+   derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
+
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"),

-- 
projectm packaging