6979022 [g11n] Remove OSBL/CDDL text from package copyrights
authoryukie
Fri, 27 Aug 2010 13:53:57 +0900
changeset 28 54d67e175953
parent 27 cd26fa2b171e
child 29 a3050cd175fe
6979022 [g11n] Remove OSBL/CDDL text from package copyrights
cmdassist/COPYING
idn/idnkit.spec
idn/idnu.copyright
--- a/cmdassist/COPYING	Mon May 03 15:18:35 2010 -0700
+++ b/cmdassist/COPYING	Fri Aug 27 13:53:57 2010 +0900
@@ -1,23 +1,11 @@
-Copyright (c) 2010. Oracle and/or its affiliates. All rights reserved. Use is subject to license terms.
-
-The contents of this file are subject to the terms of the
-Common Development and Distribution License (the "License").
-You may not use this file except in compliance with the License.
+Copyright (c) 2010. Oracle and/or its affiliates. All rights reserved.
 
-You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-or http://www.opensolaris.org/os/licensing.
-See the License for the specific language governing permissions
-and limitations under the License.
+This package may include technology covered by one or more of the
+following additional notices:
 
-When distributing Covered Code, include this CDDL HEADER in each
-file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-If applicable, add the following below this CDDL HEADER, with the
-fields enclosed by brackets "[]" replaced with your own identifying
-information: Portions Copyright [yyyy] [name of copyright owner]
+----------------------------------------------------------------------
 
---------------------------------------------
-
-Sun elects to have this file available under and governed by the
+Oracle elects to have this file available under and governed by the
 gSOAP Public License 1.3 (see below for full license text).  However, the
 following notice accompanied the original version of this file:
 
--- a/idn/idnkit.spec	Mon May 03 15:18:35 2010 -0700
+++ b/idn/idnkit.spec	Fri Aug 27 13:53:57 2010 +0900
@@ -84,6 +84,7 @@
 
 %package -n SUNWidnu
 Summary: Internationalized Domain Name Support Utilities
+Version: 1.7
 SUNW_BaseDir:   %{_basedir}
 Group: Development/Libraries
 %include default-depend.inc
--- a/idn/idnu.copyright	Mon May 03 15:18:35 2010 -0700
+++ b/idn/idnu.copyright	Fri Aug 27 13:53:57 2010 +0900
@@ -1,17 +1,1 @@
-Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-Use is subject to license terms.
-
-The contents of this file are subject to the terms of the
-Common Development and Distribution License (the "License").
-You may not use this file except in compliance with the License.
-
-You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-or http://www.opensolaris.org/os/licensing.
-See the License for the specific language governing permissions
-and limitations under the License.
-
-When distributing Covered Code, include this CDDL HEADER in each
-file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-If applicable, add the following below this CDDL HEADER, with the
-fields enclosed by brackets "[]" replaced with your own identifying
-information: Portions Copyright [yyyy] [name of copyright owner]
+Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.