[xsom] 02/02: update copyright

[Timo Aaltonen]

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

tjaalton-guest pushed a commit to branch master
in repository xsom.

commit 092af2d86ccc4ef07d424c8fb2dfa6b3f9c64257
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Tue Feb 25 14:13:28 2014 +0200

    update copyright
---
 debian/copyright | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 08e8e24..b9c90a2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,12 +3,12 @@ Upstream-Name: XSOM
 Source: http://xsom.java.net
 
 Files: *
-Copyright: 1997-2011, Oracle
-License: CDDL or GPL-2 with classpath exception
+Copyright: 1997-2011, Oracle and/or its affiliates
+License: CDDL-1.1 or GPL-2 with classpath exception
 
 Files: debian/*
 Copyright: 2013, Ade Lee <alee at redhat.com>
-License: GPL-3+
+License: CDDL-1.1 or GPL-2 with classpath exception
 
 License: GPL-2 with classpath exception
  This program is free software; you can redistribute it
@@ -54,24 +54,7 @@ License: GPL-2 with classpath exception
  to do so.  If you do not wish to do so, delete this exception statement from your
  version.
 
-License: GPL-3+
- This package 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 3 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-
-License: CDDL
+License: CDDL-1.1
  COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
  .
  1. Definitions.

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