[antelope] 04/07: debian/copyright: Updated to the Copyright Format 1.0

Thu Dec 11 15:27:13 UTC 2014

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

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

commit 7b25e118c2c0c67983cf74e42fa502ab0ddea2c2
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 11 16:00:07 2014 +0100

    debian/copyright: Updated to the Copyright Format 1.0
---
 debian/changelog |  1 +
 debian/copyright | 84 ++++++++++++++++++++++++++++----------------------------
 2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 71b1350..b07e1a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ antelope (3.5.1-3) UNRELEASED; urgency=medium
     - Co-maintenance with the Java Team
     - Added the Vcs-* fields
     - Standards-Version updated to 3.9.6 (no changes)
+  * debian/copyright: Updated to the Copyright Format 1.0
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 11 Dec 2014 15:34:12 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 440652c..21be70c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,65 +1,65 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Antelope
-Maintainer: Dale Anson <danson at tigris.org>
-Source: <http://antelope.tigris.org/servlets/ProjectDocumentList>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Antelope
+Upstream-Contact: Dale Anson <danson at tigris.org>
+Source: http://antelope.tigris.org/servlets/ProjectDocumentList
 
 Files: *
-Copyright: 2002-2009 Dale Anson.  All rights reserved
-Licence: Apache-1.1
+Copyright: 2002-2009, Dale Anson
+License: Apache-1.1
 
-Files: src/ise/library/ascii/MessageBox.java,
- src/ise/antelope/tasks/password/*,
- src/ise/antelope/tasks/PasswordHandler.java
+Files: src/ise/library/ascii/MessageBox.java
+       src/ise/antelope/tasks/password/*
+       src/ise/antelope/tasks/PasswordHandler.java
 Copyright: 2004, Dale Anson
-Licence: BSD
+License: BSD-3-clause
 
-Files: src/ise/antelope/launcher/Locator.java,
- src/ise/antelope/launcher/LaunchException.java,
- src/ise/antelope/launcher/Launcher.java,
- src/ise/antelope/common/AntelopeProjectHelper2.java,
- src/ise/antelope/tasks/Unset.java,
- src/ise/antelope/tasks/condition/Or.java,
- src/ise/antelope/tasks/condition/And.java,
- src/ise/antelope/tasks/condition/Not.java,
- src/ise/antelope/tasks/Variable.java,
- src/ise/antelope/tasks/Limit.java,
- src/ise/antelope/tasks/Or.java,
- src/ise/antelope/tasks/And.java,
- src/ise/antelope/tasks/Repeat.java
-Copyright: 2001-2004 The Apache Software Foundation
-Licence: Apache-2.0
+Files: src/ise/antelope/launcher/Locator.java
+       src/ise/antelope/launcher/LaunchException.java
+       src/ise/antelope/launcher/Launcher.java
+       src/ise/antelope/common/AntelopeProjectHelper2.java
+       src/ise/antelope/tasks/Unset.java
+       src/ise/antelope/tasks/condition/Or.java
+       src/ise/antelope/tasks/condition/And.java
+       src/ise/antelope/tasks/condition/Not.java
+       src/ise/antelope/tasks/Variable.java
+       src/ise/antelope/tasks/Limit.java
+       src/ise/antelope/tasks/Or.java
+       src/ise/antelope/tasks/And.java
+       src/ise/antelope/tasks/Repeat.java
+Copyright: 2001-2004, The Apache Software Foundation
+License: Apache-2.0
 
-Files: src/ise/library/KappaLayout.java,
- src/ise/library/LambdaLayout.java,
- src/ise/antelope/launcher/KappaLayout.java,
- src/ise/antelope/launcher/LambdaLayout.java
+Files: src/ise/library/KappaLayout.java
+       src/ise/library/LambdaLayout.java
+       src/ise/antelope/launcher/KappaLayout.java
+       src/ise/antelope/launcher/LambdaLayout.java
 Copyright: 2000, Dale Anson
-Licence: LGPL-2.1+
+License: LGPL-2.1+
 
 Files: src/ise/antelope/app/jedit/*
 Copyright: 1998, 1999 Slava Pestov
-Copyright: 1999, Mike Dillon
-Copyright: 2002, Dale Anson
-Copyright: 2001, Tom Bradford
-Licence: other
+           1999, Mike Dillon
+           2001, Tom Bradford
+           2002, Dale Anson
+License: other
   You may use and modify this package for any purpose. Redistribution is
   permitted, in both source and binary form, provided that this notice
   remains intact in all source distributions of this package.
 
-Files: src/ise/antelope/tasks/Base64.java,
- src/ise/antelope/tasks/util/Base64.java
+Files: src/ise/antelope/tasks/Base64.java
+       src/ise/antelope/tasks/util/Base64.java
 Copyright: 2000, Robert Harder <rob at iharder.net>
-Licence: PD
+License: PD
   I am placing this code in the Public Domain. Do with it as you will.
   This software comes with no guarantees or warranties but with
   plenty of well-wishing instead!
 
 Files: debian/*
 Copyright: 2010, Damien Raude-Morvan <drazzib at debian.org>
-Licence: BSD
+License: BSD-3-clause
 
 
-Licence: BSD
+License: BSD-3-clause
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
   .
@@ -82,7 +82,7 @@ Licence: BSD
   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Licence: Apache-2.0
+License: Apache-2.0
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
@@ -98,7 +98,7 @@ Licence: Apache-2.0
   The full text of the Apache-2.0 license can be found in
   `/usr/share/common-licenses/Apache-2.0' on Debian systems.
 
-Licence: Apache-1.1
+License: Apache-1.1
   [Debian: from src/docs/license.txt]
   .
   This license pertains to all files in the Antelope distribution except the images,
@@ -151,7 +151,7 @@ Licence: Apache-1.1
   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   SUCH DAMAGE.
 
-Licence: LGPL-2.1+
+License: LGPL-2.1+
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either

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

