[sweethome3d-furniture-editor] 01/04: Refresh patches.

Gabriele Giacone gg0-guest at moszumanska.debian.org
Sun Jan 5 17:07:56 UTC 2014


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

gg0-guest pushed a commit to branch master
in repository sweethome3d-furniture-editor.

commit 6db502bc14431df3242d6548b4a3d23ba545e160
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sun Jan 5 17:23:59 2014 +0100

    Refresh patches.
---
 debian/patches/00build    | 12 ++++++------
 debian/patches/01manifest |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/00build b/debian/patches/00build
index 0c1f66e..306f6d2 100644
--- a/debian/patches/00build
+++ b/debian/patches/00build
@@ -52,7 +52,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
          <include name="**/*_fr.properties"/>
          <include name="com/eteks/sweethome3d/io/resources/patterns/**"/>
          <exclude name="com/eteks/sweethome3d/io/DefaultFurniture*.*"/>
-@@ -117,6 +124,7 @@
+@@ -125,6 +132,7 @@
          <attribute name="Main-Class" value="com.eteks.furniturelibraryeditor.FurnitureLibraryEditorBootstrap"/>
        </manifest>
        <zipfileset src="build/FurnitureLibraryEditor.jar"/>
@@ -60,7 +60,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
        <fileset dir="../SweetHome3D/lib">
          <include name="windows/**/*.dll"/>
          <include name="linux/**/*.so"/>
-@@ -141,6 +149,7 @@
+@@ -149,6 +157,7 @@
          <include name="THIRDPARTY-LICENSE-TANGO.TXT"/>
          <include name="THIRDPARTY-LICENSE-CONTRIBUTIONS.TXT"/>
        </fileset>
@@ -70,7 +70,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
      <!-- Clean build directory -->
 --- a/src/com/eteks/furniturelibraryeditor/FurnitureLibraryEditor.java
 +++ b/src/com/eteks/furniturelibraryeditor/FurnitureLibraryEditor.java
-@@ -41,9 +41,9 @@ import javax.swing.KeyStroke;
+@@ -43,9 +43,9 @@ import javax.swing.KeyStroke;
  import javax.swing.SwingUtilities;
  import javax.swing.UIManager;
  
@@ -83,7 +83,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  import com.eteks.furniturelibraryeditor.io.FileFurnitureLibraryUserPreferences;
  import com.eteks.furniturelibraryeditor.io.FurnitureLibraryFileRecorder;
  import com.eteks.furniturelibraryeditor.model.FurnitureLibrary;
-@@ -251,7 +251,7 @@ public class FurnitureLibraryEditor {
+@@ -262,7 +262,7 @@ public class FurnitureLibraryEditor {
      }
      
      if (OperatingSystem.isMacOSX()) {
@@ -92,7 +92,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
      }
    
      if (furnitureLibraryName != null) {
-@@ -336,7 +336,6 @@ public class FurnitureLibraryEditor {
+@@ -347,7 +347,6 @@ public class FurnitureLibraryEditor {
    private static class MacOSXConfiguration {
      /**
       * Binds <code>controller</code> to Mac OS X application menu.
@@ -100,7 +100,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
      public static void bindToApplicationMenu(final EditorController controller) {
        Application macosxApplication = Application.getApplication();
        // Add a listener to Mac OS X application that will call controller methods
-@@ -382,5 +381,6 @@ public class FurnitureLibraryEditor {
+@@ -393,5 +392,6 @@ public class FurnitureLibraryEditor {
          }
        }
      }
diff --git a/debian/patches/01manifest b/debian/patches/01manifest
index 1243c8a..bc0a328 100644
--- a/debian/patches/01manifest
+++ b/debian/patches/01manifest
@@ -3,7 +3,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
 
 --- a/build.xml
 +++ b/build.xml
-@@ -122,6 +122,7 @@
+@@ -130,6 +130,7 @@
      <jar destfile="FurnitureLibraryEditor-${version}.jar">
        <manifest>
          <attribute name="Main-Class" value="com.eteks.furniturelibraryeditor.FurnitureLibraryEditorBootstrap"/>

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



More information about the pkg-java-commits mailing list