[sweethome3d-textures-editor] 08/16: Drop 00build patch
Markus Koschany
apo at moszumanska.debian.org
Mon Oct 10 13:03:55 UTC 2016
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 9bb3fdc8ca36b231f530f6243d10fb94735bda0d
Author: Markus Koschany <apo at debian.org>
Date: Mon Oct 10 14:22:48 2016 +0200
Drop 00build patch
---
debian/patches/00build | 105 -------------------------------------------------
debian/patches/series | 1 -
2 files changed, 106 deletions(-)
diff --git a/debian/patches/00build b/debian/patches/00build
deleted file mode 100644
index 9f5388d..0000000
--- a/debian/patches/00build
+++ /dev/null
@@ -1,105 +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/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">
-+-->
- <!-- Use lib as an extension directory to override default Java 3D libraries -->
-+<!--
- <extdirs>
- <pathelement location="../SweetHome3D/lib"/>
- </extdirs>
-@@ -27,11 +30,13 @@
- <pathelement location="../SweetHome3D/libtest/jnlp.jar"/>
- </classpath>
- </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="/usr/share/sweethome3d/sweethome3d.jar"/>
- </classpath>
- </javac>
-
-@@ -43,7 +48,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"/>
-@@ -57,7 +62,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*.*"/>
-@@ -126,6 +131,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,6 +140,7 @@
- <include name="COPYING.TXT"/>
- <include name="THIRDPARTY-LICENSE-TANGO.TXT"/>
- </fileset>
-+-->
- </jar>
-
- <!-- Clean build directory -->
---- a/src/com/eteks/textureslibraryeditor/TexturesLibraryEditor.java
-+++ b/src/com/eteks/textureslibraryeditor/TexturesLibraryEditor.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.sweethome3d.model.UserPreferences;
- import com.eteks.sweethome3d.swing.FileContentManager;
- import com.eteks.sweethome3d.swing.SwingTools;
-@@ -262,7 +262,7 @@ public class TexturesLibraryEditor {
- }
-
- if (OperatingSystem.isMacOSX()) {
-- MacOSXConfiguration.bindToApplicationMenu(editorController);
-+// MacOSXConfiguration.bindToApplicationMenu(editorController);
- }
-
- if (texturesLibraryName != null) {
-@@ -347,7 +347,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 +392,6 @@ public class TexturesLibraryEditor {
- }
- }
- }
-+ */
- }
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 68d1432..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-00build
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sweethome3d-textures-editor.git
More information about the pkg-java-commits
mailing list