[SCM] Calligra suite packaging branch, experimental, updated. debian/2.9.11+dfsg1-1-24-g292f586

[Pino Toscano]

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

The following commit has been merged in the experimental branch:
commit 7c3877a899636c7898dbf06604c2d577c926f629
Author: Pino Toscano <pino at debian.org>
Date:   Sun Aug 20 14:53:13 2017 +0200

    remove java stuff of calligraplan
---
 debian/README.source              |  7 -------
 debian/calligraplan.README.Debian | 27 ---------------------------
 debian/changelog                  |  5 +++++
 debian/control                    |  2 --
 4 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index d56c66d..c38998b 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -103,13 +103,6 @@ Required for the matlab/octave formula tool
 
 https://bitbucket.org/cyrille/cauchy
 
-Java MPXJ
-----------
-
-Required by Plan mpxj import filter
-
-http://mpxj.sourceforge.net/
-
 libqgit2
 ---------
 
diff --git a/debian/calligraplan.README.Debian b/debian/calligraplan.README.Debian
deleted file mode 100644
index 411fb77..0000000
--- a/debian/calligraplan.README.Debian
+++ /dev/null
@@ -1,27 +0,0 @@
-
-===================
-Calligra in Debian
-===================
-
-Importing MS Project and Planner files
---------------------------------------
-
-Calligraplan 2.7 uses the Java library mpxj to import MS Project and Planner
-files. Currently mpxj is not available in Debian so it needs to be installed
-manually:
-
-1. install apache-poi (needed by mpxj)::
-
-    apt-get install libapache-poi-java
-
-2. download mpxj from the official website (http://mpxj.sourceforge.net)::
-
-    wget -O mpxj-latest.zip http://sourceforge.net/projects/mpxj/files/latest/download?source=files
-    unzip mpxj-latest.zip
-
-3. when running calligraplan, point it to the location of mpxj.jar::
-
-   PLAN_CLASSPATH=mpxj/mpxj.jar calligraplan 
-
-
-.. vim:set filetype=rst:
diff --git a/debian/changelog b/debian/changelog
index c15d4e2..88e5dda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,11 @@ calligra (1:3.0.1+dfsg-0r1) UNRELEASED; urgency=medium
     - adapt path (even if not installed currently) to the font (cmex10.ttf)
       to remove
   * Update lintian overrides.
+  * calligraplan has no more Java parts, so:
+    - drop the default-jdk build dependency
+    - drop the default-jre, and libapache-poi-java recommends
+    - drop the README.Debian for calligraplan
+    - remove note about that in README.source
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 19 Aug 2017 15:51:55 +0200
 
diff --git a/debian/control b/debian/control
index af9fadb..4f1a10a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders: Adrien Grellier <perso at adrieng.fr>,
            Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake,
                debhelper (>= 9),
-               default-jdk,
                extra-cmake-modules,
                kross-dev (>= 5.7.0),
                libboost-dev,
@@ -178,7 +177,6 @@ Architecture: any
 Depends: calligra-libs (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Recommends: default-jre, libapache-poi-java
 Suggests: khelpcenter
 Homepage: http://www.calligra.org/plan/
 Description: integrated project management and planning tool

-- 
Calligra suite packaging