This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository sweethome3d.
commit 99f7df192338499161faf836642557f3b71e0d64 Author: Markus Koschany <[email protected]> Date: Wed Sep 13 09:56:29 2017 +0200 Refresh patches for new release. --- debian/patches/01noMacOSX | 94 ++++++++++++---------- debian/patches/04manifest | 13 +++- debian/patches/build.patch | 37 +++++++++ debian/patches/disable-checkForUpdates.patch | 21 +++++ debian/patches/no-video.patch | 112 +++++++++++++++++++++++++++ debian/patches/noadditionalprovisions.patch | 20 +++++ debian/patches/series | 4 + 7 files changed, 258 insertions(+), 43 deletions(-) diff --git a/debian/patches/01noMacOSX b/debian/patches/01noMacOSX index 6a41ac6..b6de4f2 100644 --- a/debian/patches/01noMacOSX +++ b/debian/patches/01noMacOSX @@ -1,7 +1,60 @@ -Description: Removing jarfiles which contain MacOSX-related classes, build +From: Debian Java Maintainers <[email protected]> +Date: Wed, 13 Sep 2017 09:51:44 +0200 +Subject: noMacOSX + fails looking for missing classes. This patch fixes it. Author: Gabriele Giacone <[email protected]> +--- + src/com/eteks/sweethome3d/HomeFramePane.java | 2 ++ + src/com/eteks/sweethome3d/SweetHome3D.java | 5 +++-- + src/com/eteks/sweethome3d/tools/OperatingSystem.java | 6 +++++- + 3 files changed, 10 insertions(+), 3 deletions(-) +diff --git a/src/com/eteks/sweethome3d/HomeFramePane.java b/src/com/eteks/sweethome3d/HomeFramePane.java +index 57fb352..56234d7 100644 +--- a/src/com/eteks/sweethome3d/HomeFramePane.java ++++ b/src/com/eteks/sweethome3d/HomeFramePane.java +@@ -123,9 +123,11 @@ public class HomeFramePane extends JRootPane implements View { + // Call setIconImage available in previous versions + homeFrame.setIconImage(frameImages.get(0)); + } ++/* + if (OperatingSystem.isMacOSXLionOrSuperior()) { + MacOSXConfiguration.installToolBar(this); + } ++ */ + updateFrameTitle(homeFrame, this.home, this.application); + // Change component orientation + applyComponentOrientation(ComponentOrientation.getOrientation(Locale.getDefault())); +diff --git a/src/com/eteks/sweethome3d/SweetHome3D.java b/src/com/eteks/sweethome3d/SweetHome3D.java +index f9886aa..b4035aa 100644 +--- a/src/com/eteks/sweethome3d/SweetHome3D.java ++++ b/src/com/eteks/sweethome3d/SweetHome3D.java +@@ -483,10 +483,12 @@ public class SweetHome3D extends HomeApplication { + // Too bad we can't retrieve homes to recover + ex.printStackTrace(); + } ++/* + if (OperatingSystem.isMacOSX()) { + // Bind to application menu at last + MacOSXConfiguration.bindToApplicationMenu(this); + } ++ */ + + // Run everything else in Event Dispatch Thread + EventQueue.invokeLater(new Runnable() { +@@ -594,8 +596,7 @@ public class SweetHome3D extends HomeApplication { + && home.getName() == null + && !home.isRecovered()) { + if (OperatingSystem.isMacOSXLionOrSuperior() +- && OperatingSystem.isJavaVersionGreaterOrEqual("1.7") +- && MacOSXConfiguration.isWindowFullScreen(getHomeFrame(home))) { ++ && OperatingSystem.isJavaVersionGreaterOrEqual("1.7")) { + // Delay home disposal to avoid Java 3D fatal error + new Timer(3000, new ActionListener() { + public void actionPerformed(ActionEvent ev) { +diff --git a/src/com/eteks/sweethome3d/tools/OperatingSystem.java b/src/com/eteks/sweethome3d/tools/OperatingSystem.java +index 9996ec2..0709c4d 100644 --- a/src/com/eteks/sweethome3d/tools/OperatingSystem.java +++ b/src/com/eteks/sweethome3d/tools/OperatingSystem.java @@ -33,7 +33,6 @@ import java.util.Timer; @@ -38,42 +91,3 @@ Author: Gabriele Giacone <[email protected]> } + */ } ---- a/src/com/eteks/sweethome3d/SweetHome3D.java -+++ b/src/com/eteks/sweethome3d/SweetHome3D.java -@@ -464,10 +464,12 @@ public class SweetHome3D extends HomeApp - // Too bad we can't retrieve homes to recover - ex.printStackTrace(); - } -+/* - if (OperatingSystem.isMacOSX()) { - // Bind to application menu at last - MacOSXConfiguration.bindToApplicationMenu(this); - } -+ */ - - // Run everything else in Event Dispatch Thread - EventQueue.invokeLater(new Runnable() { -@@ -542,8 +544,7 @@ public class SweetHome3D extends HomeApp - && home.getName() == null - && !home.isRecovered()) { - if (OperatingSystem.isMacOSXLionOrSuperior() -- && OperatingSystem.isJavaVersionGreaterOrEqual("1.7") -- && MacOSXConfiguration.isWindowFullScreen(getHomeFrame(home))) { -+ && OperatingSystem.isJavaVersionGreaterOrEqual("1.7")) { - // Delay home disposal to avoid Java 3D fatal error - new Timer(3000, new ActionListener() { - public void actionPerformed(ActionEvent ev) { ---- a/src/com/eteks/sweethome3d/HomeFramePane.java -+++ b/src/com/eteks/sweethome3d/HomeFramePane.java -@@ -122,9 +122,11 @@ public class HomeFramePane extends JRoot - // Call setIconImage available in previous versions - homeFrame.setIconImage(frameImages.get(0)); - } -+/* - if (OperatingSystem.isMacOSXLionOrSuperior()) { - MacOSXConfiguration.installToolBar(this); - } -+ */ - updateFrameTitle(homeFrame, this.home, this.application); - // Change component orientation - applyComponentOrientation(ComponentOrientation.getOrientation(Locale.getDefault())); diff --git a/debian/patches/04manifest b/debian/patches/04manifest index 65728c3..417bc22 100644 --- a/debian/patches/04manifest +++ b/debian/patches/04manifest @@ -1,9 +1,16 @@ -Description: Add Class-Path to manifest file. -Author: Gabriele Giacone <[email protected]> +From: Debian Java Maintainers <[email protected]> +Date: Wed, 13 Sep 2017 09:51:45 +0200 +Subject: manifest +--- + build.xml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/build.xml b/build.xml +index 7a3bd8a..ae4e821 100644 --- a/build.xml +++ b/build.xml -@@ -447,6 +447,7 @@ +@@ -465,6 +465,7 @@ <jar destfile="install/SweetHome3D-${version}.jar"> <manifest> <attribute name="Main-Class" value="com.eteks.sweethome3d.SweetHome3DBootstrap"/> diff --git a/debian/patches/build.patch b/debian/patches/build.patch new file mode 100644 index 0000000..b321212 --- /dev/null +++ b/debian/patches/build.patch @@ -0,0 +1,37 @@ +From: Markus Koschany <[email protected]> +Date: Wed, 13 Sep 2017 09:56:04 +0200 +Subject: build + +--- + build.xml | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/build.xml b/build.xml +index c079b4f..9425cc0 100644 +--- a/build.xml ++++ b/build.xml +@@ -404,12 +404,14 @@ + <include name="com/eteks/sweethome3d/io/DefaultPatternTexture.java"/> + <!-- Use lib as an extension directory to override default Java 3D libraries --> + <extdirs> +- <pathelement location="lib"/> ++ <pathelement location="/usr/share/java"/> ++ <pathelement location="/usr/share/icedtea-web"/> + </extdirs> + <classpath> + <pathelement location="libtest/AppleJavaExtensions.jar"/> + <pathelement location="libtest/jnlp.jar"/> + </classpath> ++ <exclude name="com/eteks/sweethome3d/MacOSXConfiguration.java"/> + </javac> + + <!-- Copy only resources used by viewer --> +@@ -461,7 +463,7 @@ + <echo message="deploy dir ready for ftp"/> + </target> + +- <target name="jarExecutable" depends="application,furniture,textures,examples,help,jogl-java3d" ++ <target name="jarExecutable" depends="application,furniture,textures,examples,help" + description="Builds install/SweetHome3D-version.jar executable Jar"> + <!-- Create SweetHome3D-version.jar containing Sweet Home 3D classes and resources, + and other DLLs and jars --> diff --git a/debian/patches/disable-checkForUpdates.patch b/debian/patches/disable-checkForUpdates.patch new file mode 100644 index 0000000..1778301 --- /dev/null +++ b/debian/patches/disable-checkForUpdates.patch @@ -0,0 +1,21 @@ +From: Markus Koschany <[email protected]> +Date: Wed, 13 Sep 2017 09:52:36 +0200 +Subject: disable checkForUpdates + +--- + src/com/eteks/sweethome3d/io/DefaultUserPreferences.properties | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/com/eteks/sweethome3d/io/DefaultUserPreferences.properties b/src/com/eteks/sweethome3d/io/DefaultUserPreferences.properties +index e7de01c..98ca45b 100644 +--- a/src/com/eteks/sweethome3d/io/DefaultUserPreferences.properties ++++ b/src/com/eteks/sweethome3d/io/DefaultUserPreferences.properties +@@ -86,7 +86,7 @@ newHomeWallHeight=250 + newWallBaseboardlThickness=1 + newWallBaseboardlHeight=7 + newFloorThickness=12 +-checkUpdatesEnabled=true ++checkUpdatesEnabled=false + autoSaveDelayForRecovery=600000 + + # Uncomment default currency line to use prices in application diff --git a/debian/patches/no-video.patch b/debian/patches/no-video.patch new file mode 100644 index 0000000..899dcce --- /dev/null +++ b/debian/patches/no-video.patch @@ -0,0 +1,112 @@ +From: Markus Koschany <[email protected]> +Date: Wed, 13 Sep 2017 09:54:28 +0200 +Subject: no video + +--- + 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 ae4e821..a2ad068 100644 +--- a/build.xml ++++ b/build.xml +@@ -55,6 +55,8 @@ + <pathelement location="libtest/AppleJavaExtensions.jar"/> + <pathelement location="libtest/jnlp.jar"/> + </classpath> ++ <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 b21a4bd..2d1298f 100644 +--- a/src/com/eteks/sweethome3d/swing/package.properties ++++ b/src/com/eteks/sweethome3d/swing/package.properties +@@ -1201,8 +1201,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 56e5eb1..e766a00 100644 +--- a/src/com/eteks/sweethome3d/viewcontroller/HomeController.java ++++ b/src/com/eteks/sweethome3d/viewcontroller/HomeController.java +@@ -336,7 +336,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/noadditionalprovisions.patch b/debian/patches/noadditionalprovisions.patch new file mode 100644 index 0000000..98b676a --- /dev/null +++ b/debian/patches/noadditionalprovisions.patch @@ -0,0 +1,20 @@ +From: Markus Koschany <[email protected]> +Date: Wed, 13 Sep 2017 09:54:49 +0200 +Subject: noadditionalprovisions + +--- + build.xml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/build.xml b/build.xml +index a2ad068..c079b4f 100644 +--- a/build.xml ++++ b/build.xml +@@ -95,6 +95,7 @@ + <zip destfile="build/Furniture.jar" basedir="src"> + <include name="com/eteks/sweethome3d/io/*FurnitureCatalog*.properties"/> + <include name="com/eteks/sweethome3d/io/resources/**"/> ++ <exclude name="com/eteks/sweethome3d/io/*ContributedFurnitureCatalog*.properties"/> + <exclude name="com/eteks/sweethome3d/io/resources/textures/**"/> + <exclude name="com/eteks/sweethome3d/io/resources/patterns/**"/> + <exclude name="com/eteks/sweethome3d/io/resources/examples/**"/> diff --git a/debian/patches/series b/debian/patches/series index a076726..e79f2f0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,6 @@ 01noMacOSX 04manifest +disable-checkForUpdates.patch +no-video.patch +noadditionalprovisions.patch +build.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
