[SCM] libyami/master: Fix copyright info

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Wed Nov 9 20:05:39 UTC 2016


The following commit has been merged in the master branch:
commit f72a584b49693190cc06507ed58c5c3ea8dafc45
Author: Sebastian Ramacher <sebastian at ramacher.at>
Date:   Wed Nov 9 21:05:34 2016 +0100

    Fix copyright info

diff --git a/debian/copyright b/debian/copyright
index 8d379ed..29ebd99 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,24 +3,15 @@ Upstream-Name: libyami
 Source: https://github.com/01org/libyami.git
 
 Files: *
-Copyright: 2010, The WebM Project authors.
-           2011-2016 Intel Corporation
+Copyright: 2011-2016 Intel Corporation
            2015-2016 Alibaba
 License: Apache-2.0
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied
- See the License for the specific language governing permissions and
- limitations under the License.
- .
- You can find complete text in "/usr/share/common-licenses/Apache-2.0"
 
 Files: debian/*
 Copyright: 2016 Xu Guagnxin <Guangxin.Xu at intel.com>
+           2016 Sebastian Ramacher <sramacher at debian.org>
+License: Apache-2.0
+
 License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -37,22 +28,27 @@ License: Apache-2.0
 Files: codecparsers/vp8_parser.*
        codecparsers/dboolhuff.*
        codecparsers/vp9quant.*
-Copyright: 2015 The Chromium Authors
+Copyright: 2010 The WebM Project authors
+           2015 The Chromium Authors
            2016 Intel Corporation
 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.
-   Neither the name of Google, nor the WebM Project, nor the names
-   of its contributors may be used to endorse or promote products
-   derived from this software without specific prior written
-   permission.
+ .
+  * 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.
+ .
+  * Neither the name of Google, nor the WebM Project, nor the names
+    of its contributors 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

-- 
libyami packaging



More information about the pkg-multimedia-commits mailing list