[sweethome3d-furniture-editor] 04/12: Drop 00build 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-furniture-editor.

commit 9adf359b4cb0cea82bec9544e2af36c600b6bd9b
Author: Markus Koschany <apo at debian.org>
Date:   Sun Oct 9 22:30:35 2016 +0200

    Drop 00build patch.
---
 debian/patches/00build | 118 -------------------------------------------------
 debian/patches/series  |   1 -
 2 files changed, 119 deletions(-)

diff --git a/debian/patches/00build b/debian/patches/00build
deleted file mode 100644
index 3d2e9f1..0000000
--- a/debian/patches/00build
+++ /dev/null
@@ -1,118 +0,0 @@
-Description: Use system libraries and ignore macosx.
-Author: Gabriele Giacone <1o5g4r8o at gmail.com>
-
---- a/build.xml
-+++ b/build.xml
-@@ -16,9 +16,12 @@
-           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 -->
-+<!--
-       <extdirs>
-         <pathelement location="../SweetHome3D/lib"/>
-       </extdirs>
-@@ -27,12 +30,16 @@
-         <pathelement location="../SweetHome3D/libtest/jnlp.jar"/>
-       </classpath>
-     </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-parser.jar"/>
-       </classpath>
-     </javac>
-     
-@@ -44,7 +51,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 +65,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*.*"/>
-@@ -129,7 +136,7 @@
-     </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 -->
-@@ -138,6 +145,7 @@
-         <attribute name="Main-Class" value="com.eteks.furniturelibraryeditor.FurnitureLibraryEditorBootstrap"/>
-       </manifest>
-       <zipfileset src="build/FurnitureLibraryEditor.jar"/>
-+<!--
-       <fileset dir="../SweetHome3D/lib">
-         <include name="windows/**/*.dll"/>
-         <include name="linux/**/*.so"/>
-@@ -166,6 +174,7 @@
-         <include name="THIRDPARTY-LICENSE-TANGO.TXT"/>
-         <include name="THIRDPARTY-LICENSE-CONTRIBUTIONS.TXT"/>
-       </fileset>
-+-->
-     </jar>
-  
-     <!-- Clean build directory -->
---- a/src/com/eteks/furniturelibraryeditor/FurnitureLibraryEditor.java
-+++ b/src/com/eteks/furniturelibraryeditor/FurnitureLibraryEditor.java
-@@ -43,9 +43,9 @@ 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.apple.eawt.Application;
-+//import com.apple.eawt.ApplicationAdapter;
-+//import com.apple.eawt.ApplicationEvent;
- import com.eteks.furniturelibraryeditor.io.FileFurnitureLibraryUserPreferences;
- import com.eteks.furniturelibraryeditor.io.FurnitureLibraryFileRecorder;
- import com.eteks.furniturelibraryeditor.model.FurnitureLibrary;
-@@ -262,7 +262,7 @@ public class FurnitureLibraryEditor {
-     }
-     
-     if (OperatingSystem.isMacOSX()) {
--      MacOSXConfiguration.bindToApplicationMenu(editorController);
-+//      MacOSXConfiguration.bindToApplicationMenu(editorController);
-     }
-   
-     if (furnitureLibraryName != null) {
-@@ -347,7 +347,6 @@ public class FurnitureLibraryEditor {
-   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 +392,6 @@ public class FurnitureLibraryEditor {
-         }
-       }
-     }
-+     */
-   }
- }
diff --git a/debian/patches/series b/debian/patches/series
index df765a6..a8d02b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-00build
 01manifest
 02missingclass
 batik.patch

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