.classpath

@@ -17,7 +17,7 @@
 	<classpathentry kind="lib" path="libtest/jdepend-2.9.jar"/>
 	<classpathentry kind="lib" path="libtest/AppleJavaExtensions.jar"/>
 	<classpathentry kind="lib" path="libtest/jnlp.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
-	<classpathentry kind="lib" path="/Applications/Developer/jre1.5.0_22/lib/rt.jar" sourcepath="/Applications/Developer/Java Source/jdk-1.6_37/src.zip"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>

LICENSE.TXT

-Sweet Home 3D, Copyright (c) 2005-2018 Emmanuel PUYBARET / eTeks <info@eteks.com>
+Sweet Home 3D, Copyright (c) 2005-2019 Emmanuel PUYBARET / eTeks <info@eteks.com>
 
 This program is free software; you can redistribute it and/or modify it under the 
 terms of the GNU General Public License as published by the Free Software Foundation; 

README.TXT

-SWEET HOME 3D v 6.0
--------------------
+SWEET HOME 3D v 6.1a
+--------------------
 
 This archive contains source code of Sweet Home 3D, an interior design Java application.
 Please read http://www.sweethome3d.com/history.html for more information
@@ -7,7 +7,7 @@ about new features available in this version.
 
 You may also download this source code with the following SVN command:
 
-svn checkout https://svn.code.sf.net/p/sweethome3d/code/tags/V_6_0/SweetHome3D SweetHome3D
+svn checkout https://svn.code.sf.net/p/sweethome3d/code/tags/V_6_1_A/SweetHome3D SweetHome3D
 
 
 HOW TO USE THIS SOURCE CODE
@@ -66,5 +66,5 @@ Read LICENSE.TXT file for more details about licenses applicable to this softwar
 and included materials developed by third parties.
     
     
-Sweet Home 3D, Copyright (c) 2005-2018 Emmanuel PUYBARET / eTeks. 
+Sweet Home 3D, Copyright (c) 2005-2019 Emmanuel PUYBARET / eTeks. 
 Distributed under GNU General Public License    
\ No newline at end of file

build.xml

 <?xml version="1.0"?>
 <!-- build.xml
 
-     Sweet Home 3D, Copyright (c) 2007-2018 Emmanuel PUYBARET / eTeks <info@eteks.com>.
+     Sweet Home 3D, Copyright (c) 2007-2019 Emmanuel PUYBARET / eTeks <info@eteks.com>.
 
      Ant build file. Available targets :
      - build       : Builds SweetHome3D.jar file in build directory
@@ -33,7 +33,7 @@
 -->
 <project basedir="." default="jarExecutable" name="SweetHome3D">
   <!-- The current version of Sweet Home 3D -->
-  <property name="version" value="6.0"/>
+  <property name="version" value="6.1"/>
 
   <target name="build"
           description="Builds build/SweetHome3D.jar with all its classes">
@@ -509,6 +509,7 @@
         <include name="COPYING.TXT"/>
         <include name="THIRDPARTY-LICENSE-JAVA3D.TXT"/>
         <include name="THIRDPARTY-LICENSE-BATIK.TXT"/>
+      	<include name="THIRDPARTY-LICENSE-JEKSPARSER.TXT"/>
         <include name="THIRDPARTY-LICENSE-ITEXT.TXT"/>
         <include name="THIRDPARTY-LICENSE-VECTORGRAPHICS.TXT"/>
         <include name="THIRDPARTY-LICENSE-SUNFLOW.TXT"/>
@@ -524,8 +525,8 @@
   </target>
 
   <!-- Builds Sweet Home 3D Windows launcher in install/windows/build directory.
-       CAUTION : May be run only under Windows 64 bit and requires Windows 32 bit JRE 1.8.0_181,
-                 64 bit JRE 1.8.0_181 and launch4j installed in their default location -->
+       CAUTION : May be run only under Windows 64 bit and requires Windows 32 bit JRE 1.8.0_202,
+                 64 bit JRE 1.8.0_202 and launch4j installed in their default location -->
   <target name="windowsLauncher" depends="application,furniture,textures,examples,help,jogl-java3d"
           description="Builds Sweet Home 3D Windows launcher">
     <!-- Copy SweetHome3D JARs and Windows Java 3D DLLs and JARs for Java 3D
@@ -574,6 +575,7 @@
     <copy file="THIRDPARTY-LICENSE-JAVA.TXT"      todir="install/windows/build" />
     <copy file="THIRDPARTY-LICENSE-JAVA3D.TXT"    todir="install/windows/build" />
     <copy file="THIRDPARTY-LICENSE-BATIK.TXT"     todir="install/windows/build"/>
+  	<copy file="THIRDPARTY-LICENSE-JEKSPARSER.TXT"     todir="install/windows/build"/>
     <copy file="THIRDPARTY-LICENSE-ITEXT.TXT"          todir="install/windows/build" />
     <copy file="THIRDPARTY-LICENSE-VECTORGRAPHICS.TXT" todir="install/windows/build" />
     <copy file="THIRDPARTY-LICENSE-SUNFLOW.TXT"   todir="install/windows/build" />
@@ -585,7 +587,7 @@
     <!-- Copy 32 bit JRE to install/windows/build/jre/x86... excluding files mentioned
          in JRE README.TXT file (JRE bin/javaw.exe command excepted) -->
     <copy todir="install/windows/build/jre8/x86">
-      <fileset dir="C:\Program Files (x86)\Java\jre1.8.0_181">
+      <fileset dir="C:\Program Files (x86)\Java\jre1.8.0_202">
         <include name="*"/>
         <include name="bin/**"/>
         <include name="lib/**"/>
@@ -650,7 +652,7 @@
     <!-- Copy 64 bit JRE to install/windows/build/jre/x64... excluding files mentioned
          in JRE README.TXT file (JRE bin/javaw.exe command excepted) -->
     <copy todir="install/windows/build/jre8/x64">
-      <fileset dir="C:\Program Files\Java\jre1.8.0_181">
+      <fileset dir="C:\Program Files\Java\jre1.8.0_202">
         <include name="*"/>
         <include name="bin/**"/>
         <include name="lib/**"/>
@@ -730,20 +732,20 @@
     </exec>
 
     <!-- Pack largest jars -->
-    <exec executable="C:\Program Files\Java\jre1.8.0_181\bin\pack200.exe" failonerror="yes">
+    <exec executable="C:\Program Files\Java\jre1.8.0_202\bin\pack200.exe" failonerror="yes">
       <arg value="${basedir}\install\windows\build\lib\SweetHome3D.pack.gz"/>
       <arg value="${basedir}\install\windows\build\lib\SweetHome3D.jar"/>
     </exec>
     <delete file="${basedir}\install\windows\build\lib\SweetHome3D.jar"/>
 
-    <exec executable="C:\Program Files\Java\jre1.8.0_181\bin\pack200.exe" failonerror="yes">
+    <exec executable="C:\Program Files\Java\jre1.8.0_202\bin\pack200.exe" failonerror="yes">
       <arg value="-J-Xmx512m"/>
       <arg value="${basedir}\install\windows\build\jre8\x86\lib\rt.pack.gz"/>
       <arg value="${basedir}\install\windows\build\jre8\x86\lib\rt.jar"/>
     </exec>
     <delete file="${basedir}\install\windows\build\jre8\x86\lib\rt.jar"/>
 
-    <exec executable="C:\Program Files\Java\jre1.8.0_181\bin\pack200.exe" failonerror="yes">
+    <exec executable="C:\Program Files\Java\jre1.8.0_202\bin\pack200.exe" failonerror="yes">
       <arg value="-J-Xmx512m"/>
       <arg value="${basedir}\install\windows\build\jre8\x64\lib\rt.pack.gz"/>
       <arg value="${basedir}\install\windows\build\jre8\x64\lib\rt.jar"/>
@@ -753,8 +755,8 @@
 
   <!-- Builds install/SweetHome3D-version-windows.exe installer able to install SweetHome3D.exe
        with a Windows JRE and Sweet Home 3D libraries.
-       CAUTION : May be run only under Windows 64 bit and requires Windows 32 bit JRE 1.8.0_181, 
-                 64 bit JRE 1.8.0_181, launch4j and Inno Setup Unicode installed in their default location -->
+       CAUTION : May be run only under Windows 64 bit and requires Windows 32 bit JRE 1.8.0_202, 
+                 64 bit JRE 1.8.0_202, launch4j and Inno Setup Unicode installed in their default location -->
   <target name="windowsInstaller" depends="windowsLauncher"
           description="Builds install/SweetHome3D-version-windows.exe installer">
     <!-- Create SweetHome3D-version-windows.exe with Inno Setup Unicode -->
@@ -777,8 +779,8 @@
 
   <!-- Builds install/SweetHome3D-version-windows.exe signed installer able to install SweetHome3D.exe
        with a Windows JRE and Sweet Home 3D libraries.
-       CAUTION : May be run only under Windows 64 bit and requires Windows 32 bit JRE 1.8.0_181, 
-                 64 bit JRE 1.8.0_181, launch4j, Inno Setup Unicode and SignTool included in Windows platform SDK
+       CAUTION : May be run only under Windows 64 bit and requires Windows 32 bit JRE 1.8.0_202, 
+                 64 bit JRE 1.8.0_202, launch4j, Inno Setup Unicode and SignTool included in Windows platform SDK
                  installed in their default location -->
   <target name="windowsSignedInstaller" depends="windowsLauncher"
           description="Builds install/SweetHome3D-version-windows.exe installer">
@@ -793,6 +795,7 @@
       <arg value="${password}"/>
       <arg value="/t"/>
       <arg value="${timestampAuthorityURL}"/>
+      <arg value="${basedir}\install\windows\build\SweetHome3D-java3d-1.5.2-x86-d3d.exe"/>
       <arg value="${basedir}\install\windows\build\SweetHome3D-java3d-1.5.2-x86.exe"/>
       <arg value="${basedir}\install\windows\build\SweetHome3D-java3d-1.5.2-x64.exe"/>
       <arg value="${basedir}\install\windows\build\SweetHome3D-x86.exe"/>
@@ -874,6 +877,7 @@
     <copy file="LICENSE.TXT" todir="install/macosx/10.6/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-JAVA3D.TXT"     todir="install/macosx/10.6/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-BATIK.TXT"      todir="install/macosx/10.6/SweetHome3D-${version}" />
+  	<copy file="THIRDPARTY-LICENSE-JEKSPARSER.TXT"     todir="install/macosx/10.6/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-VECTORGRAPHICS.TXT" todir="install/macosx/10.6/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-SUNFLOW.TXT"    todir="install/macosx/10.6/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-JMF.HTML"       todir="install/macosx/10.6/SweetHome3D-${version}" />
@@ -944,7 +948,7 @@
   </target>
 
   <!-- Builds Sweet Home 3D Mac OS X application bundle in install/macosx/SweetHome3D-version directory. 
-       CAUTION : May be run only under Mac OS X and requires 64 bit JDK 1.8.0_181 installed in its default location -->
+       CAUTION : May be run only under Mac OS X and requires 64 bit JDK 1.8.0_202 installed in its default location -->
   <target name="macosxBundle" depends="application,furniture,textures,examples,help,jogl-java3d"
           description="Builds Sweet Home 3D Mac OS X application bundle">
     <!-- Copy Sweet Home 3D files to install/macosx/SweetHome3D-version/Sweet Home 3D.app -->
@@ -958,7 +962,6 @@
 
     <!-- Copy SweetHome3D JARs and its direct libs
          to install/macosx/SweetHome3D-version/Sweet Home 3D.app/Contents/Java -->
-    <mkdir dir="install/macosx/SweetHome3D-${version}/Sweet Home 3D.app/Contents/Resources/Java/ext"/>
     <move file="build/SweetHome3D.jar" todir="install/macosx/SweetHome3D-${version}/Sweet Home 3D.app/Contents/Java" />
     <move file="build/Furniture.jar"   todir="install/macosx/SweetHome3D-${version}/Sweet Home 3D.app/Contents/Java" />
     <move file="build/Textures.jar"    todir="install/macosx/SweetHome3D-${version}/Sweet Home 3D.app/Contents/Java" />
@@ -977,6 +980,7 @@
     </copy>
     <!-- Copy jnlp.jar, JMF and Mac OS X Java 3D 1.6 DLLs and JARs for Java 3D
          to install/macosx/SweetHome3D-version/Sweet Home 3D.app/Contents/Java/ext -->
+    <mkdir dir="install/macosx/SweetHome3D-${version}/Sweet Home 3D.app/Contents/Java/ext"/>
     <copy file="libtest/jnlp.jar" todir="install/macosx/SweetHome3D-${version}/Sweet Home 3D.app/Contents/Java/ext"/>
     <copy file="lib/jmf.jar" todir="install/macosx/SweetHome3D-${version}/Sweet Home 3D.app/Contents/Java/ext"/>
     <copy todir="install/macosx/SweetHome3D-${version}/Sweet Home 3D.app/Contents/Java/ext" >
@@ -997,7 +1001,7 @@
     <!-- Copy JRE included in JDK to install/macosx/SweetHome3D-version/Contents/Plugins/Java.runtime/Contents/Home   
          excluding unnecessary files mentioned in JDK README.TXT file -->
     <copy todir="install/macosx/SweetHome3D-${version}/Sweet Home 3D.app/Contents/Plugins/Java.runtime/Contents/Home/jre">
-      <fileset dir="/Library/Java/JavaVirtualMachines/jdk1.8.0_181.jdk/Contents/Home/jre">
+      <fileset dir="/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home/jre">
         <include name="**"/>
         <exclude name="lib/ext/sunec.jar"/>
         <exclude name="lib/ext/sunpkcs11.jar"/>
@@ -1038,6 +1042,7 @@
     <copy file="LICENSE.TXT" todir="install/macosx/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-JAVA3D.TXT"     todir="install/macosx/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-BATIK.TXT"      todir="install/macosx/SweetHome3D-${version}" />
+  	<copy file="THIRDPARTY-LICENSE-JEKSPARSER.TXT"     todir="install/macosx/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-VECTORGRAPHICS.TXT" todir="install/macosx/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-SUNFLOW.TXT"   todir="install/macosx/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-JMF.HTML"       todir="install/macosx/SweetHome3D-${version}" />
@@ -1046,7 +1051,7 @@
 
   <!-- Builds install/SweetHome3D-version-macosx.dmg archive that contains SweetHome3D.app
        and Sweet Home 3D libraries.
-       CAUTION : May be run only under Mac OS X and requires 64 bit JDK 1.8.0_181 
+       CAUTION : May be run only under Mac OS X and requires 64 bit JDK 1.8.0_202 
                  installed in its default location and Disk Utility -->
   <target name="macosxInstaller" depends="macosxBundle"
           description="Builds install/SweetHome3D-version-macosx.dmg archive">
@@ -1070,7 +1075,7 @@
 
   <!-- Builds install/SweetHome3D-version-macosx.dmg signed archive that contains SweetHome3D.app
        and Sweet Home 3D libraries.
-       CAUTION : May be run only under Mac OS X and requires 64 bit JDK 1.8.0_181 installed in 
+       CAUTION : May be run only under Mac OS X and requires 64 bit JDK 1.8.0_202 installed in 
                  its default location, hdiutil, codesign and a certificate imported in Keychain Access -->
   <target name="macosxSignedInstaller" depends="macosxBundle"
           description="Builds install/SweetHome3D-version-macosx.dmg archive">
@@ -1110,7 +1115,7 @@
 
   <!-- Builds install/SweetHome3D-version-linux-x86.tgz archive that contains SweetHome3D command
        with a Linux JRE and Sweet Home 3D libraries.
-       CAUTION : Requires a Linux 32 bit JRE installed in jre1.8.0_181 -->
+       CAUTION : Requires a Linux 32 bit JRE installed in jre1.8.0_202 -->
   <target name="linux32Installer" depends="application,furniture,textures,examples,help,jogl-java3d"
           description="Builds install/SweetHome3D-version-linux-x86.tgz archive">
     <!-- Copy SweetHome3D.jar and Linux Java 3D DLLs and JARs for Java 3D
@@ -1152,6 +1157,7 @@
     <copy file="THIRDPARTY-LICENSE-JAVA.TXT"      todir="install/linux/x86/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-JAVA3D.TXT"    todir="install/linux/x86/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-BATIK.TXT"     todir="install/linux/x86/SweetHome3D-${version}" />
+  	<copy file="THIRDPARTY-LICENSE-JEKSPARSER.TXT"     todir="install/linux/x86/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-ITEXT.TXT"          todir="install/linux/x86/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-VECTORGRAPHICS.TXT" todir="install/linux/x86/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-SUNFLOW.TXT"   todir="install/linux/x86/SweetHome3D-${version}" />
@@ -1163,7 +1169,7 @@
     <!-- Copy JRE to install/linux/x86/SweetHome3D-version/jre... excluding files mentioned
          in JRE README.TXT file (JRE bin/java command excepted) -->
     <copy todir="install/linux/x86/SweetHome3D-${version}/jre8">
-      <fileset dir="jre1.8.0_181">
+      <fileset dir="jre1.8.0_202">
         <include name="**"/>
         <exclude name="lib/ext/sunec.jar"/>
         <exclude name="lib/ext/sunpkcs11.jar"/>
@@ -1225,7 +1231,7 @@
 
   <!-- Builds install/SweetHome3D-version-linux-x64.tgz archive that contains SweetHome3D command
        with a Linux JRE and Sweet Home 3D libraries.
-       CAUTION : Requires a Linux 64 bit JRE installed in jre1.8.0_181 -->
+       CAUTION : Requires a Linux 64 bit JRE installed in jre1.8.0_202 -->
   <target name="linux64Installer" depends="application,furniture,textures,examples,help,jogl-java3d"
           description="Builds install/SweetHome3D-version-linux-x64.tgz archive">
     <!-- Copy SweetHome3D.jar and Linux Java 3D DLLs and JARs for Java 3D
@@ -1269,6 +1275,7 @@
     <copy file="THIRDPARTY-LICENSE-JAVA.TXT"      todir="install/linux/x64/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-JAVA3D.TXT"    todir="install/linux/x64/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-BATIK.TXT"     todir="install/linux/x64/SweetHome3D-${version}" />
+  	<copy file="THIRDPARTY-LICENSE-JEKSPARSER.TXT"     todir="install/linux/x64/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-ITEXT.TXT"          todir="install/linux/x64/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-VECTORGRAPHICS.TXT" todir="install/linux/x64/SweetHome3D-${version}" />
     <copy file="THIRDPARTY-LICENSE-SUNFLOW.TXT"   todir="install/linux/x64/SweetHome3D-${version}" />
@@ -1280,7 +1287,7 @@
     <!-- Copy JRE to install/linux/x64/SweetHome3D-version/jre... excluding files mentioned
          in JRE README.TXT file (JRE bin/java command excepted) -->
     <copy todir="install/linux/x64/SweetHome3D-${version}/jre8">
-      <fileset dir="jre1.8.0_181/">
+      <fileset dir="jre1.8.0_202/">
         <include name="**"/>
         <exclude name="lib/ext/sunec.jar"/>
         <exclude name="lib/ext/sunpkcs11.jar"/>
@@ -1416,17 +1423,26 @@
     <copy file="THIRDPARTY-LICENSE-JAVA.TXT"       todir="install/portable/SweetHome3D-${version}-portable" />
     <copy file="THIRDPARTY-LICENSE-JAVA3D.TXT"     todir="install/portable/SweetHome3D-${version}-portable" />
     <copy file="THIRDPARTY-LICENSE-BATIK.TXT"      todir="install/portable/SweetHome3D-${version}-portable" />
+  	<copy file="THIRDPARTY-LICENSE-JEKSPARSER.TXT"     todir="install/portable/SweetHome3D-${version}-portable" />
     <copy file="THIRDPARTY-LICENSE-ITEXT.TXT"          todir="install/portable/SweetHome3D-${version}-portable" />
     <copy file="THIRDPARTY-LICENSE-VECTORGRAPHICS.TXT" todir="install/portable/SweetHome3D-${version}-portable" />
     <copy file="THIRDPARTY-LICENSE-SUNFLOW.TXT"   todir="install/portable/SweetHome3D-${version}-portable" />
     <copy file="THIRDPARTY-LICENSE-JMF.HTML"      todir="install/portable/SweetHome3D-${version}-portable" />
     <copy file="THIRDPARTY-LICENSE-LAUNCH4J.TXT"  todir="install/portable/SweetHome3D-${version}-portable" />
     <copy file="THIRDPARTY-LICENSE-TANGO.TXT"     todir="install/portable/SweetHome3D-${version}-portable" />
+    <!-- Copy Mac OS X 10.6 application bundle using a different Info.plist file -->
+    <copy todir="install/portable/SweetHome3D-${version}-portable/SweetHome3D-macosx-10.6.app">
+      <fileset dir="install/macosx/10.6/Sweet Home 3D"/>
+    </copy>
+    <copy file="install/portable/Info-10.6.plist" tofile="install/portable/SweetHome3D-${version}-portable/SweetHome3D-macosx-10.6.app/Contents/Info.plist" overwrite="true"/>
+    <!-- Change executable permission of SweetHome3D lost during copy task -->
+    <chmod perm="+x" file="install/portable/SweetHome3D-${version}-portable/SweetHome3D-macosx-10.6.app/Contents/MacOS/SweetHome3D"/>
+
     <!-- Copy Mac OS X application bundle using a different Info.plist file -->
     <copy todir="install/portable/SweetHome3D-${version}-portable/SweetHome3D-macosx.app">
       <fileset dir="install/macosx/Sweet Home 3D"/>
     </copy>
-    <copy file="install/portable/Info.plist" todir="install/portable/SweetHome3D-${version}-portable/SweetHome3D-macosx.app/Contents" overwrite="true"/>
+    <copy file="install/portable/SweetHome3D.cfg" todir="install/portable/SweetHome3D-${version}-portable/SweetHome3D-macosx.app/Contents/Java" overwrite="true"/>
     <!-- Change executable permission of SweetHome3D lost during copy task -->
     <chmod perm="+x" file="install/portable/SweetHome3D-${version}-portable/SweetHome3D-macosx.app/Contents/MacOS/SweetHome3D"/>
 
@@ -1441,6 +1457,7 @@
     <mkdir dir="install/portable/SweetHome3D-${version}-portable/jre/windows/x64"/>
     <mkdir dir="install/portable/SweetHome3D-${version}-portable/jre/linux/i586"/>
     <mkdir dir="install/portable/SweetHome3D-${version}-portable/jre/linux/x64"/>
+    <mkdir dir="install/portable/SweetHome3D-${version}-portable/jre/macosx/x64"/>
 
     <!-- Prepare data directories for SH3F, SH3T, SH3L and SH3P files -->
     <mkdir dir="install/portable/SweetHome3D-${version}-portable/data/furniture"/>
@@ -1525,7 +1542,7 @@
       <footer><![CDATA[<a href='http://www.sweethome3d.com' target='_parent'><font size='+1'>Sweet Home 3D ${version}</font></a>]]></footer>
       <bottom><![CDATA[<table align='center'><tr>
                        <td><a href='http://www.eteks.com' target='_parent'><img align='absmiddle' src='http://www.sweethome3d.com/images/eteks.gif' border='0'><a></td>
-                       <td>&copy; Copyrights 2006-2018 Emmanuel PUYBARET / <a href='http://www.eteks.com' target='_parent'>eTeks</a>
+                       <td>&copy; Copyrights 2006-2019 Emmanuel PUYBARET / <a href='http://www.eteks.com' target='_parent'>eTeks</a>
                            <br>Distributed under <a href='http://www.gnu.org/licenses/gpl-2.0.html' target='_parent'>GNU General Public License</a></td></tr></table>]]></bottom>
       <link href="http://docs.oracle.com/javase/1.5.1/docs/api/"/>
       <link href="http://download.java.net/media/java3d/javadoc/1.5.3/"/>

debian/changelog

+sweethome3d (6.1+dfsg-1) unstable; urgency=medium
+
+  [ John Scott ]
+  * move Vcs to Salsa
+
+  [ Markus Koschany ]
+  * New upstream version 6.1+dfsg.
+  * Declare compliance with Debian Policy 4.3.0.
+  * Rebase no-MacOSX.patch.
+
+ -- Markus Koschany <apo@debian.org>  Mon, 28 Jan 2019 15:19:27 +0100
+
 sweethome3d (6.0+dfsg-1) unstable; urgency=medium
 
   * New upstream version 6.0+dfsg

debian/control

@@ -15,7 +15,7 @@ Build-Depends:
  libitext-java,
  libjava3d-java,
  libsunflow-java (>= 0.07.2.svn396+dfsg-11)
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Vcs-Git: https://salsa.debian.org/java-team/sweethome3d.git
 Vcs-Browser: https://salsa.debian.org/java-team/sweethome3d
 Homepage: http://www.sweethome3d.com/

debian/copyright

@@ -2,9 +2,11 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Sweet Home 3D - Interior 2D design application with 3D preview
 Upstream-Contact: Emmanuel Puybaret, eTeks <info@eteks.com>
 Source: http://www.sweethome3d.com/
+Comment:
+ See README.source how and why we repack the sources.
 
 Files: *
-Copyright: 2006-2017, Emmanuel Puybaret, eTeks <info@eteks.com>
+Copyright: 2006-2019, Emmanuel Puybaret, eTeks <info@eteks.com>
 License: GPL-2+
 
 Files: src/com/eteks/sweethome3d/swing/resources/icons/tango/*
@@ -15,7 +17,7 @@ License: public-domain
 
 Files: debian/*
 Copyright: 2011,      Gabriele Giacone <1o5g4r8o@gmail.com>
-           2016-2018, Markus Koschany <apo@debian.org>
+           2016-2019, Markus Koschany <apo@debian.org>
 License: GPL-2+
 
 License: GPL-2+

debian/patches/04manifest.patch

@@ -7,7 +7,7 @@ Subject: 04manifest
  1 file changed, 1 insertion(+)
 
 diff --git a/build.xml b/build.xml
-index f9b8033..7253874 100644
+index 72f1ccf..8cf3491 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -478,6 +478,7 @@

debian/patches/build.patch

@@ -7,7 +7,7 @@ Subject: build
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/build.xml b/build.xml
-index fc66d0e..a1afadf 100644
+index b4f77ec..776abbd 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -51,7 +51,8 @@

debian/patches/no-MacOSX.patch

 From: Markus Koschany <apo@debian.org>
-Date: Sun, 14 Oct 2018 14:30:32 +0200
-Subject: no-MacOSX
+Date: Mon, 28 Jan 2019 14:42:30 +0100
+Subject: no MacOSX
 
 ---
- src/com/eteks/sweethome3d/HomeFramePane.java       |   4 +-
- src/com/eteks/sweethome3d/MacOSXConfiguration.java | 864 ---------------------
- src/com/eteks/sweethome3d/SweetHome3D.java         |  11 +-
+ src/com/eteks/sweethome3d/HomeFramePane.java       |   8 +-
+ src/com/eteks/sweethome3d/MacOSXConfiguration.java | 868 ---------------------
+ src/com/eteks/sweethome3d/SweetHome3D.java         |   9 +-
  .../eteks/sweethome3d/tools/OperatingSystem.java   |   9 +-
- 4 files changed, 11 insertions(+), 877 deletions(-)
+ 4 files changed, 12 insertions(+), 882 deletions(-)
  delete mode 100644 src/com/eteks/sweethome3d/MacOSXConfiguration.java
 
 diff --git a/src/com/eteks/sweethome3d/HomeFramePane.java b/src/com/eteks/sweethome3d/HomeFramePane.java
-index 57fb352..002912c 100644
+index e2b8e09..f3ade00 100644
 --- a/src/com/eteks/sweethome3d/HomeFramePane.java
 +++ b/src/com/eteks/sweethome3d/HomeFramePane.java
-@@ -123,9 +123,9 @@ public class HomeFramePane extends JRootPane implements View {
+@@ -113,7 +113,7 @@ public class HomeFramePane extends JRootPane implements View {
+     List<Image> frameImages = new ArrayList<Image>(3);
+     frameImages.add(new ImageIcon(HomeFramePane.class.getResource("resources/frameIcon.png")).getImage());
+     frameImages.add(new ImageIcon(HomeFramePane.class.getResource("resources/frameIcon32x32.png")).getImage());
+-    if (OperatingSystem.isMacOSXLeopardOrSuperior()) {
++    /*if (OperatingSystem.isMacOSXLeopardOrSuperior()) {
+       frameImages.add(new ImageIcon(HomeFramePane.class.getResource("resources/frameIcon128x128.png")).getImage());
+     }
+     try {
+@@ -122,14 +122,14 @@ public class HomeFramePane extends JRootPane implements View {
+     } catch (Exception ex) {
        // Call setIconImage available in previous versions
        homeFrame.setIconImage(frameImages.get(0));
-     }
--    if (OperatingSystem.isMacOSXLionOrSuperior()) {
-+    /*if (OperatingSystem.isMacOSXLionOrSuperior()) {
-       MacOSXConfiguration.installToolBar(this);
 -    }
 +    }*/
      updateFrameTitle(homeFrame, this.home, this.application);
      // Change component orientation
      applyComponentOrientation(ComponentOrientation.getOrientation(Locale.getDefault()));
+ 
+-    if (OperatingSystem.isMacOSXLionOrSuperior()) {
++    /*if (OperatingSystem.isMacOSXLionOrSuperior()) {
+       MacOSXConfiguration.installToolBar(this);
+-    }
++    }*/
+     // Compute frame size and location
+     computeFrameBounds(this.home, homeFrame);
+     // Enable windows to update their content while window resizing
 diff --git a/src/com/eteks/sweethome3d/MacOSXConfiguration.java b/src/com/eteks/sweethome3d/MacOSXConfiguration.java
 deleted file mode 100644
-index d3fb533..0000000
+index a78431d..0000000
 --- a/src/com/eteks/sweethome3d/MacOSXConfiguration.java
 +++ /dev/null
-@@ -1,864 +0,0 @@
+@@ -1,868 +0,0 @@
 -/*
 - * MacOSXConfiguraton.java 6 sept. 2006
 - *
@@ -697,11 +712,14 @@ index d3fb533..0000000
 -   */
 -  public static void installToolBar(final JRootPane rootPane) {
 -    List<JToolBar> toolBars = SwingTools.findChildren(rootPane, JToolBar.class);
--    if (OperatingSystem.isJavaVersionGreaterOrEqual("1.7.0_12")
--        && toolBars.size() == 1) {
--      rootPane.putClientProperty("apple.awt.brushMetalLook", true);
+-    if (toolBars.size() == 1) {
 -      final JToolBar toolBar = toolBars.get(0);
+-      // Bars used to manage floating system under Java 6, and gradient rendering of the tool bar
+-      // forbids to use the floating system under further Java versions
+-      toolBar.setFloatable(toolBar.isFloatable() && toolBar.getComponentOrientation().isLeftToRight());
+-      if (OperatingSystem.isJavaVersionGreaterOrEqual("1.7.0_12")) {
 -        toolBar.setFloatable(false);
+-        rootPane.putClientProperty("apple.awt.brushMetalLook", true);
 -        toolBar.setBorder(new AbstractBorder() {
 -            private final Color TOP_GRADIENT_COLOR_ACTIVATED_FRAME = OperatingSystem.isMacOSXYosemiteOrSuperior()
 -                ? new Color(212, 212, 212)
@@ -841,6 +859,7 @@ index d3fb533..0000000
 -        }
 -      }
 -    }
+-  }
 -
 -  /**
 -   * Returns <code>true</code> if the given window is displayed in full screen mode.
@@ -897,7 +916,7 @@ index d3fb533..0000000
 -  }
 -}
 diff --git a/src/com/eteks/sweethome3d/SweetHome3D.java b/src/com/eteks/sweethome3d/SweetHome3D.java
-index 0059285..04a67b3 100644
+index 0059285..7b088fe 100644
 --- a/src/com/eteks/sweethome3d/SweetHome3D.java
 +++ b/src/com/eteks/sweethome3d/SweetHome3D.java
 @@ -486,7 +486,7 @@ public class SweetHome3D extends HomeApplication {
@@ -909,19 +928,22 @@ index 0059285..04a67b3 100644
      }
  
      // Run everything else in Event Dispatch Thread
-@@ -524,9 +524,9 @@ public class SweetHome3D extends HomeApplication {
-       if (System.getProperty("apple.laf.useScreenMenuBar") == null) {
+@@ -521,13 +521,13 @@ public class SweetHome3D extends HomeApplication {
+       if (System.getProperty("apple.awt.application.name") == null) {
+         System.setProperty("apple.awt.application.name", applicationName);
+       }
+-      if (System.getProperty("apple.laf.useScreenMenuBar") == null) {
++      /*if (System.getProperty("apple.laf.useScreenMenuBar") == null) {
          // Use Mac OS X screen menu bar for frames menu bar
          // except for bundles under macOS 10.13
--        System.setProperty("apple.laf.useScreenMenuBar", 
--            String.valueOf(OperatingSystem.compareVersions(System.getProperty("os.version"), "10.13") < 0
--                || MacOSXConfiguration.isScreenMenuBarSupported()));
-+      //  System.setProperty("apple.laf.useScreenMenuBar", 
-+      //      String.valueOf(OperatingSystem.compareVersions(System.getProperty("os.version"), "10.13") < 0
-+      //          || MacOSXConfiguration.isScreenMenuBarSupported()));
-       }
+         System.setProperty("apple.laf.useScreenMenuBar", 
+             String.valueOf(OperatingSystem.compareVersions(System.getProperty("os.version"), "10.13") < 0
+                 || MacOSXConfiguration.isScreenMenuBarSupported()));
+-      }
++      }*/
        // Force the use of Quartz under Mac OS X for better Java 2D rendering performance
        System.setProperty("apple.awt.graphics.UseQuartz", "true");
+       if (System.getProperty("com.eteks.sweethome3d.dragAndDropWithoutTransferHandler") == null
 @@ -602,8 +602,7 @@ public class SweetHome3D extends HomeApplication {
                  && home.getName() == null
                  && !home.isRecovered()) {
@@ -933,7 +955,7 @@ index 0059285..04a67b3 100644
                  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 1d65707..ed5f8ac 100644
+index 1d65707..5a90e0b 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;

debian/patches/no-video.patch

@@ -12,7 +12,7 @@ Subject: no-video
  6 files changed, 11 insertions(+), 9 deletions(-)
 
 diff --git a/build.xml b/build.xml
-index fbd89aa..fc66d0e 100644
+index ea41437..b4f77ec 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -57,6 +57,8 @@
@@ -51,10 +51,10 @@ index 62f2983..877077e 100644
    /**
     * 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 0e862c6..763dadb 100644
+index d5ba445..d910a25 100644
 --- a/src/com/eteks/sweethome3d/swing/package.properties
 +++ b/src/com/eteks/sweethome3d/swing/package.properties
-@@ -1238,8 +1238,8 @@ HomePane.CREATE_PHOTOS_AT_POINTS_OF_VIEW.Name=Create photos at points of view...
+@@ -1240,8 +1240,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
  
@@ -66,7 +66,7 @@ index 0e862c6..763dadb 100644
  # 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 11840cb..6b520e8 100644
+index 0275f43..0c189bc 100644
 --- a/src/com/eteks/sweethome3d/viewcontroller/HomeController.java
 +++ b/src/com/eteks/sweethome3d/viewcontroller/HomeController.java
 @@ -337,7 +337,7 @@ public class HomeController implements Controller {

debian/patches/noadditionalprovisions.patch

@@ -7,7 +7,7 @@ Subject: noadditionalprovisions
  1 file changed, 1 insertion(+)
 
 diff --git a/build.xml b/build.xml
-index 7253874..fbd89aa 100644
+index 8cf3491..ea41437 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -95,6 +95,7 @@

debian/patches/series

 04manifest.patch
 noadditionalprovisions.patch
 disable-checkForUpdates.patch
-no-MacOSX.patch
 no-video.patch
 build.patch
+no-MacOSX.patch
 jeks-enum.patch

debian/source/lintian-overrides

+# Command to recreate this line is included in file
+source-is-missing

install/macosx/10.6/Sweet Home 3D/Contents/Info.plist

@@ -3,11 +3,11 @@
 <plist version="0.9">
 <dict>
 	<key>CFBundleGetInfoString</key>
-	<string>Sweet Home 3D 6.0 Copyright 2007-2018 eTeks</string>
+	<string>Sweet Home 3D 6.1 Copyright 2007-2019 eTeks</string>
 	<key>CFBundleVersion</key>
-	<string>6.0</string>
+	<string>6100</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.0</string>
+	<string>6.1</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -17,7 +17,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.eteks.sweethome3d.SweetHome3D</string>
 	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
+	<string>6.1</string>
 	<key>CFBundleName</key>
 	<string>Sweet Home 3D</string>
 	<key>CFBundlePackageType</key>
@@ -243,7 +243,7 @@
 		<key>Properties</key>
 		<dict>
 			<key>java.ext.dirs</key>
-			<string>$JAVAROOT/ext:/Library/Java/Extensions:/System/Library/Java/Extensions:/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home/lib/ext:/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext</string>
+			<string>$JAVAROOT/ext:/Library/Java/Extensions:/System/Library/Java/Extensions:/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home/lib/ext:/Library/Java/JavaVirtualMachines/1.6.1.jdk/Contents/Home/lib/ext</string>
 			<key>java.library.path</key>
 			<string>$JAVAROOT/ext</string>
 			<key>jogamp.gluegen.UseTempJarCache</key>

install/macosx/Sweet Home 3D/Contents/Info.plist

@@ -3,11 +3,11 @@
 <plist version="0.9">
 <dict>
 	<key>CFBundleGetInfoString</key>
-	<string>Sweet Home 3D 6.0 Copyright 2007-2018 eTeks</string>
+	<string>Sweet Home 3D 6.1 Copyright 2007-2019 eTeks</string>
 	<key>CFBundleVersion</key>
-	<string>6000</string>
+	<string>6100</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.0</string>
+	<string>6.1</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -17,7 +17,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.eteks.sweethome3d.SweetHome3D</string>
 	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
+	<string>6.1</string>
 	<key>CFBundleName</key>
 	<string>Sweet Home 3D</string>
 	<key>CFBundlePackageType</key>

install/portable/Info.plist → install/portable/Info-10.6.plist

@@ -3,11 +3,11 @@
 <plist version="0.9">
 <dict>
 	<key>CFBundleGetInfoString</key>
-	<string>Sweet Home 3D 6.0 Copyright 2007-2018 eTeks</string>
+	<string>Sweet Home 3D 6.1 Copyright 2007-2019 eTeks</string>
 	<key>CFBundleVersion</key>
-	<string>6.0</string>
+	<string>6100</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.0</string>
+	<string>6.1</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -17,7 +17,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.eteks.sweethome3d.SweetHome3D</string>
 	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
+	<string>6.1</string>
 	<key>CFBundleName</key>
 	<string>Sweet Home 3D</string>
 	<key>CFBundlePackageType</key>
@@ -201,7 +201,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>SweetHome3DTexturesLibrary.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>Sweet Home 3D Furniture Textures Format</string>
+			<string>Sweet Home 3D Textures Library Format</string>
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
@@ -243,7 +243,7 @@
 		<key>Properties</key>
 		<dict>
 			<key>java.ext.dirs</key>
-			<string>$APP_PACKAGE/../lib/ext:$APP_PACKAGE/../lib/ext/java3d-1.6:/Library/Java/Extensions:/System/Library/Java/Extensions:/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home/lib/ext:/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext</string>
+			<string>$APP_PACKAGE/../lib/ext:$APP_PACKAGE/../lib/ext/java3d-1.6:/Library/Java/Extensions:/System/Library/Java/Extensions:/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home/lib/ext:/Library/Java/JavaVirtualMachines/1.6.1.jdk/Contents/Home/lib/ext</string>
 			<key>java.library.path</key>
 			<string>$APP_PACKAGE/../lib/ext/java3d-1.6/macosx</string>
 			<key>jogamp.gluegen.UseTempJarCache</key>

install/portable/README.TXT

-SWEET HOME 3D v 6.0
+SWEET HOME 3D v 6.1
 -------------------
 
 The current folder contains the required applications and data to run Sweet Home 3D
@@ -8,12 +8,13 @@ To use Sweet Home 3D, simply copy the current folder on a fixed or a removable d
 and run the application matching your operating system:
 - SweetHome3D-windows-x86 for Windows 32 bits
 - SweetHome3D-windows-x64 for Windows 64 bits
-- SweetHome3D-macosx      for Mac OS X
+- SweetHome3D-macosx-10.6 for Mac OS X 10.6 and 10.7
+- SweetHome3D-macosx      for Mac OS X 10.8.3 and superior
 - SweetHome3D-linux-x86   for Linux 32 bits
 - SweetHome3D-linux-x64   for Linux 64 bits
 
 This version comes with the 1200+ pieces of furniture available at:
-http://www.sweethome3d.com/importModels.jsp
+http://www.sweethome3d.com/freeModels.jsp
 and the translations proposed by contributors at:
 http://www.sweethome3d.com/translations.jsp
 Note that some recent pieces of furniture might not be translated in your language.
@@ -29,7 +30,7 @@ Note also that the "data" sub folder matches the default configuration folder us
 by the other versions of Sweet Home 3D (installer, JAR executable file and Java Web 
 Start versions), i.e.:
 - C:\Users\user\AppData\Roaming\eTeks\Sweet Home 3D 
-  folder under Windows Vista / 7,
+  folder under Windows Vista / 7 / 8 / 10,
 - C:\Documents and Settings\user\Application Data\eTeks\Sweet Home 3D 
   folder under Windows XP and previous versions of Windows,
 - Library/Application Support/eTeks/Sweet Home 3D
@@ -53,5 +54,5 @@ CAUTION: YOU SHOULD NOT MOVE FILES FOUND IN FOLDERS DIFFERENT FROM THE ONE
 
 Visit http://www.sweethome3d.com to get more information on Sweet Home 3D
    
-Sweet Home 3D, Copyright (c) 2005-2018 Emmanuel PUYBARET / eTeks 
+Sweet Home 3D, Copyright (c) 2005-2019 Emmanuel PUYBARET / eTeks 
 Distributed under GNU General Public License    
\ No newline at end of file

install/portable/SweetHome3D-windows-x64.xml

 <!-- SweetHome3D-windows-x64.xml
 
-     Sweet Home 3D, Copyright (c) 2012-2018 Emmanuel PUYBARET / eTeks <info@eteks.com>
+     Sweet Home 3D, Copyright (c) 2012-2019 Emmanuel PUYBARET / eTeks <info@eteks.com>
 
      SweetHome3D-windows-x64.exe creator for Launch4j 
      This script requires launch4j available at http://launch4j.sourceforge.net/     
@@ -55,12 +55,12 @@
     <opt>-Djava.library.path=lib/ext/java3d-1.6/windows/amd64 -Djogamp.gluegen.UseTempJarCache=false -Dcom.eteks.sweethome3d.preferencesFolder=data -Dcom.eteks.sweethome3d.applicationFolders=data -Dcom.eteks.sweethome3d.deploymentInformation=portable -Dcom.eteks.sweethome3d.applicationId=SweetHome3D#Portable</opt>
   </jre>
   <versionInfo>
-    <fileVersion>6.0.0.0</fileVersion>
-    <txtFileVersion>6.0</txtFileVersion>
+    <fileVersion>6.1.0.0</fileVersion>
+    <txtFileVersion>6.1</txtFileVersion>
     <fileDescription>Sweet Home 3D</fileDescription>
-    <copyright>Copyright (c) 2007-2018 eTeks</copyright>
-    <productVersion>6.0.0.0</productVersion>
-    <txtProductVersion>6.0</txtProductVersion>
+    <copyright>Copyright (c) 2007-2019 eTeks</copyright>
+    <productVersion>6.1.0.0</productVersion>
+    <txtProductVersion>6.1</txtProductVersion>
     <productName>Sweet Home 3D</productName>
     <companyName>eTeks</companyName>
     <internalName>SweetHome3D</internalName>