Synced Brian Cameron's relicensing changes for November release gnome-2-30 NEVADA_149
authordavelam
Sun, 12 Sep 2010 14:33:18 +0000
branchgnome-2-30
changeset 20083 450635fa0066
parent 20082 1cb7df60d62e
child 20084 0f9ea4a19b21
Synced Brian Cameron's relicensing changes for November release
ChangeLog
base-specs/ConsoleKit.spec
base-specs/audiofile.spec
base-specs/flac.spec
base-specs/gnome-settings-daemon.spec
base-specs/gst-plugins-base.spec
base-specs/gst-plugins-good.spec
base-specs/gtkam.spec
base-specs/libtheora.spec
base-specs/moovida-plugins-bad.spec
base-specs/moovida-plugins-good.spec
base-specs/moovida.spec
base-specs/speex.spec
copyright/SUNWcodeina.copyright
copyright/SUNWconsolekit.copyright
copyright/SUNWdbus.copyright
copyright/SUNWgnome-audio.copyright
copyright/SUNWgnome-desktop-prefs.copyright
copyright/SUNWgnome-media.copyright
copyright/SUNWlibtheora.copyright
copyright/SUNWmoovida-plugins.copyright
copyright/SUNWmoovida.copyright
copyright/SUNWspeex.copyright
copyright/SUNWxdg-sound-theme.copyright
specs/SUNWcodeina.spec
specs/SUNWxdg-sound-theme.spec
--- a/ChangeLog	Sun Sep 12 14:21:43 2010 +0000
+++ b/ChangeLog	Sun Sep 12 14:33:18 2010 +0000
@@ -1,7 +1,36 @@
-2003-01-05  Dave Lin <[email protected]>
+2010-09-12  Dave Lin <[email protected]>
 
 	==== Nevada build 149 ====
 
+2010-09-12  Dave Lin <[email protected]>
+
+	Synced Brian Cameron's relicensing changes for November release.
+	* base-specs/gst-plugins-base.spec
+	* base-specs/libtheora.spec
+	* base-specs/moovida-plugins-bad.spec
+	* base-specs/moovida.spec
+	* base-specs/audiofile.spec
+	* base-specs/gtkam.spec
+	* base-specs/moovida-plugins-good.spec
+	* base-specs/speex.spec
+	* base-specs/flac.spec
+	* base-specs/ConsoleKit.spec
+	* base-specs/gst-plugins-good.spec
+	* base-specs/gnome-settings-daemon.spec
+	* copyright/SUNWgnome-audio.copyright
+	* copyright/SUNWspeex.copyright
+	* copyright/SUNWconsolekit.copyright
+	* copyright/SUNWdbus.copyright
+	* copyright/SUNWlibtheora.copyright
+	* copyright/SUNWmoovida-plugins.copyright
+	* copyright/SUNWmoovida.copyright
+	* copyright/SUNWgnome-media.copyright
+	* copyright/SUNWxdg-sound-theme.copyright
+	* copyright/SUNWcodeina.copyright
+	* copyright/SUNWgnome-desktop-prefs.copyright
+	* specs/SUNWcodeina.spec
+	* specs/SUNWxdg-sound-theme.spec
+
 2010-09-10  Brian Lu  <[email protected]>
 
 	* base-specs/thunderbird.spec:
--- a/base-specs/ConsoleKit.spec	Sun Sep 12 14:21:43 2010 +0000
+++ b/base-specs/ConsoleKit.spec	Sun Sep 12 14:33:18 2010 +0000
@@ -11,7 +11,7 @@
 %define OSR 10394:3.0
 
 Name:         ConsoleKit
-License:      GPL v2+
+License:      GPL v2+, MIT, BSD
 Group:        Libraries
 Version:      0.4.1
 Release:      1
--- a/base-specs/audiofile.spec	Sun Sep 12 14:21:43 2010 +0000
+++ b/base-specs/audiofile.spec	Sun Sep 12 14:33:18 2010 +0000
@@ -11,7 +11,7 @@
 %define OSR delivered in s10:0.2.6
 
 Name:         audiofile
-License:      LGPL v2, GPLv2, MIT, Sun Public Domain
+License:      LGPL v2, MIT, Sun Public Domain, binaries use GPLv2
 Group:        System/Library/GNOME
 Version:      0.2.7
 Release:      1
--- a/base-specs/flac.spec	Sun Sep 12 14:21:43 2010 +0000
+++ b/base-specs/flac.spec	Sun Sep 12 14:33:18 2010 +0000
@@ -12,7 +12,7 @@
 %define OSR 4199:1.1.2
 
 Name:         flac
-License:      Xiph.org BSD-style, GPL v2, LGPL v2.1, FDL v1.2
+License:      Xiph.org BSD-style, binaries & media player plugins also use GPL v2, LGPL v2.1, documentation uses FDL v1.2
 Group:        Libraries/Multimedia
 Version:      1.2.1
 Release:      3
--- a/base-specs/gnome-settings-daemon.spec	Sun Sep 12 14:21:43 2010 +0000
+++ b/base-specs/gnome-settings-daemon.spec	Sun Sep 12 14:33:18 2010 +0000
@@ -13,7 +13,7 @@
 
 %include l10n.inc
 Name:         gnome-settings-daemon
-License:      GPL
+License:      GPL v2, some code uses LGPL v2
 Group:        System/GUI/GNOME
 Version:      2.30.1
 Release:      1
--- a/base-specs/gst-plugins-base.spec	Sun Sep 12 14:21:43 2010 +0000
+++ b/base-specs/gst-plugins-base.spec	Sun Sep 12 14:33:18 2010 +0000
@@ -11,7 +11,7 @@
 %define OSR 8766:0.10.19
 
 Name:           gst-plugins-base
-License:        LGPL v2, GPL v2, BSD, Public Domain
+License:        LGPL v2, GPL v2, BSD, MIT
 Version:        0.10.29
 Release:        1
 Distribution:   Java Desktop System
--- a/base-specs/gst-plugins-good.spec	Sun Sep 12 14:21:43 2010 +0000
+++ b/base-specs/gst-plugins-good.spec	Sun Sep 12 14:33:18 2010 +0000
@@ -12,7 +12,7 @@
 
 %include l10n.inc
 Name:           gst-plugins-good
-License:        LGPL v2, BSD
+License:        LGPL v2.1, BSD, MIT
 Version:        0.10.23
 Release:        1
 Distribution:   Java Desktop System
--- a/base-specs/gtkam.spec	Sun Sep 12 14:21:43 2010 +0000
+++ b/base-specs/gtkam.spec	Sun Sep 12 14:33:18 2010 +0000
@@ -22,8 +22,8 @@
 Distribution: Java Desktop System
 Vendor:       Sourceforge
 Summary:      A GTK Digital Camera Viewing Tool
-Source:       http://easynews.dl.sourceforge.net/sourceforge/gphoto/%{name}-%{version}.tar.bz2
-Source1:      http://softlayer.dl.sourceforge.net/sourceforge/libexif/gexif-%{gexif_version}.tar.bz2
+Source:       %{sf_download}/gphoto/%{name}-%{version}.tar.bz2
+Source1:      %{sf_download}/libexif/gexif-%{gexif_version}.tar.bz2
 Source2:      %{name}-po-sun-%{po_sun_version}.tar.bz2
 Source3:      gtkam-icons.tar.bz2
 %if %build_l10n
--- a/base-specs/libtheora.spec	Sun Sep 12 14:21:43 2010 +0000
+++ b/base-specs/libtheora.spec	Sun Sep 12 14:33:18 2010 +0000
@@ -12,7 +12,7 @@
 %define OSR 4198:1.0
 
 Name:         libtheora
-License:      Xiph.org BSD-style
+License:      Xiph.org BSD-style, binaries use some LGPL v2.1
 Group:        Libraries/Multimedia
 Version:      1.1.1
 %define tarball_version 1.1.1
--- a/base-specs/moovida-plugins-bad.spec	Sun Sep 12 14:21:43 2010 +0000
+++ b/base-specs/moovida-plugins-bad.spec	Sun Sep 12 14:33:18 2010 +0000
@@ -14,7 +14,7 @@
 #
 
 Name:              moovida-plugins-bad
-License:           MIT
+License:           GPL v3
 Vendor:            moovidia.com
 Summary:           Bad plugins for Moovida
 URL:               http://www.moovida.com/
--- a/base-specs/moovida-plugins-good.spec	Sun Sep 12 14:21:43 2010 +0000
+++ b/base-specs/moovida-plugins-good.spec	Sun Sep 12 14:33:18 2010 +0000
@@ -10,7 +10,7 @@
 %define OSR 12197:1.0.1
 
 Name:              moovida-plugins-good
-License:           MIT
+License:           GPL v3
 Vendor:            moovidia.com
 Summary:           Good plugins for Moovida
 URL:               http://www.moovida.com/
--- a/base-specs/moovida.spec	Sun Sep 12 14:21:43 2010 +0000
+++ b/base-specs/moovida.spec	Sun Sep 12 14:33:18 2010 +0000
@@ -19,7 +19,7 @@
 #
 
 Name:              moovida
-License:           GPL v3, MIT
+License:           GPL v3, MIT, BSD, PSF, LGPL v2.1, GPL v2
 Vendor:            moovidia.com
 Summary:           Media center written in Python
 URL:               http://www.moovida.com/
--- a/base-specs/speex.spec	Sun Sep 12 14:21:43 2010 +0000
+++ b/base-specs/speex.spec	Sun Sep 12 14:33:18 2010 +0000
@@ -9,7 +9,7 @@
 # bugdb: https://trac.xiph.org/
 #
 Name:         speex
-License:      Xiph.org BSD-style
+License:      Xiph.org BSD-style, binaries also use some LGPL v2 code.
 Group:        Libraries/Multimedia
 %define tarball_version 1.2rc1
 Version:      1.2
--- a/copyright/SUNWcodeina.copyright	Sun Sep 12 14:21:43 2010 +0000
+++ b/copyright/SUNWcodeina.copyright	Sun Sep 12 14:33:18 2010 +0000
@@ -12,7 +12,7 @@
 
 Licensing and copyright information for %{name}:
 
- License: GNU General Public License Version 2
+ License: GNU General Public License Version 3
  
  You can find more information in the following directory:
  %{_pkg_docdir}
--- a/copyright/SUNWconsolekit.copyright	Sun Sep 12 14:21:43 2010 +0000
+++ b/copyright/SUNWconsolekit.copyright	Sun Sep 12 14:33:18 2010 +0000
@@ -13,6 +13,8 @@
 Licensing and copyright information for %{name}:
 
  License: GNU General Public License Version 2
+ License: MIT License
+ License: BSD License
 
  You can find more information in the following directory:
  %{_pkg_docdir}
@@ -22,6 +24,64 @@
   NEWS.bz2: List of the most important changes in ConsoleKit
   README: More information about ConsoleKit
 
+  The ck-launch-session executable has code which uses this BSD License
+
+  ---
+
+  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 Red Hat, Inc., 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 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.
+
+  ---
+
+  The pam-ck-connector has code which uses this MIT license:
+
+  ---
+
+  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.
+
+  ---
+
  The sources of ConsoleKit-%{ck.version} were downloaded
  from %{ck.SOURCE0.url}
 
--- a/copyright/SUNWdbus.copyright	Sun Sep 12 14:21:43 2010 +0000
+++ b/copyright/SUNWdbus.copyright	Sun Sep 12 14:33:18 2010 +0000
@@ -33,8 +33,80 @@
   README: More information about %{dbus.name}
 
   The %{dbus.name} module is dual-licensed under the AFL and the
-  GPL.  However, the dbus-cleanup-sockets program is licensed only under
-  the GNU General Public License Version 2 license.
+  GPL.  However, the dbus-cleanup-sockets program and the decode-gcov
+  test program is licensed only under the GNU General Public License
+  Version 2 license.
+
+  The dbus/dbus-hash.c source file in D-Bus uses this license:
+
+  ---
+
+  Hash table implementation based on generic/tclHash.c from the Tcl 
+  source code. The original Tcl license applies to portions of the 
+  code from tclHash.c; the Tcl license follows this standad D-Bus 
+  license information. 
+  
+  Licensed under the Academic Free License version 2.1 
+  
+  This program is free software; you can redistribute it and/or modify 
+  it under the terms of the GNU General Public License as published by 
+  the Free Software Foundation; either version 2 of the License, or 
+  (at your option) any later version. 
+  
+  This program is distributed in the hope that it will be useful, 
+  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  GNU General Public License for more details. 
+  
+  You should have received a copy of the GNU General Public License 
+  along with this program; if not, write to the Free Software 
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+  The following copyright applies to code from the Tcl distribution. 
+  
+  Copyright (c) 1991-1993 The Regents of the University of California. 
+  Copyright (c) 1994 Sun Microsystems, Inc. 
+  
+  This software is copyrighted by the Regents of the University of 
+  California, Sun Microsystems, Inc., Scriptics Corporation, and 
+  other parties.  The following terms apply to all files associated 
+  with the software unless explicitly disclaimed in individual files. 
+  
+  The authors hereby grant permission to use, copy, modify, 
+  distribute, and license this software and its documentation for any 
+  purpose, provided that existing copyright notices are retained in 
+  all copies and that this notice is included verbatim in any 
+  distributions. No written agreement, license, or royalty fee is 
+  required for any of the authorized uses.  Modifications to this 
+  software may be copyrighted by their authors and need not follow 
+  the licensing terms described here, provided that the new terms are 
+  clearly indicated on the first page of each file where they apply. 
+  
+  IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY 
+  PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL 
+  DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, 
+  OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED 
+  OF THE POSSIBILITY OF SUCH DAMAGE. 
+  
+  THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, 
+  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND 
+  NON-INFRINGEMENT.  THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, 
+  AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE 
+  MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. 
+  
+  GOVERNMENT USE: If you are acquiring this software on behalf of the 
+  U.S. government, the Government shall have only "Restricted Rights" 
+  in the software and related documentation as defined in the Federal 
+  Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you 
+  are acquiring the software on behalf of the Department of Defense, 
+  the software shall be classified as "Commercial Computer Software" 
+  and the Government shall have only "Restricted Rights" as defined 
+  in Clause 252.227-7013 (c) (1) of DFARs.  Notwithstanding the 
+  foregoing, the authors grant the U.S. Government and others acting 
+  in its behalf permission to use and distribute the software in 
+  accordance with the terms specified in this license. 
+
+  ---
 
  The sources of dbus-%{dbus.version} were downloaded
  from %{dbus.SOURCE0.url}
--- a/copyright/SUNWgnome-audio.copyright	Sun Sep 12 14:21:43 2010 +0000
+++ b/copyright/SUNWgnome-audio.copyright	Sun Sep 12 14:33:18 2010 +0000
@@ -26,14 +26,14 @@
  %{_pkg_docdir}
 
   COPYING.bz2: GNU LGPL for libraries
-  COPYING.GPL.bz2: GNU GPL for programs
+  COPYING.GPL.bz2: GNU GPL for binaries
   AUTHORS: List of authors of %{audiofile.name}
   NEWS.bz2: List of the most important changes in %{audiofile.name}
   ChangeLog.bz2: List of all changes and authors of %{audiofile.name}
   README: More information about %{audiofile.name}
 
   The %{audiofile.name} source files contain an osxplay binary which
-  uses the BSD license, but this is not used on Solaris.
+  uses the BSD license, but this is not delivered on Solaris.
 
   The %{audiofile.name} source files contain u-law, A-law and linear PCM 
   conversion code with the following license:
--- a/copyright/SUNWgnome-desktop-prefs.copyright	Sun Sep 12 14:21:43 2010 +0000
+++ b/copyright/SUNWgnome-desktop-prefs.copyright	Sun Sep 12 14:33:18 2010 +0000
@@ -83,6 +83,7 @@
 Licensing and copyright information for gnome-settings-daemon-%{gsd.version}
 
   License: GNU General Public License Version 2
+  License: GNU Lesser General Public License Version 2
 
   You can find more information in the following directory:
   %{_pkg_docdir}/gnome-settings-daemon-%{gsd.version}
@@ -99,5 +100,8 @@
                     of gnome-settings-daemon sound plugin
                     gnome-settings-daemon sound plugin
 
+  Note that some gnome-settings-deamon code is licensed under the LGPL v2
+  license.
+
   The sources of gnome-settings-daemon-%{gsd.version} were downloaded
   from %{gsd.SOURCE0.url}
--- a/copyright/SUNWgnome-media.copyright	Sun Sep 12 14:21:43 2010 +0000
+++ b/copyright/SUNWgnome-media.copyright	Sun Sep 12 14:33:18 2010 +0000
@@ -32,7 +32,7 @@
   README: More information about %{gst.name}
 
   Some %{gst.name} win32 source files use the following public domain
-  licensing.  These files are not included in the Solaris version of GStreamer.
+  licensing.  These files are not used in the Solaris version of GStreamer.
 
   ---
 
@@ -54,12 +54,12 @@
  License: GNU General Public License Version 2
  License: GNU Library General Public License Version 2
  License: BSD License
- License: Public domain license
+ License: MIT License
 
  You can find more information in the following directory:
  %{_pkg_docdir}
 
-  COPYING.bz2: GNU GPL
+  COPYING.bz2: GNU GPL for binaries
   COPYING.LIB.bz2: GNU LGPL
   AUTHORS: List of authors of %{gst_plugins_base.name}
   NEWS.bz2: List of the most important changes in %{gst_plugins_base.name}
@@ -67,39 +67,9 @@
   common/ChangeLog.bz2: List of all changes and authors of %{gst_plugins_base.name}.
   README: More information about %{gst_plugins_base.name}
 
-  The %{gst_plugins_base.name} rtsp plugin contains a MD5 implementation
-  which uses the following license:
-
-  ---
-
-  This code implements the MD5 message-digest algorithm.
-  The algorithm is due to Ron Rivest.  This code was
-  written by Colin Plumb in 1993, no copyright is claimed.
-  This code is in the public domain; do with it what you wish.
- 
-  Equivalent code is available from RSA Data Security, Inc.
-  This code has been tested against that, and is equivalent,
-  except that you don't need to include two pages of legalese
-  with every copy.
-
   ---
 
-  The %{gst_plugins_base.name} cdda plugin contains a public domain SHA-1
-  algorithm with the following license:
-
-  ---
-
-  Please see file COPYING or http://bitzi.com/publicdomain
-  for more info.
- 
-  NIST Secure Hash Algorithm
-  heavily modified by Uwe Hollerbach <[email protected] edu>
-  from Peter C. Gutmann's implementation as found in
-  Applied Cryptography by Bruce Schneier
-
-  ---
-
-  The %{gst_plugins_base.name} fft plugins contains code licensed with the
+  The %{gst_plugins_base.name} fft plugin contains code licensed with the
   following BSD license:
 
   ---
@@ -132,6 +102,40 @@
 
   ---
 
+  The %{gst_plugins_base.name} audioresample plugin contains code licensed with
+  the following BSD license:
+
+  ---
+
+  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 the Xiph.org Foundation 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 
+  A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION 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.
+
+  ---
+
   The %{gst_plugins_base.name} videoscale plugin contains code licensed with
   the following BSD license:
 
@@ -160,7 +164,41 @@
 
   ---
 
-  The %{gst_plugins_base.name} rtsp and sdp plugins contains dual-license
+  The %{gst_plugins_base.name} ogg plugin contains code licensed with the
+  following BSD license:
+
+  ---
+
+  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 CSIRO Australia 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 A 
+  PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION 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. 
+
+  ---
+
+  The %{gst_plugins_base.name} RTSP and SDP plugins contains dual-license
   code which is dual licensed under the GNU LGPL and MIT license.
 
  The sources of gst-plugins-base-%{gst_plugins_base.version} were downloaded
@@ -168,8 +206,9 @@
 
 Licensing and copyright information for gst-plugins-good-%{gst_plugins_good.version}:
 
- License: GNU Lesser General Public License Version 2
+ License: GNU Lesser General Public License Version 2.1
  License: BSD License
+ License: MIT License
 
  You can find more information in the following directory:
  %{_pkg_docdir}
@@ -211,9 +250,9 @@
 
   ---
 
-  The %{gst_plugins_good.name} rtsp and osxaudio plugin contains code which is
-  dual-licensed under the GNU LGPL and MIT license.  The osxaudio plugin is
-  not shipped with Solaris.
+  The %{gst_plugins_good.name} RTSP and osxaudio plugin contains code
+  which is dual-licensed under the GNU LGPL and MIT license.  The osxaudio
+  plugin is not shipped with Solaris.
 
  The sources of gst-plugins-good-%{gst_plugins_good.version} were downloaded
  from %{gst_plugins_good.SOURCE0.url}
--- a/copyright/SUNWlibtheora.copyright	Sun Sep 12 14:21:43 2010 +0000
+++ b/copyright/SUNWlibtheora.copyright	Sun Sep 12 14:33:18 2010 +0000
@@ -1,6 +1,7 @@
 Licensing and copyright information for %{name}:
 
  License: Xiph.org BSD-style License
+ License: GNU Lesser General Public License Version 2.1
  
  You can find more information in the following directory:
  %{_pkg_docdir}
@@ -10,6 +11,8 @@
   CHANGES.bz2: List of all changes and authors of %{theora.name}
   README: More information about %{theora.name}
 
+ The libtheora binaries use some code which uses the LGPL v2.1 license.
+
  The libtheora win32 transcoder code contains avilib, which is under the
  GNU General Public License version 2.  However, this is not shipped
  on Solaris.
--- a/copyright/SUNWmoovida-plugins.copyright	Sun Sep 12 14:21:43 2010 +0000
+++ b/copyright/SUNWmoovida-plugins.copyright	Sun Sep 12 14:33:18 2010 +0000
@@ -9,14 +9,14 @@
 
 Licensing and copyright information for elisa-plugins-good-%{moovida_plugins_good.version}:
 
-   License: MIT license agreement
+   License: GNU General Public License Version 3
  
    The sources of elisa-plugins-good-%{moovida_plugins_good.version} were downloaded from
    %{moovida_plugins_good.SOURCE0.url}
 
 Licensing and copyright information for elisa-plugins-bad-%{moovida_plugins_bad.version}:
 
-   License: MIT license agreement
+   License: GNU General Public License Version 3
  
    The sources of elisa-plugins-bad-%{moovida_plugins_bad.version} were downloaded from
    %{moovida_plugins_bad.SOURCE0.url}
--- a/copyright/SUNWmoovida.copyright	Sun Sep 12 14:21:43 2010 +0000
+++ b/copyright/SUNWmoovida.copyright	Sun Sep 12 14:33:18 2010 +0000
@@ -5,7 +5,11 @@
 Licensing and copyright information for %{name}
 
    License: GNU General Public License Version 3
+   License: GNU General Public License Version 2
+   License: GNU Lesser General Public License Version 2.1
    License: MIT license agreement
+   License: BSD license agreement
+   License: Python Software Foundation License
  
    You can find more information in the following directory:
    %{_pkg_docdir}
@@ -15,6 +19,77 @@
     AUTHORS: list of authors of Elisa
     README.bz2: more information about Elisa
 
+    The coherence and cancellable_defer code in moovida uses this MIT license:
+
+    ---
+
+    # Licensed under the MIT license 
+    # http://opensource.org/licenses/mit-license.php
+
+    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.
+
+    ---
+
+    The ConfigObj, Ordered Dictionary and Validate code in moovida use the BSD
+    license:
+
+    ---
+
+    # Released subject to the BSD License 
+    # Please see http://www.voidspace.org.uk/python/license.shtml 
+
+    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 Michael Foord nor the name of Voidspace
+          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.
+
+    ----
+
+    Enumeration, log, NaturalSort, PriorityQueue code used by Moovida uses the
+    Python Software Foundation license.
+
+    The Storm, Twisted Storm and Zope code used in Moovida use the LGPL v2.1
+    (or later) license.
+
+    The translation code used in Moovida uses the GPLv2 license.
+
    The sources of elisa-%{moovida.version} were downloaded from
    %{moovida.SOURCE0.url}
 
--- a/copyright/SUNWspeex.copyright	Sun Sep 12 14:21:43 2010 +0000
+++ b/copyright/SUNWspeex.copyright	Sun Sep 12 14:33:18 2010 +0000
@@ -1,6 +1,7 @@
 Licensing and copyright information for %{name}:
 
  License: Xiph.org BSD-style License
+ License: GNU Lesser General Public License Version 2
  
  You can find more information in the following directory:
  %{_pkg_docdir}
@@ -11,5 +12,7 @@
   ChangeLog.bz2: List of all changes and authors of %{speex.name}
   README: More information about %{speex.name}
 
+ The speex binaries use some code which is licensed with the LGPL v2 license.
+
  The sources of speex-%{speex.version} were downloaded
  from %{speex.SOURCE0.url}
--- a/copyright/SUNWxdg-sound-theme.copyright	Sun Sep 12 14:21:43 2010 +0000
+++ b/copyright/SUNWxdg-sound-theme.copyright	Sun Sep 12 14:33:18 2010 +0000
@@ -1,16 +1,39 @@
 LICENSES AND ORIGINS:
+
         gnome-audio
                 Andreas Karlsson under the Creative Commons ShareAlike 2.0
-                Martyn Clement under the Creative Commons - Attribution-Share Alike 2.0 Generic
-                Ivica Ico Bukvic (SlipStreamScapes) under the Creative Commons - Attribution 3.0 Unported
+                Martyn Clement under the Creative Commons - Attribution-Share
+                Alike 2.0 Generic
+                Ivica Ico Bukvic (SlipStreamScapes) under the Creative Commons
+                - Attribution 3.0 Unported
+
+                See the packages' README for details.
+
         Ekiga
                 Damien Sandras under GPLv2
+
         KDE
                 The KDE developers under LGPLv2
+
         Pidgin/Purple
                 The Pidgin developers under GPLv2
+
         ALSA
                 The ALSA developers under GPLv2
 
+        Berklee
+                http://wiki.laptop.org/go/Sound_samples#OLPC_Samples_from_31_Music_Synthesis_Alumni_from_Berklee
+                Attribution 3.0 Unported
 
+	Feather Sound Set
+		http://kde-look.org/content/show.php/Feather+Sound+Set?content=90916
+		'glh Pimenta' under Artistic License
 
+	Borealis Sound Theme
+		http://www.kde-look.org/content/show.php?content=12584
+		Ivica Ico Bukvic under Creative Commons Share-Alike 3.0 Unported
+
+	ITW Sounds
+		http://www.kde-look.org/content/show.php/ITW+Sounds?content=98034
+		Ingo Wolfgarten under GPL
+
--- a/specs/SUNWcodeina.spec	Sun Sep 12 14:21:43 2010 +0000
+++ b/specs/SUNWcodeina.spec	Sun Sep 12 14:33:18 2010 +0000
@@ -19,7 +19,7 @@
 IPS_package_name: codec/install/codeina
 Meta(info.classification): %{classification_prefix}:Applications/Sound and Video
 Summary:        Codec Installer
-License:        GPL v2
+License:        GPL v3
 Vendor:         fluendo.com
 URL:            https://core.fluendo.com/gstreamer/trac/wiki/codeina
 Version:        0.10.6
--- a/specs/SUNWxdg-sound-theme.spec	Sun Sep 12 14:21:43 2010 +0000
+++ b/specs/SUNWxdg-sound-theme.spec	Sun Sep 12 14:33:18 2010 +0000
@@ -14,7 +14,7 @@
 Meta(info.classification): %{classification_prefix}:Desktop (GNOME)/Theming
 Summary:                 XDG FreeDesktop Sound Theme
 Vendor:                  freedesktop.org
-License:                 Creative Commons ShareAlike 2.0, Creative Commons - Attribution-Share Alike 2.0 Generic, Creative Commons - Attribution 3.0 Unported, GPLv2, LGPLv2
+License:                 Creative Commons ShareAlike 2.0, Creative Commons ShakeAlike 3.0 Unported, Creative Commons - Attribution-Share Alike 2.0 Generic, Creative Commons - Attribution 3.0 Unported, GPLv2, LGPLv2, Artistic License
 Group:                   System/GUI/GNOME
 Version:                 0.6
 URL:                     http://0pointer.de/blog/projects/sixfold-announcement.html