[SCM] opencore-amr packaging branch, master, updated. debian/0.1-6-gc08c3e9

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Fri May 15 04:14:54 UTC 2009


The following commit has been merged in the master branch:
commit c08c3e983e5b40c50d86ab2efab3363cda2b0fb9
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Fri May 15 00:14:00 2009 -0400

    Update debian/copyright to include relevant parts.

diff --git a/debian/copyright b/debian/copyright
index 2282c83..5c28532 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,25 +1,80 @@
 This package was debianized by Martin Storsjo <martin at martin.st> on
 Sun, 05 Apr 2009 14:57:36 +0200.
 
-It was downloaded from git://android.git.kernel.org/platform/external/opencore.git
+The opencore directory was retreived from
+git://android.git.kernel.org/platform/external/opencore.git
 
-Copyright:
+Copyright and License for OpenCORE (the opencore directory):
 
-    Copyright (C) 1998-2009 PacketVideo
+   Copyright (C) 1998-2009 PacketVideo
 
-License:
+   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.
+
+On Debian systems, the complete text of the Apache version 2.0 license
+can be found in `/usr/share/common-licenses/Apache-2.0'.
+
+The files in opencore/codecs_v2/audio/gsm_amr/amr_nb have this added disclaimer.
+
+   Portions of this file are derived from the following 3GPP standard:
+
+       3GPP TS 26.073
+       ANSI-C code for the Adaptive Multi-Rate (AMR) speech codec
+       Available from http://www.3gpp.org
+
+   (C) 2004, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TTA, TTC)
+   Permission to distribute, modify and use this file under the standard license
+   terms listed above has been obtained from the copyright holder.
+
+The files in opencore/codecs_v2/audio/gsm_amr/amr_wb have this added disclaimer.
+
+   Portions of this file are derived from the following 3GPP standard:
+
+       3GPP TS 26.173
+       ANSI-C code for the Adaptive Multi-Rate - Wideband (AMR-WB) speech codec
+       Available from http://www.3gpp.org
+
+   (C) 2007, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TTA, TTC)
+   Permission to distribute, modify and use this file under the standard license
+   terms listed above has been obtained from the copyright holder.
+
+Patent Disclaimer:
+
+   THIS IS NOT A GRANT OF PATENT RIGHTS.
+
+   Google makes no representation or warranty that the codecs for which
+   source code is made available hereunder are unencumbered by
+   third-party patents.  Those intending to use this source code in
+   hardware or software products are advised that implementations of
+   these codecs, including in open source software or shareware, may
+   require patent licenses from the relevant patent holders.
+
+Copyright and License for non-OpenCORE files (files not in opencore directory):
+
+   Copyright (C) 2009 Martin Storsjo
 
    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
+        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.
+   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.
 
 On Debian systems, the complete text of the Apache version 2.0 license
 can be found in `/usr/share/common-licenses/Apache-2.0'.
@@ -28,8 +83,6 @@ The Debian packaging is:
 
     Copyright (C) 2009 Martin Storsjo <martin at martin.st>
 
-and is licensed under the GPL version 3, 
-see `/usr/share/common-licenses/GPL-3'.
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
+and is licensed under the GPL version 3.
+On Debian systems, the complete text of the GPL version 3 license
+can be found in `/usr/share/common-licenses/GPL-3'.

-- 
opencore-amr packaging



More information about the pkg-multimedia-commits mailing list