[SCM] sweethome3d - Interior 2D design application with 3D preview branch, master, updated. debian/3.7+dfsg-1-2-g85fcc4c

Gabriele Giacone 1o5g4r8o at gmail.com
Mon Dec 10 00:55:06 UTC 2012 

The following commit has been merged in the master branch:
commit 85fcc4cdff2346bc2e50d6f1b905cbc775636989
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Mon Dec 10 01:42:07 2012 +0100

    Make video feature removal more explicit, refresh patches.

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..26379ab
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,7 @@
+Sweethome3d for Debian
+----------------------
+
+ Video creation feature has been removed because based on Java Media Framework.
+ JMF source code is released under Sun Community Source Licensing (SCSL) which
+ is not DFSG-compliant.
+
diff --git a/debian/changelog b/debian/changelog
index a6e0bda..7d93f78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 sweethome3d (3.7+dfsg-2) unstable; urgency=low
 
   * Fix home path added to application folder property (Closes: #695528).
+  * Make video feature removal more explicit (LP: #996714).
 
  -- Gabriele Giacone <1o5g4r8o at gmail.com>  Wed, 21 Nov 2012 00:41:38 +0100
 
diff --git a/debian/patches/00build.xml b/debian/patches/00build.xml
index 1ce2f28..f0b2ccb 100644
--- a/debian/patches/00build.xml
+++ b/debian/patches/00build.xml
@@ -4,7 +4,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
 
 --- a/build.xml
 +++ b/build.xml
-@@ -43,12 +43,14 @@
+@@ -46,12 +46,14 @@
             encoding="ISO-8859-1" target="1.5" source="1.5">
        <!-- Use lib as an extension directory to override default Java 3D libraries -->
        <extdirs>
diff --git a/debian/patches/01noMacOSX b/debian/patches/01noMacOSX
index a94fbf8..68654f4 100644
--- a/debian/patches/01noMacOSX
+++ b/debian/patches/01noMacOSX
@@ -4,7 +4,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
 
 --- a/src/com/eteks/sweethome3d/tools/OperatingSystem.java
 +++ b/src/com/eteks/sweethome3d/tools/OperatingSystem.java
-@@ -29,7 +29,7 @@
+@@ -29,7 +29,7 @@ import java.util.Timer;
  import java.util.TimerTask;
  import java.util.UUID;
  
@@ -13,7 +13,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  import com.eteks.sweethome3d.model.Home;
  
  /**
-@@ -216,9 +216,10 @@
+@@ -216,9 +216,10 @@ public class OperatingSystem {
     */
    public static File getDefaultApplicationFolder() throws IOException {
      File userApplicationFolder; 
@@ -26,7 +26,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
        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 @@
+@@ -239,10 +240,10 @@ public class OperatingSystem {
     * This class requires some classes of <code>com.apple.eio</code> package  
     * to compile.
     */
@@ -41,7 +41,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  }
 --- a/src/com/eteks/sweethome3d/SweetHome3D.java
 +++ b/src/com/eteks/sweethome3d/SweetHome3D.java
-@@ -395,7 +395,6 @@
+@@ -401,7 +401,6 @@ public class SweetHome3D extends HomeApp
      }
      if (OperatingSystem.isMacOSX()) {
        // Bind to application menu at last
diff --git a/debian/patches/02noadditionalprovisions b/debian/patches/02noadditionalprovisions
index b3a2146..017d1c0 100644
--- a/debian/patches/02noadditionalprovisions
+++ b/debian/patches/02noadditionalprovisions
@@ -6,7 +6,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
 
 --- a/build.xml
 +++ b/build.xml
-@@ -89,6 +89,7 @@
+@@ -92,6 +92,7 @@
      <zip destfile="build/Furniture.jar" basedir="src">
        <include name="com/eteks/sweethome3d/io/*FurnitureCatalog*.properties"/>
        <include name="com/eteks/sweethome3d/io/resources/**"/>
diff --git a/debian/patches/03novideo b/debian/patches/03novideo
index e866b2d..b65bef2 100644
--- a/debian/patches/03novideo
+++ b/debian/patches/03novideo
@@ -3,7 +3,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
 
 --- a/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java
 +++ b/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java
-@@ -184,8 +184,8 @@
+@@ -184,8 +184,8 @@ public interface ViewFactory {
    /**
     * Returns a new view able to compute a 3D video of a home. 
     */
@@ -16,7 +16,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
     * Returns a new view that displays Sweet Home 3D help.
 --- a/src/com/eteks/sweethome3d/viewcontroller/VideoController.java
 +++ b/src/com/eteks/sweethome3d/viewcontroller/VideoController.java
-@@ -99,7 +99,7 @@
+@@ -99,7 +99,7 @@ public class VideoController implements
    public DialogView getView() {
      // Create view lazily only once it's needed
      if (this.videoView == null) {
@@ -27,7 +27,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
    }
 --- a/src/com/eteks/sweethome3d/swing/SwingViewFactory.java
 +++ b/src/com/eteks/sweethome3d/swing/SwingViewFactory.java
-@@ -56,7 +56,6 @@
+@@ -56,7 +56,6 @@ import com.eteks.sweethome3d.viewcontrol
  import com.eteks.sweethome3d.viewcontroller.ThreadedTaskController;
  import com.eteks.sweethome3d.viewcontroller.ThreadedTaskView;
  import com.eteks.sweethome3d.viewcontroller.UserPreferencesController;
@@ -35,7 +35,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
  import com.eteks.sweethome3d.viewcontroller.View;
  import com.eteks.sweethome3d.viewcontroller.ViewFactory;
  import com.eteks.sweethome3d.viewcontroller.WallController;
-@@ -280,11 +279,11 @@
+@@ -280,11 +279,11 @@ public class SwingViewFactory implements
    /**
     * Returns a new view able to create 3D videos of the given home. 
     */
@@ -51,7 +51,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
     * Returns a new view that displays Sweet Home 3D help.
 --- a/build.xml
 +++ b/build.xml
-@@ -51,6 +51,8 @@
+@@ -54,6 +54,8 @@
          <pathelement location="libtest/jnlp.jar"/>
        </classpath>
  	<exclude name="com/eteks/sweethome3d/MacOSXConfiguration.java"/>
@@ -60,41 +60,27 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
      </javac>
      
      <!-- Copy resources excepted furniture, textures and help files -->
---- a/src/com/eteks/sweethome3d/swing/HomePane.java
-+++ b/src/com/eteks/sweethome3d/swing/HomePane.java
-@@ -460,7 +460,7 @@
-           homeController3D, "displaySelectedLevel");
-       createAction(ActionType.MODIFY_3D_ATTRIBUTES, preferences, homeController3D, "modifyAttributes");
-       createAction(ActionType.CREATE_PHOTO, preferences, controller, "createPhoto");
--      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);
-     preview3DMenu.addSeparator();
-     addActionToMenu(ActionType.CREATE_PHOTO, preview3DMenu);
--    addActionToMenu(ActionType.CREATE_VIDEO, preview3DMenu);
-+//    addActionToMenu(ActionType.CREATE_VIDEO, preview3DMenu);
-     preview3DMenu.addSeparator();
-     addActionToMenu(ActionType.EXPORT_TO_OBJ, preview3DMenu);
-     
-@@ -1840,7 +1840,7 @@
-     addActionToToolBar(ActionType.ZOOM_OUT, toolBar);
-     toolBar.addSeparator();
-     addActionToToolBar(ActionType.CREATE_PHOTO, toolBar);
--    addActionToToolBar(ActionType.CREATE_VIDEO, toolBar);
-+//    addActionToToolBar(ActionType.CREATE_VIDEO, toolBar);
-     toolBar.addSeparator();
-     
-     // Add plugin actions buttons
-@@ -2508,7 +2508,7 @@
-       addActionToPopupMenu(ActionType.MODIFY_3D_ATTRIBUTES, view3DPopup);
-       view3DPopup.addSeparator();
-       addActionToPopupMenu(ActionType.CREATE_PHOTO, view3DPopup);
--      addActionToPopupMenu(ActionType.CREATE_VIDEO, view3DPopup);
-+//      addActionToPopupMenu(ActionType.CREATE_VIDEO, view3DPopup);
-       view3DPopup.addSeparator();
-       addActionToPopupMenu(ActionType.EXPORT_TO_OBJ, view3DPopup);
-       SwingTools.hideDisabledMenuItems(view3DPopup);
+--- a/src/com/eteks/sweethome3d/swing/package.properties
++++ b/src/com/eteks/sweethome3d/swing/package.properties
+@@ -1046,8 +1046,8 @@ HomePane.CREATE_PHOTO.MnemonicKey=H
+ # Note to translators: do not copy the following key in localized file
+ HomePane.CREATE_PHOTO.SmallIcon=resources/icons/tango/camera-photo.png
+ 
+-HomePane.CREATE_VIDEO.Name=Create video...
+-HomePane.CREATE_VIDEO.ShortDescription=Create a 3D video
++HomePane.CREATE_VIDEO.Name=Create video... (See README.Debian file)
++HomePane.CREATE_VIDEO.ShortDescription=Create a 3D video (See README.Debian file)
+ HomePane.CREATE_VIDEO.MnemonicKey=O
+ # Note to translators: do not copy the following key in localized file
+ HomePane.CREATE_VIDEO.SmallIcon=resources/icons/tango/camera-video.png
+--- a/src/com/eteks/sweethome3d/viewcontroller/HomeController.java
++++ b/src/com/eteks/sweethome3d/viewcontroller/HomeController.java
+@@ -288,7 +288,7 @@ public class HomeController implements C
+     homeView.setEnabled(HomeView.ActionType.VIEW_FROM_OBSERVER, true);
+     homeView.setEnabled(HomeView.ActionType.MODIFY_3D_ATTRIBUTES, true);
+     homeView.setEnabled(HomeView.ActionType.CREATE_PHOTO, true);
+-    homeView.setEnabled(HomeView.ActionType.CREATE_VIDEO, true);
++    homeView.setEnabled(HomeView.ActionType.CREATE_VIDEO, false);
+     homeView.setEnabled(HomeView.ActionType.EXPORT_TO_OBJ, true);
+     homeView.setEnabled(HomeView.ActionType.HELP, true);
+     homeView.setEnabled(HomeView.ActionType.ABOUT, true);

-- 
sweethome3d - Interior 2D design application with 3D preview

More information about the pkg-java-commits mailing list