This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository sweethome3d-furniture-editor.
commit 02c86592e809f20bd505143489a85cca15972fbf Author: Markus Koschany <[email protected]> Date: Mon Nov 28 23:08:36 2016 +0100 Refresh build.patch. --- debian/patches/build.patch | 105 +++++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 106 insertions(+) diff --git a/debian/patches/build.patch b/debian/patches/build.patch new file mode 100644 index 0000000..0cd1920 --- /dev/null +++ b/debian/patches/build.patch @@ -0,0 +1,105 @@ +From: Markus Koschany <[email protected]> +Date: Mon, 28 Nov 2016 23:07:38 +0100 +Subject: build + +Debianize the build system. Use only system libraries. +See also + +Bug-Debian: http://bugs.debian.org/734272 +Forwarded: not-needed +--- + build.xml | 26 ++++++++++++++++---------- + 1 file changed, 16 insertions(+), 10 deletions(-) + +diff --git a/build.xml b/build.xml +index ac89274..567ade4 100644 +--- a/build.xml ++++ b/build.xml +@@ -16,9 +16,11 @@ + description="Builds build/FurnitureLibraryEditor.jar with all its classes"> + <!-- Compile Sweet Home 3D --> + <mkdir dir="build/classes"/> ++ <!-- + <javac srcdir="../SweetHome3D/src" destdir="build/classes" + encoding="ISO-8859-1" target="1.5"> +- <!-- Use lib as an extension directory to override default Java 3D libraries --> ++ --> <!-- Use lib as an extension directory to override default Java 3D libraries --> ++ <!-- + <extdirs> + <pathelement location="../SweetHome3D/lib"/> + </extdirs> +@@ -26,13 +28,16 @@ + <pathelement location="../SweetHome3D/libtest/AppleJavaExtensions.jar"/> + <pathelement location="../SweetHome3D/libtest/jnlp.jar"/> + </classpath> +- </javac> ++ </javac>--> + <!-- Compile Furniture Library Editor --> + <javac srcdir="src" destdir="build/classes" + encoding="ISO-8859-1" target="1.5"> + <classpath> + <pathelement location="build/classes"/> +- <pathelement location="../SweetHome3D/lib/batik-svgpathparser-1.7.jar"/> ++ <pathelement location="/usr/share/sweethome3d/sweethome3d.jar"/> ++ <pathelement location="/usr/share/java/j3dcore.jar"/> ++ <pathelement location="/usr/share/java/vecmath.jar"/> ++ <pathelement location="/usr/share/java/batik-all.jar"/> + <pathelement location="../SweetHome3D/libtest/AppleJavaExtensions.jar"/> + </classpath> + </javac> +@@ -45,12 +50,12 @@ + </fileset> + </copy> + <copy todir="build/classes"> +- <fileset dir="../SweetHome3D/src"> ++ <fileset dir="build/classes-sh3d"> + <include name="**"/> + <exclude name="**/*.java"/> + <exclude name="**/package.html"/> + <exclude name="**/*_*.properties"/> +- <exclude name="com/eteks/sweethome3d/io/DefaultFurniture*.*"/> ++ <!--<exclude name="com/eteks/sweethome3d/io/DefaultFurniture*.*"/>--> + <exclude name="com/eteks/sweethome3d/io/Contributed*.*"/> + <exclude name="com/eteks/sweethome3d/io/DefaultTextures*.*"/> + <exclude name="com/eteks/sweethome3d/io/resources/**"/> +@@ -59,10 +64,10 @@ + </fileset> + </copy> + <copy todir="build/classes"> +- <fileset dir="../SweetHome3D/src"> ++ <fileset dir="build/classes-sh3d"> + <include name="**/*_fr.properties"/> + <include name="com/eteks/sweethome3d/io/resources/patterns/**"/> +- <exclude name="com/eteks/sweethome3d/io/DefaultFurniture*.*"/> ++ <!--<exclude name="com/eteks/sweethome3d/io/DefaultFurniture*.*"/>--> + <exclude name="com/eteks/sweethome3d/io/Contributed*.*"/> + <exclude name="com/eteks/sweethome3d/io/DefaultTextures*.*"/> + </fileset> +@@ -131,15 +136,16 @@ + </zip> + </target> + +- <target name="furnitureLibraryEditorJarExecutable" depends="furnitureLibraryEditor,jogl-java3d" ++ <target name="furnitureLibraryEditorJarExecutable" depends="furnitureLibraryEditor" + description="Builds FurnitureLibraryEditor-version.jar executable Jar"> + <!-- Create FurnitureLibraryEditor-version.jar containing Furniture Library Editor classes and resources, + and other DLLs and jars --> + <jar destfile="FurnitureLibraryEditor-${version}.jar"> + <manifest> +- <attribute name="Main-Class" value="com.eteks.furniturelibraryeditor.FurnitureLibraryEditorBootstrap"/> ++ <attribute name="Class-Path" value="/usr/share/java/j3dcore.jar /usr/share/java/j3dutils.jar /usr/share/java/vecmath.jar /usr/share/java/batik-all.jar /usr/share/icedtea-web/netx.jar"/> + </manifest> + <zipfileset src="build/FurnitureLibraryEditor.jar"/> ++ <!-- + <fileset dir="../SweetHome3D/lib"> + <include name="*.jar"/> + <include name="macosx/*.jar"/> +@@ -170,7 +176,7 @@ + <include name="THIRDPARTY-LICENSE-JAVA3D.TXT"/> + <include name="THIRDPARTY-LICENSE-TANGO.TXT"/> + <include name="THIRDPARTY-LICENSE-CONTRIBUTIONS.TXT"/> +- </fileset> ++ </fileset>--> + </jar> + + <!-- Clean build directory --> diff --git a/debian/patches/series b/debian/patches/series index 2c391ec..69c04cf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ no-MacOS-support.patch +build.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sweethome3d-furniture-editor.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
