[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. 2.0.1-6-92-g5f57dc0

[Mirco Bauer]

The following commit has been merged in the master branch:
commit ed09b6ef80d7b393f4818d8ae3f71739ceabdee9
Author: Mirco Bauer <meebey at meebey.net>
Date:   Tue May 19 22:39:05 2009 +0200

      * debian/copyright:
        + Added Lucene.Net, RabbitMQ.Client and HtmlAgilityPack licenses.

diff --git a/debian/changelog b/debian/changelog
index f13f7d0..22a40ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -67,6 +67,8 @@ mono (2.4+dfsg-1~pre1) unstable; urgency=low
     + Run mod and monodoc on CLI 2.0.
   * debian/patches/fix_recursive_unmanaged_types.dpatch:
     + Fixes recursive structs regression as seen with OpenOffice.org.
+  * debian/copyright:
+    + Added Lucene.Net, RabbitMQ.Client and HtmlAgilityPack licenses.
 
  -- Mirco Bauer <meebey at debian.org>  Wed, 13 May 2009 01:40:02 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 3050d04..bbf6a8c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -40,6 +40,27 @@ License can be found in /usr/share/common-licenses/GPL file.
 
 -------------------------------------------------------------------------------
 
+mcs/tools/monodoc/Lucene.Net/*
+
+Copyright 2004 The Apache Software Foundation
+
+ 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+On Debian systems, the complete text of Apache License, Version 2.0
+can be found in /usr/share/common-licenses/Apache-2.0 file.
+
+-------------------------------------------------------------------------------
+
 mcs/class/*
 
 The class libraries are released under the terms of the MIT X11
@@ -842,6 +863,14 @@ Either beagle illegal relicensed Html Agility Pack from CC Share-alike to
 BSD (3 clause) or the author of Html Agility Pack published somewhere a BSD
 version (or maybe even relicensed specially for beagle)
 
+TEMP FIX:
+AgilityPack.dll was removed from the mono source tarball, see debian/rules
+get-orig-source target.
+
+2009-05-19:
+The license on http://htmlagilitypack.codeplex.com/license now says:
+Microsoft Public License (Ms-PL)
+
 -------------------------------------------------------------------------------
 
 debian/detector/*

-- 
mono