This is an automated email from the git hooks/post-receive script. gg0-guest pushed a commit to branch master in repository sweethome3d.
commit 50f3ff533999032759b3014768e0f1ca441d46d2 Author: Gabriele Giacone <[email protected]> Date: Tue Nov 5 13:18:02 2013 +0100 Refresh patches. --- debian/patches/00build.xml | 9 +++++++++ debian/patches/01noMacOSX | 19 +++++++++++++++---- debian/patches/03novideo | 4 ++-- debian/patches/04manifest | 2 +- 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/debian/patches/00build.xml b/debian/patches/00build.xml index f0b2ccb..e60c14a 100644 --- a/debian/patches/00build.xml +++ b/debian/patches/00build.xml @@ -20,3 +20,12 @@ Author: Gabriele Giacone <[email protected]> </javac> <!-- Copy resources excepted furniture, textures and help files --> +@@ -434,7 +436,7 @@ + <echo message="deploy dir ready for ftp"/> + </target> + +- <target name="jarExecutable" depends="application,furniture,textures,help,jogl-java3d" ++ <target name="jarExecutable" depends="application,furniture,textures,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/01noMacOSX b/debian/patches/01noMacOSX index 4cc8bf6..ffbd222 100644 --- a/debian/patches/01noMacOSX +++ b/debian/patches/01noMacOSX @@ -4,7 +4,7 @@ Author: Gabriele Giacone <[email protected]> --- a/src/com/eteks/sweethome3d/tools/OperatingSystem.java +++ b/src/com/eteks/sweethome3d/tools/OperatingSystem.java -@@ -32,7 +32,7 @@ import java.util.Timer; +@@ -33,7 +33,7 @@ import java.util.Timer; import java.util.TimerTask; import java.util.UUID; @@ -13,7 +13,7 @@ Author: Gabriele Giacone <[email protected]> import com.eteks.sweethome3d.model.Home; /** -@@ -347,9 +347,10 @@ public class OperatingSystem { +@@ -410,9 +410,10 @@ public class OperatingSystem { */ public static File getDefaultApplicationFolder() throws IOException { File userApplicationFolder; @@ -26,7 +26,7 @@ Author: Gabriele Giacone <[email protected]> userApplicationFolder = new File(System.getProperty("user.home"), "Application Data"); // If user Application Data directory doesn't exist, use user home if (!userApplicationFolder.exists()) { -@@ -370,10 +371,10 @@ public class OperatingSystem { +@@ -433,10 +434,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 <[email protected]> } --- a/src/com/eteks/sweethome3d/SweetHome3D.java +++ b/src/com/eteks/sweethome3d/SweetHome3D.java -@@ -452,7 +452,6 @@ public class SweetHome3D extends HomeApp +@@ -466,7 +466,6 @@ public class SweetHome3D extends HomeApp } if (OperatingSystem.isMacOSX()) { // Bind to application menu at last @@ -49,3 +49,14 @@ Author: Gabriele Giacone <[email protected]> } // Run everything else in Event Dispatch Thread +--- a/src/com/eteks/sweethome3d/HomeFramePane.java ++++ b/src/com/eteks/sweethome3d/HomeFramePane.java +@@ -123,7 +123,7 @@ public class HomeFramePane extends JRoot + homeFrame.setIconImage(frameImages.get(0)); + } + if (OperatingSystem.isMacOSXLionOrSuperior()) { +- MacOSXConfiguration.installToolBar(this); ++// MacOSXConfiguration.installToolBar(this); + } + updateFrameTitle(homeFrame, this.home, this.application); + // Change component orientation diff --git a/debian/patches/03novideo b/debian/patches/03novideo index 4138efd..145f7ee 100644 --- a/debian/patches/03novideo +++ b/debian/patches/03novideo @@ -62,7 +62,7 @@ Author: Gabriele Giacone <[email protected]> <!-- Copy resources excepted furniture, textures and help files --> --- a/src/com/eteks/sweethome3d/swing/package.properties +++ b/src/com/eteks/sweethome3d/swing/package.properties -@@ -1048,8 +1048,8 @@ HomePane.CREATE_PHOTOS_AT_POINTS_OF_VIEW +@@ -1052,8 +1052,8 @@ HomePane.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 @@ -75,7 +75,7 @@ Author: Gabriele Giacone <[email protected]> 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 -@@ -315,7 +315,7 @@ public class HomeController implements C +@@ -316,7 +316,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); diff --git a/debian/patches/04manifest b/debian/patches/04manifest index a876697..9b9e6b3 100644 --- a/debian/patches/04manifest +++ b/debian/patches/04manifest @@ -3,7 +3,7 @@ Author: Gabriele Giacone <[email protected]> --- a/build.xml +++ b/build.xml -@@ -454,6 +454,7 @@ +@@ -446,6 +446,7 @@ <jar destfile="install/SweetHome3D-${version}.jar"> <manifest> <attribute name="Main-Class" value="com.eteks.sweethome3d.SweetHome3DBootstrap"/> -- 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
