This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository sweethome3d.
commit 97d92ef6e0cbc76f426d2b49d1513083a8df6ea1 Author: Markus Koschany <[email protected]> Date: Wed Sep 13 09:50:59 2017 +0200 Drop 03novideo.patch --- debian/patches/03novideo.patch | 113 ----------------------------------------- debian/patches/series | 1 - 2 files changed, 114 deletions(-) diff --git a/debian/patches/03novideo.patch b/debian/patches/03novideo.patch deleted file mode 100644 index 4335932..0000000 --- a/debian/patches/03novideo.patch +++ /dev/null @@ -1,113 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Mon, 6 Mar 2017 00:04:00 +0100 -Subject: 03novideo - -This patch disables video creation feature. ---- - build.xml | 2 ++ - src/com/eteks/sweethome3d/swing/SwingViewFactory.java | 5 ++--- - src/com/eteks/sweethome3d/swing/package.properties | 4 ++-- - src/com/eteks/sweethome3d/viewcontroller/HomeController.java | 2 +- - src/com/eteks/sweethome3d/viewcontroller/VideoController.java | 3 ++- - src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java | 4 ++-- - 6 files changed, 11 insertions(+), 9 deletions(-) - -diff --git a/build.xml b/build.xml -index c4bb80a..77ce6f9 100644 ---- a/build.xml -+++ b/build.xml -@@ -56,6 +56,8 @@ - <pathelement location="libtest/jnlp.jar"/> - </classpath> - <exclude name="com/eteks/sweethome3d/MacOSXConfiguration.java"/> -+ <exclude name="com/eteks/sweethome3d/swing/VideoPanel.java"/> -+ <exclude name="com/eteks/sweethome3d/viewcontroller/VideoController.java"/> - </javac> - - <!-- Copy resources excepted furniture, textures and help files --> -diff --git a/src/com/eteks/sweethome3d/swing/SwingViewFactory.java b/src/com/eteks/sweethome3d/swing/SwingViewFactory.java -index 0723419..54fe73c 100644 ---- a/src/com/eteks/sweethome3d/swing/SwingViewFactory.java -+++ b/src/com/eteks/sweethome3d/swing/SwingViewFactory.java -@@ -60,7 +60,6 @@ import com.eteks.sweethome3d.viewcontroller.TextureChoiceView; - 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; -@@ -320,12 +319,12 @@ public class SwingViewFactory implements ViewFactory { - /** - * Returns a new view able to create 3D videos of the given home. - */ -- public DialogView createVideoView(Home home, -+ /* public DialogView createVideoView(Home home, - UserPreferences preferences, - VideoController videoController) { - return new VideoPanel(home, preferences, videoController); - } -- -+ */ - /** - * Returns a new view that displays Sweet Home 3D help. - */ -diff --git a/src/com/eteks/sweethome3d/swing/package.properties b/src/com/eteks/sweethome3d/swing/package.properties -index 08c578b..a439644 100644 ---- a/src/com/eteks/sweethome3d/swing/package.properties -+++ b/src/com/eteks/sweethome3d/swing/package.properties -@@ -1154,8 +1154,8 @@ HomePane.CREATE_PHOTOS_AT_POINTS_OF_VIEW.Name=Create photos at points of view... - HomePane.CREATE_PHOTOS_AT_POINTS_OF_VIEW.ShortDescription=Create photos at stored points of view - HomePane.CREATE_PHOTOS_AT_POINTS_OF_VIEW.MnemonicKey=C - --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 -diff --git a/src/com/eteks/sweethome3d/viewcontroller/HomeController.java b/src/com/eteks/sweethome3d/viewcontroller/HomeController.java -index d14ebbb..16820cf 100644 ---- a/src/com/eteks/sweethome3d/viewcontroller/HomeController.java -+++ b/src/com/eteks/sweethome3d/viewcontroller/HomeController.java -@@ -327,7 +327,7 @@ public class HomeController implements Controller { - 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); -diff --git a/src/com/eteks/sweethome3d/viewcontroller/VideoController.java b/src/com/eteks/sweethome3d/viewcontroller/VideoController.java -index 6775ca7..f5bf116 100644 ---- a/src/com/eteks/sweethome3d/viewcontroller/VideoController.java -+++ b/src/com/eteks/sweethome3d/viewcontroller/VideoController.java -@@ -98,9 +98,10 @@ public class VideoController implements Controller { - */ - public DialogView getView() { - // Create view lazily only once it's needed -- if (this.videoView == null) { -+ /* if (this.videoView == null) { - this.videoView = this.viewFactory.createVideoView(this.home, this.preferences, this); - } -+ */ - return this.videoView; - } - -diff --git a/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java b/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java -index 5c143e0..f7bc87e 100644 ---- a/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java -+++ b/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java -@@ -209,8 +209,8 @@ public interface ViewFactory { - /** - * Returns a new view able to compute a 3D video of a home. - */ -- public abstract DialogView createVideoView(Home home, UserPreferences preferences, -- VideoController videoController); -+ // public abstract DialogView createVideoView(Home home, UserPreferences preferences, -+ // VideoController videoController); - - /** - * Returns a new view that displays Sweet Home 3D help. diff --git a/debian/patches/series b/debian/patches/series index d9f6e7d..afb9111 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 01noMacOSX -03novideo.patch 04manifest 05disable_checkForUpdates.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sweethome3d.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
