[sweethome3d] 06/15: Drop 00build.xml.patch

Markus Koschany apo at moszumanska.debian.org
Wed Sep 13 20:25:33 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 5ed951b60b68fe68d76a61b33a686a5aaf228238
Author: Markus Koschany <apo at debian.org>
Date:   Wed Sep 13 09:49:31 2017 +0200

    Drop 00build.xml.patch
---
 debian/patches/00build.xml.patch | 39 ---------------------------------------
 debian/patches/series            |  1 -
 2 files changed, 40 deletions(-)

diff --git a/debian/patches/00build.xml.patch b/debian/patches/00build.xml.patch
deleted file mode 100644
index 217a5ac..0000000
--- a/debian/patches/00build.xml.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Sun, 5 Mar 2017 23:49:47 +0100
-Subject: 00build.xml
-
-Removes refs to macosx build and forces java libraries search path to Debian
-one (/usr/share/java)
----
- build.xml | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index 11fe502..c4bb80a 100644
---- a/build.xml
-+++ b/build.xml
-@@ -48,12 +48,14 @@
-            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"/>
-       </extdirs>
-       <classpath>
-         <pathelement location="libtest/AppleJavaExtensions.jar"/>
-         <pathelement location="libtest/jnlp.jar"/>
-       </classpath>
-+      <exclude name="com/eteks/sweethome3d/MacOSXConfiguration.java"/>
-     </javac>
- 
-     <!-- Copy resources excepted furniture, textures and help files -->
-@@ -448,7 +450,7 @@
-     <echo message="deploy dir ready for ftp"/>
-   </target>
- 
--  <target name="jarExecutable" depends="application,furniture,textures,help,jogl-java3d"
-+  <target name="jarExecutable" depends="application,furniture,textures,help"
-           description="Builds install/SweetHome3D-version.jar executable Jar">
-     <!-- Create SweetHome3D-version.jar containing Sweet Home 3D classes and resources,
-          and other DLLs and jars -->
diff --git a/debian/patches/series b/debian/patches/series
index 21cdac0..fd999d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-00build.xml.patch
 01noMacOSX
 02noadditionalprovisions
 03novideo.patch

-- 
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