[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.3-2-6-gdcdd96d



The following commit has been merged in the master branch:
commit f2452ede877c86abe0d728be251efee5bccd7505
Author: Rene Engelhard <rene@debian.org>
Date:   Mon May 13 23:49:16 2013 +0200

    mention swext/mediawiki/src/filter/odt2mediawiki.xsl copyright/license

diff --git a/changelog b/changelog
index e0cdb89..0c38951 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,8 @@ libreoffice (1:4.0.3-3) UNRELEASED; urgency=low
 
   * debian/control.in, debian/rules:  
     - depend on fonts-dejavu instead of ttf-dejavu (closes: #708062) 
+  * debian/copyright:
+    - mention swext/mediawiki/src/filter/odt2mediawiki.xsl copyright/license 
 
  -- Rene Engelhard <rene@debian.org>  Sun, 12 May 2013 22:36:01 +0200
 
diff --git a/copyright b/copyright
index f4642e6..26c79e5 100644
--- a/copyright
+++ b/copyright
@@ -13,6 +13,10 @@ Files: */*.mk
 Files: solenv/gbuild/*.mk
 License: MPL-2.0
 
+Files: swext/mediawiki/src/filter/odt2mediawiki.xsl
+Copyright: Copyright (C) 2007  Bernhard Haumacher (haui@haumacher.de)
+License: GPL-2+
+
 Files: debian/*
 Copyright: Copyright (C) 2002-2009 Software in the Public Interest, Inc.
 License: GPL-2

-- 
LibreOffice packaging repository


Reply to: