Author: tmancill Date: 2011-06-12 17:02:54 +0000 (Sun, 12 Jun 2011) New Revision: 13787
Modified: trunk/libjemmy2-java/debian/copyright Log: move license explanation section in debian/copyright to directly precede the other licenses Modified: trunk/libjemmy2-java/debian/copyright =================================================================== --- trunk/libjemmy2-java/debian/copyright 2011-06-11 23:04:01 UTC (rev 13786) +++ trunk/libjemmy2-java/debian/copyright 2011-06-12 17:02:54 UTC (rev 13787) @@ -1,44 +1,6 @@ Format: http://dep.debian.net/deps/dep5/ Source: https://svn.java.net/svn/jemmy~svn/trunk/AWT/Jemmy2 -License: CDDL or GPL-2 with Classpath exception - The contents of this file are subject to the terms of either the GNU - General Public License Version 2 only ("GPL") or the Common - Development and Distribution License("CDDL") (collectively, the - "License"). You may not use this file except in compliance with the - License. You can obtain a copy of the License at - http://www.netbeans.org/cddl-gplv2.html - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the - specific language governing permissions and limitations under the - License. When distributing the software, include this License Header - Notice in each file and include the License file at - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this - particular file as subject to the "Classpath" exception as provided - by Sun in the GPL Version 2 section of the License file that - accompanied this code. If applicable, add the following below the - License Header, with the fields enclosed by brackets [] replaced by - your own identifying information: - "Portions Copyrighted [year] [name of copyright owner]" - . - The Original Software is the Jemmy library. - The Initial Developer of the Original Software is Alexandre Iline. - All Rights Reserved. - . - If you wish your version of this file to be governed by only the CDDL - or only the GPL Version 2, indicate your decision by adding - "[Contributor] elects to include this software in this distribution - under the [CDDL or GPL Version 2] license." If you do not indicate a - single choice of license, a recipient has the option to distribute - your version of this file under either the CDDL, the GPL Version 2 or - to extend the choice of license to its licensees as provided above. - However, if you add GPL Version 2 code and therefore, elected the GPL - Version 2 license, then the option applies only if the new code is - made subject to such option by the copyright holder. - . - The full text of the Common Development and Distribution License - ("CDDL") and the GPL-2 with the Classpath exception can be found later - in this file. - Files: * Copyright: (C) 1997-2007 Sun Microsystems, Inc. @@ -80,6 +42,45 @@ (C) 1997-2007 shura License: CDDL or GPL-2 with Classpath exception +License: CDDL or GPL-2 with Classpath exception + The contents of this file are subject to the terms of either the GNU + General Public License Version 2 only ("GPL") or the Common + Development and Distribution License("CDDL") (collectively, the + "License"). You may not use this file except in compliance with the + License. You can obtain a copy of the License at + http://www.netbeans.org/cddl-gplv2.html + or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + specific language governing permissions and limitations under the + License. When distributing the software, include this License Header + Notice in each file and include the License file at + nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + particular file as subject to the "Classpath" exception as provided + by Sun in the GPL Version 2 section of the License file that + accompanied this code. If applicable, add the following below the + License Header, with the fields enclosed by brackets [] replaced by + your own identifying information: + "Portions Copyrighted [year] [name of copyright owner]" + . + The Original Software is the Jemmy library. + The Initial Developer of the Original Software is Alexandre Iline. + All Rights Reserved. + . + If you wish your version of this file to be governed by only the CDDL + or only the GPL Version 2, indicate your decision by adding + "[Contributor] elects to include this software in this distribution + under the [CDDL or GPL Version 2] license." If you do not indicate a + single choice of license, a recipient has the option to distribute + your version of this file under either the CDDL, the GPL Version 2 or + to extend the choice of license to its licensees as provided above. + However, if you add GPL Version 2 code and therefore, elected the GPL + Version 2 license, then the option applies only if the new code is + made subject to such option by the copyright holder. + . + The full text of the Common Development and Distribution License + ("CDDL") and the GPL-2 with the Classpath exception can be found later + in this file. + + License: CDDL COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 . @@ -482,7 +483,6 @@ venue lying in Santa Clara County, California. - License: GPL-2 with Classpath exception This program is free software; you can redistribute it _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
