[SCM] Calligra suite packaging branch, master, updated. debian/2.8.5+dfsg-1-28-g7ffadc4

[Dmitry Smirnov]

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

The following commit has been merged in the master branch:
commit 7ffadc41ad7084d24dfedd87d1d266e5edb56a15
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Wed Jun 17 18:50:29 2015 +1000

    calligraplan: do not install "PlanConvert.jar":
    
     "PlanConvert.jar" is a pre-built file removed from repacked DFSG-compliant
     orig.tar. We can not re-build it because it needs "mpxj" which is not
     available in Debian. More details in "README.PACKAGERS".
---
 debian/calligraplan.install | 2 +-
 debian/changelog            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/calligraplan.install b/debian/calligraplan.install
index d170484..f64b136 100644
--- a/debian/calligraplan.install
+++ b/debian/calligraplan.install
@@ -3,7 +3,7 @@ usr/bin/calligraplanwork
 usr/lib/kde4/calligra_filter_mpxj2plan.so
 usr/lib/kde4/kplatorcpsscheduler.so
 usr/lib/kde4/krossmoduleplan.so
-usr/lib/kde4/planconvert/PlanConvert.jar
+##usr/lib/kde4/planconvert/PlanConvert.jar
 usr/lib/kde4/planicalexport.so
 usr/lib/kde4/plankplatoimport.so
 usr/lib/kde4/planpart.so
diff --git a/debian/changelog b/debian/changelog
index 58e4247..9de2331 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ calligra (1:2.9.5+dfsg-1) UNRELEASED; urgency=low
     + libkoversion.so.1*
   * krita.install:
     + libkritacolor.so.1*
+  * calligraplan: do not install "PlanConvert.jar".
   * Updated "package-name-doesnt-match-sonames" lintian-overrides.
   * Added "no-symbols-control-file" lintian-overrides.
   * Converted "debian/prune-nonfree" target to "copyright/Files-Excluded";

-- 
Calligra suite packaging