[visualvm] 08/10: Replaced Sun Microsystems with Oracle in debian/copyright

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository visualvm.

commit a26b1c5bf15331a26371a32643fc8e9e81786d3a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Apr 30 17:54:40 2014 +0200

    Replaced Sun Microsystems with Oracle in debian/copyright
---
 debian/changelog |  4 +++-
 debian/copyright | 32 ++++++++++++++++----------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ce943d7..a00affa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,9 @@ visualvm (1.3.7-1) UNRELEASED; urgency=medium
     - Removed the Ant compatibility patch
     - Depend on libnb-platform18-java instead of libnb-platform13-java
     - Updated the constants in debian/rules
-  * debian/copyright: Refreshed the source URLs
+  * debian/copyright:
+    - Refreshed the source URLs
+    - Replaced Sun Microsystems with Oracle
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 30 Apr 2014 17:12:50 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 51e839d..511498f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,23 +8,23 @@ It was downloaded from
 
 Upstream Authors:
 
-    Sun Microsystems, Inc
+    Oracle, Inc
 
 Copyright:
 
-    <Copyright (C) 2007-2008 Sun Microsystems, Inc>
+    <Copyright (C) 2007-2014 Oracle, Inc>
 
 License:
 
 /*
- * Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
+ * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -36,9 +36,9 @@ License:
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 See /usr/share/common-licenses/GPL-2 for the license text.
@@ -48,10 +48,10 @@ is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
 
   - - - - -   copyright notice and license for netbeans upstream   - - - - -
 
-Copyright 1997-2008 Sun Microsystems, Inc.
+Copyright 1997-2014 Oracle, Inc.
 
 LICENSE #1: The Common Development and Distribution License
-(CDDL), Version 1.0 governs your use of:
+(CDDL), Version 1.1 governs your use of:
 NetBeans Platform software.
 
 LICENSE #2: The GNU General Public License (GPL), Version 2
@@ -62,7 +62,7 @@ NetBeans Platform software
 
 LICENSE #1:
 
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
 
 1. Definitions.
 
@@ -254,7 +254,7 @@ License are fulfilled for the Covered Software.
 
 4. Versions of the License.
 
-4.1. New Versions. Sun Microsystems, Inc. is the initial license
+4.1. New Versions. Oracle, Inc. is the initial license
 steward and may publish revised and/or new versions of this
 License from time to time. Each version will be given a
 distinguishing version number. Except as provided in Section
@@ -427,11 +427,11 @@ On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 "CLASSPATH" EXCEPTION TO THE GPL VERSION 2
-Certain source files distributed by Sun Microsystems, Inc. are subject
+Certain source files distributed by Oracle, Inc. are subject
 to the following clarification and special exception to the GPL, but
-only where Sun has expressly included in the particular source file's
-header the words "Sun designates this particular file as subject to
-the "Classpath" exception as provided by Sun in the LICENSE file that
+only where Oracle has expressly included in the particular source file's
+header the words "Oracle designates this particular file as subject to
+the "Classpath" exception as provided by Oracle in the LICENSE file that
 accompanied this code."
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library. Thus, the terms and

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/visualvm.git