[SCM] eclipse-mylyn - Plug-in for eclipse - Debian package. branch, master, updated. upstream/3.6.4+fix1-38-g2e319de

[Jakub Adam]

The following commit has been merged in the master branch:
commit 2e319de7722bdf728722818716d60f0d006ec25b
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Wed Feb 15 21:55:10 2012 +0100

    Added files under Apache-2.0 license to d/copyright

diff --git a/debian/copyright b/debian/copyright
index 2c89c64..07c6985 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -55,6 +55,11 @@ Copyright: 2010, Andreas Hoehmann and others
            2009, Yann Simon <yann.simon.fr at gmail.com>
 License: EPL-1.0
 
+Files: org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.soap/src/org/eclipse/mylyn/internal/provisional/commons/soap/CommonsHttpSender.java
+       org.eclipse.mylyn.docs/org.eclipse.mylyn.wikitext.core/src/org/eclipse/mylyn/internal/wikitext/core/util/XML11Char.java
+Copyright: 2001-2004, The Apache Software Foundation
+License: Apache-2.0
+
 Files: debian/*
 Copyright: 2010-2011, Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 License: EPL-1.0
@@ -275,3 +280,12 @@ License: EPL-1.0
  this Agreement will bring a legal action under this Agreement more than
  one year after the cause of action arose. Each party waives its rights to
  a jury trial in any resulting litigation.
+
+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.
+ .
+ On a Debian system, you may read a copy of the License at
+ .
+   /usr/share/common-licenses/Apache-2.0
+

-- 
eclipse-mylyn - Plug-in for eclipse - Debian package.