[med-svn] [megan-ce] 02/02: Add further classes recommended by Felix Natter

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository megan-ce.

commit c66638c7c4dbb3c0305e0e252e4137f72a2e5cc4
Author: Andreas Tille <tille at debian.org>
Date:   Sat May 20 20:52:30 2017 +0200

    Add further classes recommended by Felix Natter
---
 debian/control                      | 5 ++++-
 debian/manifest                     | 2 +-
 debian/patches/fix_class_path.patch | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index fe2e23c..aa0af42 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,11 @@ Build-Depends: debhelper (>= 10),
                ant,
                libjloda-java (>= 0.0+20170502),
                libcolt-free-java,
+               libcommons-codec-java,
                libcommons-math3-java (>= 3.6.1),
                libopenjfx-java,
+               libjama-java,
+               libspring-web-java,
                libgoogle-gson-java,
 # Source contains jar of libgoogle-gson-java version 2.6.2 while Debian has only 2.4
 Standards-Version: 3.9.8
@@ -20,7 +23,7 @@ Homepage: https://github.com/danielhuson/megan-ce
 
 Package: megan-ce
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends: ${java:Depends},
          ${misc:Depends}
 Description: MEGAN Community Edition
  MEGAN Community Edition - Interactive exploration and analysis of large-
diff --git a/debian/manifest b/debian/manifest
index 5b60c58..c5a7c3d 100644
--- a/debian/manifest
+++ b/debian/manifest
@@ -1,3 +1,3 @@
 /usr/share/java/megan-ce.jar:
  Main-Class: megan-ce.MeganRun
- Class-Path: /usr/share/java/jloda.jar /usr/share/java/colt.jar /usr/share/java/commons-math3.jar /usr/share/java/gson.jar /usr/share/java/openjfx/jre/lib/ext/jfxrt.jar
+ Class-Path: /usr/share/java/jloda.jar /usr/share/java/colt.jar /usr/share/java/commons-codec.jar /usr/share/java/commons-math3.jar /usr/share/java/gson.jar /usr/share/java/openjfx/jre/lib/ext/jfxrt.jar /usr/share/java/jama.jar /usr/share/java/spring3-web.jar
diff --git a/debian/patches/fix_class_path.patch b/debian/patches/fix_class_path.patch
index 17d7774..ca322cb 100644
--- a/debian/patches/fix_class_path.patch
+++ b/debian/patches/fix_class_path.patch
@@ -5,14 +5,17 @@ Description: Somehow  CLASS_PATH in debian/rules is not used during build
 
 --- a/antbuild/build.xml
 +++ b/antbuild/build.xml
-@@ -21,7 +21,10 @@
+@@ -21,7 +21,13 @@
  
      <path id="build.classpath">
          <fileset dir="/usr/share/java/"  includes="jloda.jar"/>
 -
 +        <fileset dir="/usr/share/java/"  includes="colt.jar"/>
++        <fileset dir="/usr/share/java/"  includes="commons-codec.jar"/>
 +        <fileset dir="/usr/share/java/"  includes="commons-math3.jar"/>
 +        <fileset dir="/usr/share/java/"  includes="gson.jar"/>
++        <fileset dir="/usr/share/java/"  includes="jama.jar"/>
++        <fileset dir="/usr/share/java/"  includes="spring3-web.jar"/>
 +        <fileset dir="/usr/share/java/openjfx/jre/lib/ext"  includes="jfxrt.jar"/>
      </path>
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/megan-ce.git