[netbeans] 04/04: debian/copyright: Switched to the Copyright Format 1.0

[Emmanuel Bourg]

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

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

commit 5d56f0af5cc60f77501e41bac47de73e55a2fd7d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 26 13:00:52 2014 +0200

    debian/copyright: Switched to the Copyright Format 1.0
---
 debian/changelog |  1 +
 debian/copyright | 11 +++--------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2653ec8..36e6fb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ netbeans (7.0.1+dfsg1-6) UNRELEASED; urgency=medium
   * debian/control:
     - Standards-Version updated to 3.9.5 (no changes)
   * Switch to debhelper level 9
+  * debian/copyright: Switched to the Copyright Format 1.0
 
  -- Joachim Zobel <jz-2013 at heute.morgen.de>  Sun, 03 Nov 2013 14:46:31 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 7be916a..aba3768 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
-Name: netbeans
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: netbeans
 Source: http://dlc.sun.com.edgesuite.net/netbeans/
 
 Files: *
-Copyright: Copyright 1997-2010 Oracle and/or its affiliates. 
+Copyright: 1997-2010, 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
@@ -41,7 +41,6 @@ Copyright: 2008-2010, Yulia Novozhilova <Yulia.Novozhilova at sun.com>
 License: GPL-2
 
 
-
 Files: apisupport.feedreader/feedreader-suite/*,
  apisupport.paintapp/PaintApp-suite/*,
  cnd.makeproject/samples_src/*,
@@ -94,7 +93,6 @@ License: BSD-3-clause
  THE POSSIBILITY OF SUCH DAMAGE.
 
 
-
 Files: j2ee.samples/samples_src/LotteryAnnotation/LotteryAnnotation-war/web/index.html
 Copyright: 2007, Sun Microsystems, Inc.
 License: BSD-3-clause
@@ -158,7 +156,6 @@ License: BSD-3-clause
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-
 Files: beans/src/org/netbeans/modules/beans/BeanUtils.java,
  beans/src/org/netbeans/modules/beans/TmpPattern.java,
  beans/src/org/netbeans/modules/beans/BeanNavigatorJavaSourceFactory.java,
@@ -254,7 +251,6 @@ Copyright: 1997-2007, Sun Microsystems, Inc.
 License: CDDL-1
 
 
-
 Files: db/src/org/netbeans/modules/db/util/Base64.java
 Copyright: 2000-2009 Sun Microsystems, Inc.
 License: GPL-2 with CLASSPATH exception
@@ -279,7 +275,6 @@ License: GPL-2 with CLASSPATH exception
  have any questions.
 
 
-
 Files: websvc.rest.samples/LeanServiceECBComponentWithAjax/src/java/com/abien/business/orderprocessor/entity/Order.java,
  websvc.rest.samples/LeanServiceECBComponentWithAjax/src/java/com/abien/business/orderprocessor/boundary/OrderService.java,
  websvc.rest.samples/LeanServiceECBComponentWithAjax/src/java/com/abien/business/orderprocessor/control/BillingService.java,

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