From: Bill Allombert <Bill.Allombert@math.u-bordeaux.fr>
Date: Sat, 28 May 2011 18:20:35 +0000 (+0200)
Subject: copyright-format: Fix URL for the Eiffel Forum License.
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=7736c07e51bdcf459f5cd5fed7d1df5ae3ee4e5a;p=debian%2Fdebian-policy.git

copyright-format: Fix URL for the Eiffel Forum License.

Reported by Thomas Preud'homme, patch by Charles Plessy.  Closes: #623050
---

diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml
index b9599d3..e198d3c 100644
--- a/copyright-format/copyright-format.xml
+++ b/copyright-format/copyright-format.xml
@@ -742,7 +742,8 @@ License: MPL-1.1
               </entry>
               <entry>
                 The Eiffel Forum License
-                <ulink url="http://spdx.org/licenses/EPL-1.0">1.0</ulink>.
+                <ulink url="http://spdx.org/licenses/EFL-1.0">1.0</ulink>,
+                <ulink url="http://spdx.org/licenses/EFL-2.0">2.0</ulink>.
               </entry>
             </row>
             <row>
diff --git a/debian/changelog b/debian/changelog
index e576c68..8edf8af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,8 +23,11 @@ debian-policy (3.9.3.0) UNRELEASED; urgency=low
     Seconded: Steve Langasek <vorlon@debian.org>
     Seconded: Charles Plessy <plessy@debian.org>
     Closes: #621479
+  * copyright-format: Fix URL for the Eiffel Forum License.
+    Reported by Thomas Preud'homme, patch by Charles Plessy.
+    Closes: #623050
 
- -- Bill Allombert <ballombe@debian.org>  Sun, 08 May 2011 20:31:54 +0200
+ -- Bill Allombert <ballombe@debian.org>  Sat, 28 May 2011 20:17:08 +0200
 
 debian-policy (3.9.2.0) unstable; urgency=low