[sweethome3d] 12/15: Fix build.patch

Markus Koschany apo at moszumanska.debian.org
Wed Sep 13 20:25:34 UTC 2017


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

apo pushed a commit to branch master
in repository sweethome3d.

commit eb4333f093bdcae943a373a875e41c9d2af73311
Author: Markus Koschany <apo at debian.org>
Date:   Wed Sep 13 21:24:48 2017 +0200

    Fix build.patch
---
 debian/patches/build.patch | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index b321212..710ceec 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -7,25 +7,27 @@ Subject: build
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/build.xml b/build.xml
-index c079b4f..9425cc0 100644
+index c079b4f..87c0df8 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -404,12 +404,14 @@
-       <include name="com/eteks/sweethome3d/io/DefaultPatternTexture.java"/>
+@@ -49,7 +49,8 @@
+            debug="false" debuglevel="lines,vars,source">
        <!-- Use lib as an extension directory to override default Java 3D libraries -->
        <extdirs>
 -        <pathelement location="lib"/>
-+        <pathelement location="/usr/share/java"/>
-+        <pathelement location="/usr/share/icedtea-web"/>
++          <pathelement location="/usr/share/java"/>
++          <pathelement location="/usr/share/icedtea-web"/>
        </extdirs>
        <classpath>
          <pathelement location="libtest/AppleJavaExtensions.jar"/>
-         <pathelement location="libtest/jnlp.jar"/>
+@@ -57,6 +58,7 @@
        </classpath>
+       <exclude name="com/eteks/sweethome3d/swing/VideoPanel.java"/>
+       <exclude name="com/eteks/sweethome3d/viewcontroller/VideoController.java"/>
 +      <exclude name="com/eteks/sweethome3d/MacOSXConfiguration.java"/>
      </javac>
  
-     <!-- Copy only resources used by viewer -->
+     <!-- Copy resources excepted furniture, textures and help files -->
 @@ -461,7 +463,7 @@
      <echo message="deploy dir ready for ftp"/>
    </target>

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



More information about the pkg-java-commits mailing list