[libmtj-java] 02/03: add libguava-jar and fix build path

[Olivier Sallou]

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

osallou pushed a commit to branch master
in repository libmtj-java.

commit bfb82103b87fb617fa086edd7303630fd87f8d4f
Author: Olivier Sallou <osallou at debian.org>
Date:   Fri Sep 4 08:42:28 2015 +0000

    add libguava-jar and fix build path
---
 debian/control                            | 3 ++-
 debian/patches/use_debian_jar_files.patch | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 6ca3d89..93b98b4 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Build-Depends: debhelper (>= 9),
                default-jdk (>= 1:1.6),
                ant,
                libnetlib-java,
-               libopencsv-java
+               libopencsv-java,
+               libguava-java
 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-java/libmtj-java.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/libmtj-java.git
diff --git a/debian/patches/use_debian_jar_files.patch b/debian/patches/use_debian_jar_files.patch
index 54634cb..c8bfb89 100644
--- a/debian/patches/use_debian_jar_files.patch
+++ b/debian/patches/use_debian_jar_files.patch
@@ -8,7 +8,7 @@ Subject: use_debian_jar_files
 
 --- a/build.xml
 +++ b/build.xml
-@@ -2,18 +2,28 @@
+@@ -2,18 +2,32 @@
  <project name="Matrix_Toolkits_for_Java" default="default" basedir=".">
      <description>Builds, tests, and runs the project Matrix Toolkits for Java.</description>
      <property name="version" value="dev" />
@@ -36,6 +36,10 @@ Subject: use_debian_jar_files
 +                                <include name="junit.jar"/>
 +                                <include name="f2jutil.jar"/>
 +                                <include name="netlib-java.jar"/>
++                                <include name="guava.jar"/>
++                        </fileset>
++                        <fileset dir="/usr/share/maven-repo/net/sf/opencsv/opencsv/debian">
++                                <include name="opencsv-debian.jar"/>
 +                        </fileset>
 +     </path>
 +

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libmtj-java.git