[libnb-platform-java] 01/01: Further copyright corrections

Andrew Ross rockclimb-guest at alioth.debian.org
Tue Oct 22 20:54:09 UTC 2013


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

rockclimb-guest pushed a commit to branch master
in repository libnb-platform-java.

commit 1e2ebc159604289011e09d7d4f1959a47ee68bd9
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date:   Tue Oct 22 21:40:59 2013 +0100

    Further copyright corrections
---
 debian/changelog |    5 +--
 debian/copyright |  106 +++++++++++++++++++++++++-----------------------------
 2 files changed, 51 insertions(+), 60 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8441330..d553f01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,11 +6,12 @@ libnb-platform18-java (7.4+dfsg1-1) unstable; urgency=low
   * Include cluster release number in source package name to allow
     multiple Netbeans platforms to be installed at once.
   * Build .nbm modules and install into their own package.
-  * Remove bashism from o.n.bootstrap/launcher/unix/nbexec (Closes: #690633)
+  * Upstream removed bashism from o.n.bootstrap/launcher/unix/nbexec
+    (Closes: #690633)
   * Updated debian/patches.
   * Bump standards version to 3.9.4.
 
- -- Andrew Ross <ubuntu at rossfamily.co.uk>  Tue, 22 Oct 2013 20:46:28 +0100
+ -- Andrew Ross <ubuntu at rossfamily.co.uk>  Tue, 22 Oct 2013 21:40:41 +0100
 
 libnb-platform-java (6.9-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 652d99b..d243615 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,58 +1,29 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Name: libnb-platform18-java
 Source: http://dlc.sun.com.edgesuite.net/netbeans/
 
 Files: *
 Copyright: Copyright 1997-2013 Oracle and/or its affiliates. 
           Portions Copyrighted 1997-2009 Sun Microsystems, Inc.
 License: CDDL-1 or GPL-2 with CLASSPATH exception
- "CLASSPATH" EXCEPTION TO THE GPL VERSION 2
- .
- Certain source files distributed by Oracle Corp. are subject
- to  the following clarification and special exception to the
- GPL Version 2, but 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 conditions of the GNU General Public
- License Version 2 cover the whole combination. 
- .
- As a special exception, the copyright holders of this
- library give you  permission to link this library with
- independent modules to produce an  executable, regardless of
- the license terms of these independent modules,  and to copy
- and distribute the resulting executable under terms of your 
- choice, provided that you also meet, for each linked
- independent module,  the terms and conditions of the license
- of that module. An independent  module is a module which is
- not derived from or based on this library. If  you modify
- this library, you may extend this exception to your version
- of  the library, but you are not obligated to do so. If you
- do not wish to do  so, delete this exception statement from
- your version.
 
 Files: debian/*
 Copyright: 2008-2010, Yulia Novozhilova <Yulia.Novozhilova at sun.com>
            2011-2012, Andrew Ross <ubuntu at rossfamily.co.uk>
 License: GPL-2
 
-Files: ./options.keymap/build.xml,
- ./openide.awt/test/unit/src/org/openide/awt/ActionsTest.java,
- ./o.n.bootstrap/test/unit/src/org/netbeans/ModuleMixedOnClasspathTest.java,
- ./o.n.bootstrap/test/unit/src/org/netbeans/ModuleFactoryTest.java,
- ./o.n.bootstrap/test/unit/src/org/netbeans/ModuleFactoryAlienTest.java,
- ./o.n.bootstrap/src/org/netbeans/ModuleFactory.java,
- ./apisupport.harness/jnlp-src/org/netbeans/modules/apisupport/jnlplauncher/RuntimePolicy.java,
+Files: ./options.keymap/build.xml
+ ./openide.awt/test/unit/src/org/openide/awt/ActionsTest.java
+ ./o.n.bootstrap/test/unit/src/org/netbeans/ModuleMixedOnClasspathTest.java
+ ./o.n.bootstrap/test/unit/src/org/netbeans/ModuleFactoryTest.java
+ ./o.n.bootstrap/test/unit/src/org/netbeans/ModuleFactoryAlienTest.java
+ ./o.n.bootstrap/src/org/netbeans/ModuleFactory.java
+ ./apisupport.harness/jnlp-src/org/netbeans/modules/apisupport/jnlplauncher/RuntimePolicy.java
  ./apisupport.harness/test/unit/src/org/netbeans/modules/apisupport/jnlplauncher/FixPolicyTest.java
 Copyright: Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
            Portions Copyrihgt 2005-2006 Nokia
 License: CDDL-1 or GPL-2 with CLASSPATH exception
 
-Files: ./core.windows/test/unit/src/org/netbeans/core/windows/view/ui/CustomMenuBarTest.java,
+Files: ./core.windows/test/unit/src/org/netbeans/core/windows/view/ui/CustomMenuBarTest.java
  ./core.startup/test/unit/src/org/netbeans/core/startup/layers/CustomWritableSystemFileSystemTest.java
 Copyright: Copyright 1997-2013 Oracle and/or its affiliates. 
     Portions Copyrighted 2007 Nokia Siemens Networks Oy
@@ -65,27 +36,6 @@ Copyright: Copyright (C) 1998 Netscape Communications Corporation.
     Tomi Leppikangas <Tomi.Leppikangas at oulu.fi>
     Darin Fisher <darin at meer.net>
 License: MPL-1.1 or GPL-2 or LGPL-2.1
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (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.mozilla.org/MPL/
- .
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
- .
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
 
 
 License: GPL-2
@@ -93,6 +43,46 @@ License: GPL-2
      License can be found in the `/usr/share/common-licenses/GPL-2'
      file.
 
+License: GPL-2 with CLASSPATH exception
+ 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.
+ .
+ "CLASSPATH" EXCEPTION TO THE GPL VERSION 2
+ .
+ Certain source files distributed by Oracle Corp. are subject
+ to  the following clarification and special exception to the
+ GPL Version 2, but 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 conditions of the GNU General Public
+ License Version 2 cover the whole combination. 
+ .
+ As a special exception, the copyright holders of this
+ library give you  permission to link this library with
+ independent modules to produce an  executable, regardless of
+ the license terms of these independent modules,  and to copy
+ and distribute the resulting executable under terms of your 
+ choice, provided that you also meet, for each linked
+ independent module,  the terms and conditions of the license
+ of that module. An independent  module is a module which is
+ not derived from or based on this library. If  you modify
+ this library, you may extend this exception to your version
+ of  the library, but you are not obligated to do so. If you
+ do not wish to do  so, delete this exception statement from
+ your version.
+ .
+ On Debian systems the full text of the GNU General Public 
+ License can be found in the `/usr/share/common-licenses/GPL-2'
+ file.
+
 License: LGPL-2.1
      On Debian systems the full text of the GNU General Public 
      License can be found in the `/usr/share/common-licenses/LGPL-2.1'

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



More information about the pkg-java-commits mailing list