[logback] 02/03: Refreshed 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 logback.

commit 4d58147d9cd6be50e3ceeb3ba5d906559e2ebc81
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 31 11:16:07 2015 +0200

    Refreshed debian/copyright
---
 debian/copyright | 53 +++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index bacb6b9..8a8f0c7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,8 +4,9 @@ Upstream-Contact: Logback developpers
 Source: http://logback.qos.ch/dist/
 
 Files: *
-Copyright: Copyright 2000-2009, QOS.ch
-License: LGPL-2.1 or other
+Copyright: 2000-2015, QOS.ch
+License: LGPL-2.1 or EPL-1.0
+Comment:
  This program and the accompanying materials are dual-licensed under
  either the terms of the Eclipse Public License v1.0 as published by
  the Eclipse Foundation
@@ -16,39 +17,39 @@ License: LGPL-2.1 or other
  as published by the Free Software Foundation.
 
 Files: logback-classic/src/test/java/org/slf4j/test_osgi/FrameworkErrorListener.java
- logback-classic/src/test/java/org/slf4j/test_osgi/FelixHost.java
- logback-classic/src/test/java/integrator/Activator.java
-Copyright: Copyright 2004-2009 QOS.ch
+       logback-classic/src/test/java/org/slf4j/test_osgi/FelixHost.java
+       logback-classic/src/test/java/integrator/Activator.java
+Copyright: 2004-2015, QOS.ch
 License: BSD-X11
 
 Files: debian/*
-Copyright: 2008-2011 Damien Raude-Morvan <drazzib at debian.org>
+Copyright: 2008-2011, Damien Raude-Morvan <drazzib at debian.org>
 License: LGPL-2.1 or BSD-X11
 
 License: BSD-X11
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
- .
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
- .
-    THE SOFTWARE IS PROVIDED "AS  IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS  IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
 
 License: LGPL-2.1
-    On Debian systems the full text of the GNU Lesser General Public License can be found
-    in the `/usr/share/common-licenses/LGPL-2.1' file.
+ On Debian systems the full text of the GNU Lesser General Public License can be found
+ in the `/usr/share/common-licenses/LGPL-2.1' file.
 
-License: other
+License: EPL-1.0
     Eclipse Public License -v 1.0
  .
     THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.

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