[jas-plotter] 02/03: Reorganize patches.

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

    Reorganize patches.
---
 debian/patches/XMLCharacterProperties.java.diff | 13 +++--------
 debian/patches/{pom.xml.diff => classpath.diff} | 27 ++-------------------
 debian/patches/pom.xml.diff                     | 31 +------------------------
 debian/patches/series                           |  1 +
 debian/patches/tablelayout.diff                 | 12 +---------
 5 files changed, 8 insertions(+), 76 deletions(-)

diff --git a/debian/patches/XMLCharacterProperties.java.diff b/debian/patches/XMLCharacterProperties.java.diff
index 19e5e0b..5409157 100644
--- a/debian/patches/XMLCharacterProperties.java.diff
+++ b/debian/patches/XMLCharacterProperties.java.diff
@@ -1,15 +1,8 @@
 From: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
-Subject: [PATCH] patch/XMLCharacterProperties.java
+Subject: Substitute for XMLCharacterProperties.java
 
-Substitute for XMLCharacterProperties.java, which is not compatible with LGPL.
-
-Signed-off-by: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
-
----
- .../java/jas/util/xml/XMLCharacterProperties.java  |   80 ++++++++++++++++++++
- 1 files changed, 80 insertions(+), 0 deletions(-)
-
-Index: jas-plotter/src/main/java/jas/util/xml/XMLCharacterProperties.java
+The original file is not compatible with LGPL.
+Idex: 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/classpath.diff
similarity index 53%
copy from debian/patches/pom.xml.diff
copy to debian/patches/classpath.diff
index a1c1e82..2a623ab 100644
--- a/debian/patches/pom.xml.diff
+++ b/debian/patches/classpath.diff
@@ -1,15 +1,5 @@
-From: Gabriele Giacone <1o5g4r8o at gmail.com>
-Subject: [PATCH] patch/pom.xml
-
- - Removed dependence on freehep-export (cyclic dependency)
- - Added dependence on Debian libtablelayout
-
-Signed-off-by: Gabriele Giacone <1o5g4r8o at gmail.com>
-
----
- pom.xml |   14 +++++++-------
- 1 files changed, 7 insertions(+), 7 deletions(-)
-
+From: Giovanni Mascellani <gio at debian.org>
+Subject: Add classpath to compiled JAR
 Index: jas-plotter/pom.xml
 ===================================================================
 --- jas-plotter.orig/pom.xml
@@ -33,16 +23,3 @@ Index: jas-plotter/pom.xml
      </plugins>
    </build>
    <dependencies>
-@@ -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/pom.xml.diff b/debian/patches/pom.xml.diff
index a1c1e82..fec3214 100644
--- a/debian/patches/pom.xml.diff
+++ b/debian/patches/pom.xml.diff
@@ -1,38 +1,9 @@
 From: Gabriele Giacone <1o5g4r8o at gmail.com>
-Subject: [PATCH] patch/pom.xml
-
- - Removed dependence on freehep-export (cyclic dependency)
- - Added dependence on Debian libtablelayout
-
-Signed-off-by: Gabriele Giacone <1o5g4r8o at gmail.com>
-
----
- pom.xml |   14 +++++++-------
- 1 files changed, 7 insertions(+), 7 deletions(-)
-
+Subject: Add dependency on Debian libtablelayout
 Index: jas-plotter/pom.xml
 ===================================================================
 --- jas-plotter.orig/pom.xml
 +++ jas-plotter/pom.xml
-@@ -25,6 +25,18 @@
-           <skip>true</skip>
-         </configuration>
-       </plugin>
-+      <plugin>
-+        <artifactId>maven-jar-plugin</artifactId>
-+        <configuration>
-+          <archive>
-+            <manifest>
-+              <addClasspath>true</addClasspath>
-+              <classpathLayoutType>repository</classpathLayoutType>
-+              <classpathPrefix>/usr/share/maven-repo</classpathPrefix>
-+            </manifest>
-+          </archive>
-+        </configuration>
-+      </plugin>
-     </plugins>
-   </build>
-   <dependencies>
 @@ -48,7 +60,11 @@
      <dependency>
        <groupId>junit</groupId>
diff --git a/debian/patches/series b/debian/patches/series
index 20586e5..f5774b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 XMLCharacterProperties.java.diff
 pom.xml.diff
 tablelayout.diff
+classpath.diff
diff --git a/debian/patches/tablelayout.diff b/debian/patches/tablelayout.diff
index 4dab953..082a2fc 100644
--- a/debian/patches/tablelayout.diff
+++ b/debian/patches/tablelayout.diff
@@ -1,15 +1,5 @@
 From: Gabriele Giacone <1o5g4r8o at gmail.com>
-Subject: [PATCH] patch/tablelayout
-
-To compile against Debian libtablelayout-java under
-/usr/share/java/tablelayout.jar
-
-Signed-off-by: Gabriele Giacone <1o5g4r8o at gmail.com>
-
----
- src/main/java/jas/hist/JASHistPropertyDialog.java |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
+Subject: Compile against Debian libtablelayout-java
 Index: jas-plotter/src/main/java/jas/hist/JASHistPropertyDialog.java
 ===================================================================
 --- jas-plotter.orig/src/main/java/jas/hist/JASHistPropertyDialog.java

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