[Pkg-lyx-devel] [SCM] eLyxer - standalone LyX to html converter branch, master, updated. upstream/1.2.0-136-g73de37a

[Sven Hoexter]

The following commit has been merged in the master branch:
commit 73de37a236cd4ff09fe23d6d192b33facc6d3d4f
Author: Sven Hoexter <sven at timegate.de>
Date:   Mon Jan 31 14:50:10 2011 +0100

    Note in debian/copyright that the code in math2html.py is additionally licensed under the Apache License 2.0.

diff --git a/debian/changelog b/debian/changelog
index bf57913..3e8283f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ elyxer (1.2.0-1) UNRELEASED; urgency=low
   * Remove the dh_auto_clean override.
   * Increment all years in debian/copyright.
   * Replace the use of python-support with a simple dependency on python.
+  * Note in debian/copyright that the code in math2html.py is additionally
+    licensed under the Apache License 2.0.
 
  -- Sven Hoexter <hoexter at debian.org>  Mon, 31 Jan 2011 13:30:03 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 3497d65..55148a9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -38,3 +38,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 On any Debian system, you can find the complete text of the GNU GPL
 (GNU General Public License) in the file /usr/share/common-licenses/GPL-3
 
+
+The code contained in math2html.py is additionally licensed under the terms
+of the Apache License version 2.0.
+
+On any Debian system, you can find the complete text of the Apache License
+version 2.0 in the file /usr/share/common-licenses/Apache-2.0

-- 
eLyxer - standalone LyX to html converter