[SCM] Calligra suite packaging branch, master, updated. debian/2.9.11+dfsg-4-13-gbe89875

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit be898750918c93af2d386a906503e9b637b18136
Author: Pino Toscano <pino at debian.org>
Date:   Sat Aug 19 13:05:29 2017 +0200

    update lintian overrides
---
 debian/calligra-data.lintian-overrides        | 2 ++
 debian/calligra-gemini-data.lintian-overrides | 2 ++
 debian/calligraplan.lintian-overrides         | 3 ---
 debian/changelog                              | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/calligra-data.lintian-overrides b/debian/calligra-data.lintian-overrides
new file mode 100644
index 0000000..58c413d
--- /dev/null
+++ b/debian/calligra-data.lintian-overrides
@@ -0,0 +1,2 @@
+# private font
+font-in-non-font-package
diff --git a/debian/calligra-gemini-data.lintian-overrides b/debian/calligra-gemini-data.lintian-overrides
index 3d0647a..03d715e 100644
--- a/debian/calligra-gemini-data.lintian-overrides
+++ b/debian/calligra-gemini-data.lintian-overrides
@@ -1,2 +1,4 @@
 ## texlive-fonts-extra
 package-contains-broken-symlink usr/share/kde4/apps/calligragemini/themes/default/fonts/SourceSansPro-* *
+# private font
+font-in-non-font-package
diff --git a/debian/calligraplan.lintian-overrides b/debian/calligraplan.lintian-overrides
index ae798a4..46e1aee 100644
--- a/debian/calligraplan.lintian-overrides
+++ b/debian/calligraplan.lintian-overrides
@@ -8,6 +8,3 @@ calligraplan: unusual-interpreter usr/share/kde4/apps/plan/scripts/samples/sampl
 calligraplan: unusual-interpreter usr/share/kde4/apps/plan/scripts/samples/sample_project.py #!kross
 calligraplan: unusual-interpreter usr/share/kde4/apps/plan/scripts/extensions/plan2csvexport.py #!kross
 calligraplan: unusual-interpreter usr/share/kde4/apps/plan/scripts/extensions/plan2odsexport.py #!kross
-# mpxj is not included in Debian, but if the user add it manually, calligraplan can use it
-# cf Readme.Debian for more information
-calligraplan: classpath-contains-relative-path usr/lib/kde4/planconvert/PlanConvert.jar: mpxj/*.jar:mpxj/lib/*.jar
diff --git a/debian/changelog b/debian/changelog
index 41c52f8..9916ddb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,7 @@ calligra (1:2.9.11+dfsg1-1) UNRELEASED; urgency=medium
     and some of the changes do not look correct to me.  If needed, the changes
     ought to be done upstream, so they can be properly reviewed, and
     translated too.
+  * Update lintian overrides.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jun 2017 20:54:16 +0200
 

-- 
Calligra suite packaging