[SCM] qm-dsp/master: Fix some issues in copyright file.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Tue Dec 6 01:58:45 UTC 2016


The following commit has been merged in the master branch:
commit 258d653249201c6ba1bf371d7cd3b4ed8e99add1
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Dec 6 02:50:33 2016 +0100

    Fix some issues in copyright file.

diff --git a/debian/copyright b/debian/copyright
index c86fb78..b8ca19d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -167,7 +167,7 @@ License: BSD~unspecified
  2. 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.
- 3. The name of the ATLAS group or the names of its contributers may
+ 3. The name of the ATLAS group or the names of its contributors may
  not be used to endorse or promote products derived from this
  software without specific written permission.
  .
@@ -182,3 +182,22 @@ License: BSD~unspecified
  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: 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.

-- 
qm-dsp packaging



More information about the pkg-multimedia-commits mailing list