[jas-plotter] 03/03: Other patches reorganization.

[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 1e7d313b1c642d1bfa5146b9804b9939b256e8cd
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sun May 8 15:57:59 2016 +0200

    Other patches reorganization.
---
 debian/patches/XMLCharacterProperties.java.diff |  2 +-
 debian/patches/pom.xml.diff                     | 19 -------------------
 debian/patches/series                           |  1 -
 debian/patches/tablelayout.diff                 | 17 +++++++++++++++++
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/debian/patches/XMLCharacterProperties.java.diff b/debian/patches/XMLCharacterProperties.java.diff
index 5409157..2566c73 100644
--- a/debian/patches/XMLCharacterProperties.java.diff
+++ b/debian/patches/XMLCharacterProperties.java.diff
@@ -2,7 +2,7 @@ From: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
 Subject: Substitute for XMLCharacterProperties.java
 
 The original file is not compatible with LGPL.
-Idex: jas-plotter/src/main/java/jas/util/xml/XMLCharacterProperties.java
+Index: jas-plotter/src/main/java/jas/util/xml/XMLCharacterProperties.java
 ===================================================================
 --- /dev/null
 +++ jas-plotter/src/main/java/jas/util/xml/XMLCharacterProperties.java
diff --git a/debian/patches/pom.xml.diff b/debian/patches/pom.xml.diff
deleted file mode 100644
index fec3214..0000000
--- a/debian/patches/pom.xml.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Gabriele Giacone <1o5g4r8o at gmail.com>
-Subject: Add dependency on Debian libtablelayout
-Index: jas-plotter/pom.xml
-===================================================================
---- jas-plotter.orig/pom.xml
-+++ jas-plotter/pom.xml
-@@ -48,7 +60,11 @@
-     <dependency>
-       <groupId>junit</groupId>
-       <artifactId>junit</artifactId>
--   </dependency>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.debian</groupId>
-+      <artifactId>tablelayout</artifactId>
-+    </dependency>
-   </dependencies>
- 
-   <scm>
diff --git a/debian/patches/series b/debian/patches/series
index f5774b4..c7c2e83 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 XMLCharacterProperties.java.diff
-pom.xml.diff
 tablelayout.diff
 classpath.diff
diff --git a/debian/patches/tablelayout.diff b/debian/patches/tablelayout.diff
index 082a2fc..21ba7c2 100644
--- a/debian/patches/tablelayout.diff
+++ b/debian/patches/tablelayout.diff
@@ -13,3 +13,20 @@ Index: jas-plotter/src/main/java/jas/hist/JASHistPropertyDialog.java
  
  
  public final class JASHistPropertyDialog extends PropertyDialog
+Index: jas-plotter/pom.xml
+===================================================================
+--- jas-plotter.orig/pom.xml
++++ jas-plotter/pom.xml
+@@ -48,7 +48,11 @@
+     <dependency>
+       <groupId>junit</groupId>
+       <artifactId>junit</artifactId>
+-   </dependency>
++    </dependency>
++    <dependency>
++      <groupId>org.debian</groupId>
++      <artifactId>tablelayout</artifactId>
++    </dependency>
+   </dependencies>
+ 
+   <scm>

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