[SCM] Calligra suite packaging branch, master, updated. debian/2.7.5-1-66-ga408564

[Adrien Grellier]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=a408564

The following commit has been merged in the master branch:
commit a4085641dce117bc062e57ac29282b1cf103169a
Author: Adrien Grellier <perso at adrieng.fr>
Date:   Fri May 9 12:15:11 2014 +0200

    move html2ods.so from calligrawords to calligrasheets
---
 debian/calligrasheets.install | 1 +
 debian/calligrawords.install  | 1 -
 debian/changelog              | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/calligrasheets.install b/debian/calligrasheets.install
index 55125c8..9a09c5c 100644
--- a/debian/calligrasheets.install
+++ b/debian/calligrasheets.install
@@ -3,6 +3,7 @@ usr/lib/kde4/calligra_filter_applixspread2kspread.so
 usr/lib/kde4/calligra_filter_csv2sheets.so
 usr/lib/kde4/calligra_filter_dbase2kspread.so
 usr/lib/kde4/calligra_filter_gnumeric2sheets.so
+usr/lib/kde4/calligra_filter_html2ods.so
 usr/lib/kde4/calligra_filter_kspread2tex.so
 usr/lib/kde4/calligra_filter_opencalc2sheets.so
 usr/lib/kde4/calligra_filter_qpro2sheets.so
diff --git a/debian/calligrawords.install b/debian/calligrawords.install
index efe8644..853e115 100644
--- a/debian/calligrawords.install
+++ b/debian/calligrawords.install
@@ -3,7 +3,6 @@ usr/lib/kde4/calligra_filter_applixword2odt.so
 usr/lib/kde4/calligra_filter_ascii2words.so
 usr/lib/kde4/calligra_filter_doc2odt.so
 usr/lib/kde4/calligra_filter_docx2odt.so
-usr/lib/kde4/calligra_filter_html2ods.so
 usr/lib/kde4/calligra_filter_odt2ascii.so
 usr/lib/kde4/calligra_filter_odt2epub2.so
 usr/lib/kde4/calligra_filter_odt2html.so
diff --git a/debian/changelog b/debian/changelog
index 8c25bec..718d395 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ calligra (1:2.8.2-1) UNRELEASED; urgency=medium
   * update to Standards-Version 3.9.5 (no changes)
   * update copyright information for beta3
   * patch to build using xbase64, thanks Matthias Klose! (Closes: #746227)
+  * move html2ods.so from calligrawords to calligrasheets, thanks shadeslayer!
 
   [ Pino Toscano ]
   * Add the pkg-config build dependency.

-- 
Calligra suite packaging