[SCM] eclipse-mercurialeclipse packaging branch, master, updated. upstream/1.9.2-12-g65f937f

[Niels Thykier]

The following commit has been merged in the master branch:
commit df5fc18f66ebb90585022d0e3492da8003eb3fe0
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Apr 3 11:10:04 2012 +0200

    Single out license of Base64Coder.java
    
    The file is technically also distributable under several other
    licenses.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>

diff --git a/debian/copyright b/debian/copyright
index 35ca4ad..57e24ed 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: MercurialEclipse
 
 Files: *
@@ -6,7 +6,6 @@ Copyright: 2010-2011, Andrei Loskutov
            2005-2011, Andrei Loskutov and others
            2010, Bastian Doetsch
            2005-2008, 2010, Bastian Doetsch and others
-           2003-2008, Christian d'Heureuse, Inventec Informatik AG, Zurich, Switzerland
            2000, 2003-2004, 2006, 2008-2010, IBM Corporation and others
            2009, Intland
            2011, John Peberdy and others
@@ -15,6 +14,30 @@ Copyright: 2010-2011, Andrei Loskutov
            2005-2010, VecTrace (Zingo Andersen) and others
 License: EPL-1.0
 
+Files: plugin/src/com/vectrace/MercurialEclipse/utils/Base64Coder.java
+Copyright: 2003-2009 Christian d'Heureuse, Inventec Informatik AG, Zurich, Switzerland
+License: EPL-1.0
+Comment: The author of this file have released this file under quite a
+ few licenses.  Debian distributes it under the terms of EPL-1.0 (same
+ terms as the rest of MercurialEclipse).
+ .
+ For all acceptable licenses, please read the file header (included
+ below).
+ .
+ // Copyright 2003-2009 Christian d'Heureuse, Inventec Informatik AG, Zurich, Switzerland
+ // www.source-code.biz, www.inventec.ch/chdh
+ //
+ // This module is multi-licensed and may be used under the terms
+ // of any of the following licenses:
+ //
+ //  EPL, Eclipse Public License, http://www.eclipse.org/legal
+ //  LGPL, GNU Lesser General Public License, http://www.gnu.org/licenses/lgpl.html
+ //  AL, Apache License, http://www.apache.org/licenses
+ //  BSD, BSD License, http://www.opensource.org/licenses/bsd-license.php
+ //
+ // Please contact the author if you need another license.
+ // This module is provided "as is", without warranties of any kind.
+
 Files: debian/*
 Copyright: 2011, Debian Java Packagers <pkg-java-maintainers at lists.alioth.debian.org>
 License: EPL-1.0
diff --git a/debian/eclipse-mercurialeclipse.lintian-overrides b/debian/eclipse-mercurialeclipse.lintian-overrides
new file mode 100644
index 0000000..45661c7
--- /dev/null
+++ b/debian/eclipse-mercurialeclipse.lintian-overrides
@@ -0,0 +1,4 @@
+# false-positive: We distribute it under EPL-1.0 and not LGPL.
+# However, the author allows people to distribute it under (among
+# things) the LGPL.
+eclipse-mercurialeclipse: copyright-should-refer-to-common-license-file-for-lgpl

-- 
eclipse-mercurialeclipse packaging