[Pkg-fglrx-devel] r692 - fglrx-driver/trunk/debian

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-08 16:12:32 +0000 (Mon, 08 Aug 2011)
New Revision: 692

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/copyright
Log:
add more copyright statements and licenses

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-08-07 13:50:40 UTC (rev 691)
+++ fglrx-driver/trunk/debian/changelog	2011-08-08 16:12:32 UTC (rev 692)
@@ -1,3 +1,10 @@
+fglrx-driver (1:11-7-5) UNRELEASED; urgency=low
+
+  [ Andreas Beckmann ]
+  * Add more copyright statements and licenses to debian/copyright.
+
+ -- Andreas Beckmann <debian at abeckmann.de>  Mon, 08 Aug 2011 17:54:32 +0200
+
 fglrx-driver (1:11-7-4) unstable; urgency=low
 
   [ Andreas Beckmann ]
@@ -10,7 +17,7 @@
     prebuilt modules is no longer permitted.
   * Automatically detect license by comparing debian/copyright with
     ATI_LICENSE.TXT during build.
-  * Check for fglrx configuration in /etx/X11/xorg.conf.d/, too, and don't
+  * Check for fglrx configuration in /etc/X11/xorg.conf.d/, too, and don't
     print messages about missing files.
   * Overhaul get-orig-source target. Fix file permissions while repacking.
   * Simplify lintian overrides.

Modified: fglrx-driver/trunk/debian/copyright
===================================================================
--- fglrx-driver/trunk/debian/copyright	2011-08-07 13:50:40 UTC (rev 691)
+++ fglrx-driver/trunk/debian/copyright	2011-08-08 16:12:32 UTC (rev 692)
@@ -9,7 +9,9 @@
  package.
 
 Files: *
-Copyright: AMD
+Copyright: Advanced Micro Devices, Inc.
+           Copyright 1998-2011 ATI Technologies Inc.
+           All Rights Reserved.
 License: other-AMD-FGLRX
  AMD Software End User License Agreement
  .
@@ -246,3 +248,78 @@
  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: debian/import/amdxvba.h
+Copyright: Copyright (c) 2011, Advanced Micro Devices, Inc.
+           All rights reserved.
+License: BSD-3-clause-with-MPEG-2-blurb
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following are met:
+ .
+ Neither the name of the copyright holder nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific, prior, written permission.
+ .
+ You must reproduce the above copyright notice.
+ .
+ You must include the following terms in your license and/or other
+ materials provided with the software.
+ .
+ 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
+ HOLDER 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.
+ .
+ Without limiting the foregoing, the software may implement third
+ party technologies (e.g. third party libraries) for which you must
+ obtain licenses from parties other than AMD.  You agree that AMD has
+ not obtained or conveyed to you, and that you shall be responsible for
+ obtaining the rights to use and/or distribute the applicable underlying
+ intellectual property rights related to the third party technologies.
+ These third party technologies are not licensed hereunder.
+ .
+ Without limiting the foregoing, for MPEG-2 products, the following
+ additional notices are provided: For MPEG-2 Encoding Products (those
+ that are "Sold" to end-users, directly or indirectly):
+ .
+     NO LICENSE IS GRANTED HEREIN, BY IMPLICATION OR OTHERWISE,
+     TO YOU OR YOUR CUSTOMERS TO USE MPEG-2 ENCODING PRODUCTS,
+     MPEG-2 DISTRIBUTION ENCODING PRODUCTS, MPEG-2 ENCODING SOFTWARE,
+     AND/OR MPEG-2 BUNDLED ENCODING SOFTWARE FOR ENCODING OR HAVING
+     ENCODED ONE OR MORE MPEG-2 VIDEO EVENTS FOR RECORDING ON AN
+     MPEG-2 PACKAGED MEDIUM FOR ANY USE OR DISTRIBUTION OTHER THAN
+     PERSONAL USE OF LICENSEE'S CUSTOMER.
+ .
+ For MPEG-2 Intermediate Products (those that are NOT "Sold" to
+ end-users, directly or indirectly):
+ .
+     NO LICENSE IS GRANTED HEREIN, BY IMPLICATION OR OTHERWISE,
+     TO YOU OR YOUR CUSTOMERS TO USE MPEG-2 INTERMEDIATE PRODUCTS
+     MANUFACTURED OR SOLD BY YOU.
+ .
+ If you use the software (in whole or in part), you shall adhere to
+ all applicable U.S., European, and other export laws, including but
+ not limited to the U.S. Export Administration Regulations ("EAR"),
+ (15 C.F.R. Sections 730 through 774), and E.U. Council Regulation (EC)
+ No 1334/2000 of 22 June 2000.  Further, pursuant to Section 740.6 of
+ the EAR, you hereby certify that, except pursuant to a license granted
+ by the United States Department of Commerce Bureau of Industry and
+ Security or as otherwise permitted pursuant to a License Exception
+ under the U.S. Export Administration Regulations ("EAR"), you will
+ not (1) export, re-export or release to a national of a country in
+ Country Groups D:1, E:1 or E:2 any restricted technology, software,
+ or source code you receive hereunder, or (2) export to Country Groups
+ D:1, E:1 or E:2 the direct product of such technology or software, if
+ such foreign produced direct product is subject to national security
+ controls as identified on the Commerce Control List (currently found
+ in Supplement 1 to Part 774 of EAR).  For the most current Country
+ Group listings, or for additional information about the EAR or your
+ obligations under those regulations, please refer to the U.S. Bureau
+ of Industry and Security's website at http://www.bis.doc.gov/.