[freehep-graphics2d] 03/07: Add classpath patch and refresh all patches.

Giovanni Mascellani gio at moszumanska.debian.org
Tue Jun 7 15:31:52 UTC 2016


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

gio pushed a commit to branch master
in repository freehep-graphics2d.

commit 205e5efd3bd081fc7552944eac392f4ff7ef63c4
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Tue Jun 7 17:07:32 2016 +0200

    Add classpath patch and refresh all patches.
---
 debian/patches/classpath.diff   | 25 +++++++++++++++++++++++++
 debian/patches/pom.xml.diff     | 10 ++++------
 debian/patches/series           |  1 +
 debian/patches/sweethome3d.diff | 12 +++++-------
 4 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/debian/patches/classpath.diff b/debian/patches/classpath.diff
new file mode 100644
index 0000000..4f36601
--- /dev/null
+++ b/debian/patches/classpath.diff
@@ -0,0 +1,25 @@
+From: Giovanni Mascellani <gio at debian.org>
+Subject: Add classpath to compiled JAR
+Index: freehep-graphics2d/pom.xml
+===================================================================
+--- freehep-graphics2d.orig/pom.xml
++++ freehep-graphics2d/pom.xml
+@@ -120,6 +120,18 @@
+           <packageName>org.freehep.graphics2d.font</packageName>
+         </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>
+ </project>
diff --git a/debian/patches/pom.xml.diff b/debian/patches/pom.xml.diff
index 0c540be..5171220 100644
--- a/debian/patches/pom.xml.diff
+++ b/debian/patches/pom.xml.diff
@@ -9,10 +9,10 @@ Signed-off-by: Gabriele Giacone <losgarbo at libero.it>
  pom.xml | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/pom.xml b/pom.xml
-index 9196988..e6cb900 100644
---- a/pom.xml
-+++ b/pom.xml
+Index: freehep-graphics2d/pom.xml
+===================================================================
+--- freehep-graphics2d.orig/pom.xml
++++ freehep-graphics2d/pom.xml
 @@ -28,6 +28,7 @@
        <plugin>
          <groupId>org.freehep</groupId>
@@ -21,5 +21,3 @@ index 9196988..e6cb900 100644
          <executions>
            <execution>
              <id>Expert</id>
--- 
-tg: (e8c0074..) patch/pom.xml (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
index a761daf..f99bd43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 pom.xml.diff
 sweethome3d.diff
+classpath.diff
diff --git a/debian/patches/sweethome3d.diff b/debian/patches/sweethome3d.diff
index 9678a3b..4dba558 100644
--- a/debian/patches/sweethome3d.diff
+++ b/debian/patches/sweethome3d.diff
@@ -9,11 +9,11 @@ Signed-off-by: Gabriele Giacone <1o5g4r8o at gmail.com>
  src/main/java/org/freehep/graphics2d/PixelGraphics2D.java | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/src/main/java/org/freehep/graphics2d/PixelGraphics2D.java b/src/main/java/org/freehep/graphics2d/PixelGraphics2D.java
-index 39b20a7..edddaac 100644
---- a/src/main/java/org/freehep/graphics2d/PixelGraphics2D.java
-+++ b/src/main/java/org/freehep/graphics2d/PixelGraphics2D.java
-@@ -100,6 +100,8 @@ public class PixelGraphics2D extends AbstractVectorGraphics {
+Index: freehep-graphics2d/src/main/java/org/freehep/graphics2d/PixelGraphics2D.java
+===================================================================
+--- freehep-graphics2d.orig/src/main/java/org/freehep/graphics2d/PixelGraphics2D.java
++++ freehep-graphics2d/src/main/java/org/freehep/graphics2d/PixelGraphics2D.java
+@@ -100,6 +100,8 @@ public class PixelGraphics2D extends Abs
              Method method = clazz.getMethod("isDisplayLocal", null);
              Boolean result = (Boolean) method.invoke(null, null);
              displayLocal = result.booleanValue();
@@ -22,5 +22,3 @@ index 39b20a7..edddaac 100644
          } catch (ClassNotFoundException e) {
              // Windows case...
              displayLocal = true;
--- 
-tg: (3be56d0..) patch/sweethome3d (depends on: master)

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



More information about the pkg-java-commits mailing list