[sweethome3d] 07/08: Refresh patches.
Markus Koschany
apo at moszumanska.debian.org
Sun Mar 5 23:27:02 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository sweethome3d.
commit c0a3bbd8cf2bf10520cffda641ff8c4e448f21c1
Author: Markus Koschany <apo at debian.org>
Date: Sun Mar 5 23:46:43 2017 +0100
Refresh patches.
---
debian/changelog | 1 +
debian/patches/{00build.xml => 00build.xml.patch} | 20 ++--
debian/patches/{03novideo => 03novideo.patch} | 116 +++++++++++++---------
debian/patches/series | 4 +-
4 files changed, 87 insertions(+), 54 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 00ba628..b4a628d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ sweethome3d (5.4+dfsg-1) experimental; urgency=medium
* wrap-and-sort -sab.
* Use only Build-Depends field.
* Add -Dsun.java2d.opengl=true to startup script. (Closes: #854030)
+ * Refresh patches for latest release.
-- Markus Koschany <apo at debian.org> Sun, 05 Mar 2017 23:45:05 +0100
diff --git a/debian/patches/00build.xml b/debian/patches/00build.xml.patch
similarity index 71%
rename from debian/patches/00build.xml
rename to debian/patches/00build.xml.patch
index bedf785..217a5ac 100644
--- a/debian/patches/00build.xml
+++ b/debian/patches/00build.xml.patch
@@ -1,7 +1,15 @@
-Description: Removes refs to macosx build and forces java libraries
- search path to Debian one (/usr/share/java)
-Author: Gabriele Giacone <1o5g4r8o at gmail.com>
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 5 Mar 2017 23:49:47 +0100
+Subject: 00build.xml
+Removes refs to macosx build and forces java libraries search path to Debian
+one (/usr/share/java)
+---
+ build.xml | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 11fe502..c4bb80a 100644
--- a/build.xml
+++ b/build.xml
@@ -48,12 +48,14 @@
@@ -16,11 +24,11 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
<pathelement location="libtest/AppleJavaExtensions.jar"/>
<pathelement location="libtest/jnlp.jar"/>
</classpath>
-+ <exclude name="com/eteks/sweethome3d/MacOSXConfiguration.java"/>
++ <exclude name="com/eteks/sweethome3d/MacOSXConfiguration.java"/>
</javac>
-
+
<!-- Copy resources excepted furniture, textures and help files -->
-@@ -435,7 +437,7 @@
+@@ -448,7 +450,7 @@
<echo message="deploy dir ready for ftp"/>
</target>
diff --git a/debian/patches/03novideo b/debian/patches/03novideo.patch
similarity index 54%
rename from debian/patches/03novideo
rename to debian/patches/03novideo.patch
index e45f31d..4335932 100644
--- a/debian/patches/03novideo
+++ b/debian/patches/03novideo.patch
@@ -1,36 +1,35 @@
-Description: This patch disables video creation feature.
-Author: Gabriele Giacone <1o5g4r8o at gmail.com>
+From: Markus Koschany <apo at debian.org>
+Date: Mon, 6 Mar 2017 00:04:00 +0100
+Subject: 03novideo
---- a/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java
-+++ b/src/com/eteks/sweethome3d/viewcontroller/ViewFactory.java
-@@ -196,8 +196,10 @@ 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);
-+ */
-
- /**
- * 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
-@@ -98,9 +98,11 @@ public class VideoController implements
- */
- public DialogView getView() {
- // Create view lazily only once it's needed
-+/*
- if (this.videoView == null) {
- this.videoView = this.viewFactory.createVideoView(this.home, this.preferences, this);
- }
-+ */
- return this.videoView;
- }
+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
-@@ -58,7 +58,6 @@ import com.eteks.sweethome3d.viewcontrol
+@@ -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;
@@ -38,34 +37,26 @@ 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;
-@@ -298,11 +297,13 @@ public class SwingViewFactory implements
+@@ -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,
++ /* 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.
---- 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/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
-@@ -1064,8 +1064,8 @@ HomePane.CREATE_PHOTOS_AT_POINTS_OF_VIEW
+@@ -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
@@ -76,9 +67,11 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
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
-@@ -329,7 +329,7 @@ public class HomeController implements C
+@@ -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);
@@ -87,3 +80,34 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
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 c25a14f..21cdac0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
-00build.xml
+00build.xml.patch
01noMacOSX
02noadditionalprovisions
-03novideo
+03novideo.patch
04manifest
05disable_checkForUpdates.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sweethome3d.git
More information about the pkg-java-commits
mailing list