sweethome3d: 4.0-1~getdeb1

  * New upstream version (LP: #1158816)

sweethome3d/changelog

@@ -1,3 +1,9 @@
+sweethome3d (4.0-1~getdeb1) precise; urgency=low
+
+  * New upstream version (LP: #1158816)
+
+ -- Christoph Korn <christoph.korn@getdeb.net>  Fri, 22 Mar 2013 19:22:05 +0100
+
 sweethome3d (3.7-1~getdeb1) precise; urgency=low
 
   * New upstream version

sweethome3d/patches/01noMacOSX

@@ -2,11 +2,11 @@ Description: Removing jarfiles which contain MacOSX-related classes, build
 fails looking for missing classes. This patch fixes it.
 Author: Gabriele Giacone <1o5g4r8o@gmail.com>
 
-Index: sweethome3d-3.6/src/com/eteks/sweethome3d/tools/OperatingSystem.java
+Index: sweethome3d-4.0/src/com/eteks/sweethome3d/tools/OperatingSystem.java
 ===================================================================
---- sweethome3d-3.6.orig/src/com/eteks/sweethome3d/tools/OperatingSystem.java	2012-09-05 21:48:02.000000000 +0200
-+++ sweethome3d-3.6/src/com/eteks/sweethome3d/tools/OperatingSystem.java	2012-09-08 16:21:02.565514101 +0200
-@@ -29,7 +29,7 @@
+--- sweethome3d-4.0.orig/src/com/eteks/sweethome3d/tools/OperatingSystem.java	2013-03-21 12:26:54.000000000 +0100
++++ sweethome3d-4.0/src/com/eteks/sweethome3d/tools/OperatingSystem.java	2013-03-22 19:23:37.676640321 +0100
+@@ -32,7 +32,7 @@
  import java.util.TimerTask;
  import java.util.UUID;
 
@@ -15,7 +15,7 @@ Index: sweethome3d-3.6/src/com/eteks/sweethome3d/tools/OperatingSystem.java
  import com.eteks.sweethome3d.model.Home;
 
  /**
-@@ -216,9 +216,10 @@
+@@ -347,9 +347,10 @@
     */
    public static File getDefaultApplicationFolder() throws IOException {
      File userApplicationFolder; 
@@ -28,7 +28,7 @@ Index: sweethome3d-3.6/src/com/eteks/sweethome3d/tools/OperatingSystem.java
        userApplicationFolder = new File(System.getProperty("user.home"), "Application Data");
        // If user Application Data directory doesn't exist, use user home
        if (!userApplicationFolder.exists()) {
-@@ -239,10 +240,10 @@
+@@ -370,10 +371,10 @@
     * This class requires some classes of <code>com.apple.eio</code> package  
     * to compile.
     */
@@ -41,11 +41,11 @@ Index: sweethome3d-3.6/src/com/eteks/sweethome3d/tools/OperatingSystem.java
 -  }
 +  } */
  }
-Index: sweethome3d-3.6/src/com/eteks/sweethome3d/SweetHome3D.java
+Index: sweethome3d-4.0/src/com/eteks/sweethome3d/SweetHome3D.java
 ===================================================================
---- sweethome3d-3.6.orig/src/com/eteks/sweethome3d/SweetHome3D.java	2012-09-05 21:48:02.000000000 +0200
-+++ sweethome3d-3.6/src/com/eteks/sweethome3d/SweetHome3D.java	2012-09-08 16:21:02.565514101 +0200
-@@ -401,7 +401,6 @@
+--- sweethome3d-4.0.orig/src/com/eteks/sweethome3d/SweetHome3D.java	2013-03-21 12:26:50.000000000 +0100
++++ sweethome3d-4.0/src/com/eteks/sweethome3d/SweetHome3D.java	2013-03-22 19:23:37.676640321 +0100
+@@ -452,7 +452,6 @@
      }
      if (OperatingSystem.isMacOSX()) {
        // Bind to application menu at last

sweethome3d/patches/03novideo

@@ -1,11 +1,11 @@
 Description: This patch disables video creation feature.
 Author: Gabriele Giacone <1o5g4r8o@gmail.com>
 
-Index: sweethome3d-3.7/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java
+Index: sweethome3d-4.0/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java
 ===================================================================
---- sweethome3d-3.7.orig/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java	2012-10-24 18:48:02.000000000 +0200
-+++ sweethome3d-3.7/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java	2012-10-27 00:31:23.323814887 +0200
-@@ -184,8 +184,8 @@
+--- sweethome3d-4.0.orig/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java	2013-03-21 12:26:54.000000000 +0100
++++ sweethome3d-4.0/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java	2013-03-22 21:33:41.668573693 +0100
+@@ -196,8 +196,8 @@
    /**
     * Returns a new view able to compute a 3D video of a home. 
     */
@@ -16,10 +16,10 @@ Index: sweethome3d-3.7/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java
 
    /**
     * Returns a new view that displays Sweet Home 3D help.
-Index: sweethome3d-3.7/src/com/eteks/sweethome3d/viewcontroller/VideoController.java
+Index: sweethome3d-4.0/src/com/eteks/sweethome3d/viewcontroller/VideoController.java
 ===================================================================
---- sweethome3d-3.7.orig/src/com/eteks/sweethome3d/viewcontroller/VideoController.java	2012-10-24 18:48:02.000000000 +0200
-+++ sweethome3d-3.7/src/com/eteks/sweethome3d/viewcontroller/VideoController.java	2012-10-27 00:31:23.327814887 +0200
+--- sweethome3d-4.0.orig/src/com/eteks/sweethome3d/viewcontroller/VideoController.java	2013-03-21 12:26:54.000000000 +0100
++++ sweethome3d-4.0/src/com/eteks/sweethome3d/viewcontroller/VideoController.java	2013-03-22 21:33:41.672573693 +0100
 @@ -99,7 +99,7 @@
    public DialogView getView() {
      // Create view lazily only once it's needed
@@ -29,19 +29,19 @@ Index: sweethome3d-3.7/src/com/eteks/sweethome3d/viewcontroller/VideoController.
      }
      return this.videoView;
    }
-Index: sweethome3d-3.7/src/com/eteks/sweethome3d/swing/SwingViewFactory.java
+Index: sweethome3d-4.0/src/com/eteks/sweethome3d/swing/SwingViewFactory.java
 ===================================================================
---- sweethome3d-3.7.orig/src/com/eteks/sweethome3d/swing/SwingViewFactory.java	2012-10-24 18:48:02.000000000 +0200
-+++ sweethome3d-3.7/src/com/eteks/sweethome3d/swing/SwingViewFactory.java	2012-10-27 00:31:23.327814887 +0200
-@@ -56,7 +56,6 @@
+--- sweethome3d-4.0.orig/src/com/eteks/sweethome3d/swing/SwingViewFactory.java	2013-03-21 12:26:54.000000000 +0100
++++ sweethome3d-4.0/src/com/eteks/sweethome3d/swing/SwingViewFactory.java	2013-03-22 21:33:41.672573693 +0100
+@@ -58,7 +58,6 @@
  import com.eteks.sweethome3d.viewcontroller.ThreadedTaskController;
  import com.eteks.sweethome3d.viewcontroller.ThreadedTaskView;
  import com.eteks.sweethome3d.viewcontroller.UserPreferencesController;
 -import com.eteks.sweethome3d.viewcontroller.VideoController;
  import com.eteks.sweethome3d.viewcontroller.View;
  import com.eteks.sweethome3d.viewcontroller.ViewFactory;
  import com.eteks.sweethome3d.viewcontroller.WallController;
-@@ -280,11 +279,11 @@
+@@ -298,11 +297,11 @@
    /**
     * Returns a new view able to create 3D videos of the given home. 
     */
@@ -55,10 +55,10 @@ Index: sweethome3d-3.7/src/com/eteks/sweethome3d/swing/SwingViewFactory.java
 
    /**
     * Returns a new view that displays Sweet Home 3D help.
-Index: sweethome3d-3.7/build.xml
+Index: sweethome3d-4.0/build.xml
 ===================================================================
---- sweethome3d-3.7.orig/build.xml	2012-10-27 00:31:21.243814949 +0200
-+++ sweethome3d-3.7/build.xml	2012-10-27 00:31:23.327814887 +0200
+--- sweethome3d-4.0.orig/build.xml	2013-03-22 19:23:42.000000000 +0100
++++ sweethome3d-4.0/build.xml	2013-03-22 21:33:41.676573693 +0100
 @@ -55,6 +55,8 @@
          <pathelement location="libtest/jnlp.jar"/>
        </classpath>
@@ -68,29 +68,29 @@ Index: sweethome3d-3.7/build.xml
      </javac>
 
      <!-- Copy resources excepted furniture, textures and help files -->
-Index: sweethome3d-3.7/src/com/eteks/sweethome3d/swing/HomePane.java
+Index: sweethome3d-4.0/src/com/eteks/sweethome3d/swing/HomePane.java
 ===================================================================
---- sweethome3d-3.7.orig/src/com/eteks/sweethome3d/swing/HomePane.java	2012-10-24 18:48:02.000000000 +0200
-+++ sweethome3d-3.7/src/com/eteks/sweethome3d/swing/HomePane.java	2012-10-27 00:31:23.327814887 +0200
-@@ -460,7 +460,7 @@
-           homeController3D, "displaySelectedLevel");
+--- sweethome3d-4.0.orig/src/com/eteks/sweethome3d/swing/HomePane.java	2013-03-21 12:26:54.000000000 +0100
++++ sweethome3d-4.0/src/com/eteks/sweethome3d/swing/HomePane.java	2013-03-22 21:36:37.984572188 +0100
+@@ -488,7 +488,7 @@
        createAction(ActionType.MODIFY_3D_ATTRIBUTES, preferences, homeController3D, "modifyAttributes");
        createAction(ActionType.CREATE_PHOTO, preferences, controller, "createPhoto");
+       createAction(ActionType.CREATE_PHOTOS_AT_POINTS_OF_VIEW, preferences, controller, "createPhotos");
 -      createAction(ActionType.CREATE_VIDEO, preferences, controller, "createVideo");
-+//      createAction(ActionType.CREATE_VIDEO, preferences, controller, "createVideo");
++      //createAction(ActionType.CREATE_VIDEO, preferences, controller, "createVideo");
        createAction(ActionType.EXPORT_TO_OBJ, preferences, controller, "exportToOBJ");
      }
 
-@@ -995,7 +995,7 @@
-     addActionToMenu(ActionType.MODIFY_3D_ATTRIBUTES, preview3DMenu);
+@@ -1042,7 +1042,7 @@
      preview3DMenu.addSeparator();
      addActionToMenu(ActionType.CREATE_PHOTO, preview3DMenu);
+     addActionToMenu(ActionType.CREATE_PHOTOS_AT_POINTS_OF_VIEW, preview3DMenu);
 -    addActionToMenu(ActionType.CREATE_VIDEO, preview3DMenu);
-+//    addActionToMenu(ActionType.CREATE_VIDEO, preview3DMenu);
++    //addActionToMenu(ActionType.CREATE_VIDEO, preview3DMenu);
      preview3DMenu.addSeparator();
      addActionToMenu(ActionType.EXPORT_TO_OBJ, preview3DMenu);
 
-@@ -1840,7 +1840,7 @@
+@@ -1887,7 +1887,7 @@
      addActionToToolBar(ActionType.ZOOM_OUT, toolBar);
      toolBar.addSeparator();
      addActionToToolBar(ActionType.CREATE_PHOTO, toolBar);
@@ -99,12 +99,12 @@ Index: sweethome3d-3.7/src/com/eteks/sweethome3d/swing/HomePane.java
      toolBar.addSeparator();
 
      // Add plugin actions buttons
-@@ -2508,7 +2508,7 @@
-       addActionToPopupMenu(ActionType.MODIFY_3D_ATTRIBUTES, view3DPopup);
+@@ -2599,7 +2599,7 @@
        view3DPopup.addSeparator();
        addActionToPopupMenu(ActionType.CREATE_PHOTO, view3DPopup);
+       addActionToPopupMenu(ActionType.CREATE_PHOTOS_AT_POINTS_OF_VIEW, view3DPopup);
 -      addActionToPopupMenu(ActionType.CREATE_VIDEO, view3DPopup);
-+//      addActionToPopupMenu(ActionType.CREATE_VIDEO, view3DPopup);
++      //addActionToPopupMenu(ActionType.CREATE_VIDEO, view3DPopup);
        view3DPopup.addSeparator();
        addActionToPopupMenu(ActionType.EXPORT_TO_OBJ, view3DPopup);
        SwingTools.hideDisabledMenuItems(view3DPopup);