[jas-plotter] 04/04: Use mavenized libtablelayout-java.

[Giovanni Mascellani]

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

gio pushed a commit to branch master
in repository jas-plotter.

commit 6facf9b733db2564a65a4c8f53ad77064b62fa60
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Fri May 6 00:45:05 2016 +0200

    Use mavenized libtablelayout-java.
---
 debian/control                    |  4 ++--
 debian/patches/patch/pom.xml.diff | 14 +++++---------
 debian/patches/series             |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index 94aa7b4..52238d5 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Giovanni Mascellani <gio at debian.org>,
  Philipp Huebner <debalance at debian.org>
 Build-Depends: debhelper (>= 9), cdbs, maven-debian-helper, default-jdk
 Build-Depends-Indep: libsurefire-java (>= 2.4.3), javahelp2 (>= 2.0.05.ds1-3), junit,
- libxerces2-java, libtablelayout-java (>= 20090826)
+ libxerces2-java, libtablelayout-java (>= 20090826-3)
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/freehep/jas-plotter.git
 Vcs-Browser: https://anonscm.debian.org/git/pkg-java/freehep/jas-plotter.git
@@ -15,7 +15,7 @@ Homepage: http://java.freehep.org/jas-plotter/
 
 Package: libjas-plotter-java
 Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}, libtablelayout-java
+Depends: ${misc:Depends}, ${maven:Depends}
 Recommends: ${maven:OptionalDepends}
 Description: JAS(2) Plotter graphic library
  This library, part of the Java Analysis Studio distribution, is able to
diff --git a/debian/patches/patch/pom.xml.diff b/debian/patches/patch/pom.xml.diff
index 55c6cd7..c69f897 100644
--- a/debian/patches/patch/pom.xml.diff
+++ b/debian/patches/patch/pom.xml.diff
@@ -10,10 +10,10 @@ Signed-off-by: Gabriele Giacone <1o5g4r8o at gmail.com>
  pom.xml |   14 +++++++-------
  1 files changed, 7 insertions(+), 7 deletions(-)
 
-diff --git a/pom.xml b/pom.xml
-index ed34af3..ade5308 100644
---- a/pom.xml
-+++ b/pom.xml
+Index: jas-plotter/pom.xml
+===================================================================
+--- jas-plotter.orig/pom.xml
++++ jas-plotter/pom.xml
 @@ -29,12 +29,6 @@
    </build>
    <dependencies>
@@ -27,7 +27,7 @@ index ed34af3..ade5308 100644
        <groupId>javax.help</groupId>
        <artifactId>javahelp</artifactId>
        <version>2.0.02</version>
-@@ -48,7 +42,13 @@
+@@ -48,7 +42,11 @@
      <dependency>
        <groupId>junit</groupId>
        <artifactId>junit</artifactId>
@@ -36,11 +36,7 @@ index ed34af3..ade5308 100644
 +    <dependency>
 +      <groupId>org.debian</groupId>
 +      <artifactId>tablelayout</artifactId>
-+      <scope>system</scope>
-+      <systemPath>/usr/share/java/tablelayout.jar</systemPath>
 +    </dependency>
    </dependencies>
  
    <scm>
--- 
-tg: (220529a..) patch/pom.xml (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
index 5051613..b943ae5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 patch/XMLCharacterProperties.java.diff -p1
-patch/pom.xml.diff -p1
+patch/pom.xml.diff
 patch/tablelayout.diff -p1

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-java/freehep/jas-plotter.git