[sweethome3d-textures-editor] 09/16: Rebase 00build patch and rename it to build.patch

[Markus Koschany]

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

apo pushed a commit to branch master
in repository sweethome3d-textures-editor.

commit 64f57538cf7f6379e5d5f35089aeb7eb9930410d
Author: Markus Koschany <apo at debian.org>
Date:   Mon Oct 10 14:29:52 2016 +0200

    Rebase 00build patch and rename it to build.patch
---
 debian/patches/build.patch | 115 +++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |   1 +
 2 files changed, 116 insertions(+)

diff --git a/debian/patches/build.patch b/debian/patches/build.patch
new file mode 100644
index 0000000..cbc2d9f
--- /dev/null
+++ b/debian/patches/build.patch
@@ -0,0 +1,115 @@
+From: Markus Koschany <apo at debian.org>
+Date: Mon, 10 Oct 2016 14:29:30 +0200
+Subject: build
+
+Forwarded: not-needed
+---
+ build.xml                                                 | 15 +++++++++------
+ .../textureslibraryeditor/TexturesLibraryEditor.java      |  6 +-----
+ 2 files changed, 10 insertions(+), 11 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index ddb0d30..a2b9e7a 100644
+--- a/build.xml
++++ b/build.xml
+@@ -16,9 +16,11 @@
+           description="Builds build/TexturesLibraryEditor.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">
++           encoding="ISO-8859-1" target="1.5">-->
+       <!-- Use lib as an extension directory to override default Java 3D libraries -->
++      <!--
+       <extdirs>
+         <pathelement location="../SweetHome3D/lib"/>
+       </extdirs>
+@@ -26,13 +28,13 @@
+         <pathelement location="../SweetHome3D/libtest/AppleJavaExtensions.jar"/>
+         <pathelement location="../SweetHome3D/libtest/jnlp.jar"/>
+       </classpath>
+-    </javac>
++    </javac>-->
+     <!-- Compile Textures Library Editor -->
+     <javac srcdir="src" destdir="build/classes"
+            encoding="ISO-8859-1" target="1.5">
+       <classpath>
+         <pathelement location="build/classes"/>
+-        <pathelement location="../SweetHome3D/libtest/AppleJavaExtensions.jar"/>
++        <pathelement location="/usr/share/sweethome3d/sweethome3d.jar"/>
+       </classpath>
+     </javac>
+     
+@@ -44,7 +46,7 @@
+       </fileset>
+     </copy>
+     <copy todir="build/classes">
+-      <fileset dir="../SweetHome3D/src">
++      <fileset dir="build/classes-sh3d">
+         <include name="**"/>
+         <exclude name="**/*.java"/>
+         <exclude name="**/package.html"/> 
+@@ -58,7 +60,7 @@
+       </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*.*"/>
+@@ -127,6 +129,7 @@
+         <attribute name="Main-Class" value="com.eteks.textureslibraryeditor.TexturesLibraryEditorBootstrap"/>
+       </manifest>
+       <zipfileset src="build/TexturesLibraryEditor.jar"/>
++<!--
+       <fileset dir="../SweetHome3D/libtest">
+         <include name="jnlp.jar"/>
+       </fileset>
+@@ -134,7 +137,7 @@
+         <include name="LICENSE.TXT"/>
+         <include name="COPYING.TXT"/>
+         <include name="THIRDPARTY-LICENSE-TANGO.TXT"/>
+-      </fileset>
++      </fileset>-->
+     </jar>
+  
+     <!-- Clean build directory -->
+diff --git a/src/com/eteks/textureslibraryeditor/TexturesLibraryEditor.java b/src/com/eteks/textureslibraryeditor/TexturesLibraryEditor.java
+index 98285fe..e63ad77 100644
+--- a/src/com/eteks/textureslibraryeditor/TexturesLibraryEditor.java
++++ b/src/com/eteks/textureslibraryeditor/TexturesLibraryEditor.java
+@@ -43,9 +43,6 @@ import javax.swing.KeyStroke;
+ import javax.swing.SwingUtilities;
+ import javax.swing.UIManager;
+ 
+-import com.apple.eawt.Application;
+-import com.apple.eawt.ApplicationAdapter;
+-import com.apple.eawt.ApplicationEvent;
+ import com.eteks.sweethome3d.model.UserPreferences;
+ import com.eteks.sweethome3d.swing.FileContentManager;
+ import com.eteks.sweethome3d.swing.SwingTools;
+@@ -262,7 +259,6 @@ public class TexturesLibraryEditor {
+     }
+     
+     if (OperatingSystem.isMacOSX()) {
+-      MacOSXConfiguration.bindToApplicationMenu(editorController);
+     }
+   
+     if (texturesLibraryName != null) {
+@@ -347,7 +343,6 @@ public class TexturesLibraryEditor {
+   private static class MacOSXConfiguration {
+     /**
+      * Binds <code>controller</code> to Mac OS X application menu.
+-     */
+     public static void bindToApplicationMenu(final EditorController controller) {
+       Application macosxApplication = Application.getApplication();
+       // Add a listener to Mac OS X application that will call controller methods
+@@ -393,5 +388,6 @@ public class TexturesLibraryEditor {
+         }
+       }
+     }
++     */
+   }
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5879227
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+build.patch

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