README.TXT

-SWEET HOME 3D v 6.1.2
----------------------
+SWEET HOME 3D v 6.2
+-------------------
 
 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_1_2/SweetHome3D SweetHome3D
+svn checkout https://svn.code.sf.net/p/sweethome3d/code/tags/V_6_2/SweetHome3D SweetHome3D
 
 
 HOW TO USE THIS SOURCE CODE

build.xml

@@ -33,7 +33,7 @@
 -->
 <project basedir="." default="jarExecutable" name="SweetHome3D">
   <!-- The current version of Sweet Home 3D -->
-  <property name="version" value="6.1.2"/>
+  <property name="version" value="6.2"/>
 
   <target name="build"
           description="Builds build/SweetHome3D.jar with all its classes">

debian/changelog

+sweethome3d (6.2+dfsg-1) unstable; urgency=medium
+
+  * New upstream version 6.2+dfsg.
+  * Switch to debhelper-compat = 12.
+  * Declare compliance with Debian Policy 4.4.0.
+  * Tighten sweethome3d to java8-runtime.
+
+ -- Markus Koschany <apo@debian.org>  Sat, 20 Jul 2019 22:48:03 +0200
+
 sweethome3d (6.1.2+dfsg-2) unstable; urgency=medium
 
   * Replace dependency on icedtea-netx-common with icedtea-netx.

debian/compat

-11

debian/control

@@ -6,7 +6,7 @@ Uploaders:
  Markus Koschany <apo@debian.org>
 Build-Depends:
  ant,
- debhelper (>= 11),
+ debhelper-compat (= 12),
  default-jdk,
  icedtea-netx,
  imagemagick,
@@ -15,7 +15,7 @@ Build-Depends:
  libitext-java,
  libjava3d-java,
  libsunflow-java (>= 0.07.2.svn396+dfsg-11)
-Standards-Version: 4.3.0
+Standards-Version: 4.4.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/
@@ -23,7 +23,7 @@ Homepage: http://www.sweethome3d.com/
 Package: sweethome3d
 Architecture: all
 Depends:
- default-jre | java7-runtime,
+ default-jre | java8-runtime,
  icedtea-netx | sun-java6-bin,
  java-wrappers,
  libbatik-java,

debian/patches/04manifest.patch

@@ -7,7 +7,7 @@ Subject: 04manifest
  1 file changed, 1 insertion(+)
 
 diff --git a/build.xml b/build.xml
-index 72f1ccf..8cf3491 100644
+index d60b9f1..21531de 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 b4f77ec..776abbd 100644
+index c304ac8..0df8b9e 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -51,7 +51,8 @@

debian/patches/no-MacOSX.patch

 From: Markus Koschany <apo@debian.org>
-Date: Mon, 28 Jan 2019 14:42:30 +0100
-Subject: no MacOSX
+Date: Sat, 20 Jul 2019 22:50:38 +0200
+Subject: no-MacOSX
 
 ---
  src/com/eteks/sweethome3d/HomeFramePane.java       |   8 +-
@@ -916,7 +916,7 @@ index a78431d..0000000
 -  }
 -}
 diff --git a/src/com/eteks/sweethome3d/SweetHome3D.java b/src/com/eteks/sweethome3d/SweetHome3D.java
-index 0059285..7b088fe 100644
+index f080506..0227b82 100644
 --- a/src/com/eteks/sweethome3d/SweetHome3D.java
 +++ b/src/com/eteks/sweethome3d/SweetHome3D.java
 @@ -486,7 +486,7 @@ public class SweetHome3D extends HomeApplication {

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 ea41437..b4f77ec 100644
+index e84c930..c304ac8 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -57,6 +57,8 @@

debian/patches/noadditionalprovisions.patch

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

debian/patches/series

@@ -3,5 +3,5 @@ noadditionalprovisions.patch
 disable-checkForUpdates.patch
 no-video.patch
 build.patch
-no-MacOSX.patch
 jeks-enum.patch
+no-MacOSX.patch

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.1.2 Copyright 2007-2019 eTeks</string>
+	<string>Sweet Home 3D 6.2 Copyright 2007-2019 eTeks</string>
 	<key>CFBundleVersion</key>
-	<string>6120</string>
+	<string>6200</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.1.2</string>
+	<string>6.2</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.1.2</string>
+	<string>6.2</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.1.2.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.2.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.1.2 Copyright 2007-2019 eTeks</string>
+	<string>Sweet Home 3D 6.2 Copyright 2007-2019 eTeks</string>
 	<key>CFBundleVersion</key>
-	<string>6120</string>
+	<string>6200</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.1.2</string>
+	<string>6.2</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.1.2</string>
+	<string>6.2</string>
 	<key>CFBundleName</key>
 	<string>Sweet Home 3D</string>
 	<key>CFBundlePackageType</key>

install/portable/Info-10.6.plist

@@ -3,11 +3,11 @@
 <plist version="0.9">
 <dict>
 	<key>CFBundleGetInfoString</key>
-	<string>Sweet Home 3D 6.1.2 Copyright 2007-2019 eTeks</string>
+	<string>Sweet Home 3D 6.2 Copyright 2007-2019 eTeks</string>
 	<key>CFBundleVersion</key>
-	<string>6120</string>
+	<string>6200</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.1.2</string>
+	<string>6.2</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.1.2</string>
+	<string>6.2</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>$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.2.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.2.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.1.2
----------------------
+SWEET HOME 3D v 6.2
+-------------------
 
 The current folder contains the required applications and data to run Sweet Home 3D
 under Windows 32 bits, Windows 64 bits, Mac OS X, Linux 32 bits and Linux 64 bits.

install/portable/SweetHome3D-windows-x64.xml

@@ -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.1.2.0</fileVersion>
-    <txtFileVersion>6.1.2</txtFileVersion>
+    <fileVersion>6.2.0.0</fileVersion>
+    <txtFileVersion>6.2</txtFileVersion>
     <fileDescription>Sweet Home 3D</fileDescription>
     <copyright>Copyright (c) 2007-2019 eTeks</copyright>
-    <productVersion>6.1.2.0</productVersion>
-    <txtProductVersion>6.1.2</txtProductVersion>
+    <productVersion>6.2.0.0</productVersion>
+    <txtProductVersion>6.2</txtProductVersion>
     <productName>Sweet Home 3D</productName>
     <companyName>eTeks</companyName>
     <internalName>SweetHome3D</internalName>

install/portable/SweetHome3D-windows-x86.xml

@@ -53,12 +53,12 @@
     <opt>-Djava.library.path=lib/ext/java3d-1.6/windows/i586 -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.1.2.0</fileVersion>
-    <txtFileVersion>6.1.2</txtFileVersion>
+    <fileVersion>6.2.0.0</fileVersion>
+    <txtFileVersion>6.2</txtFileVersion>
     <fileDescription>Sweet Home 3D</fileDescription>
     <copyright>Copyright (c) 2007-2019 eTeks</copyright>
-    <productVersion>6.1.2.0</productVersion>
-    <txtProductVersion>6.1.2</txtProductVersion>
+    <productVersion>6.2.0.0</productVersion>
+    <txtProductVersion>6.2</txtProductVersion>
     <productName>Sweet Home 3D</productName>
     <companyName>eTeks</companyName>
     <internalName>SweetHome3D</internalName>

install/viewer/README.TXT

-SWEET HOME 3D VIEWER v 6.1.2
-----------------------------
+SWEET HOME 3D VIEWER v 6.2
+--------------------------
 
 This archive contains files required to install Sweet Home 3D Viewer, an 
 applet able to display the 3D view of a Sweet Home 3D file from its URL.

install/windows/installerInnoSetup.iss

@@ -2,7 +2,7 @@
 ;
 ; Sweet Home 3D, Copyright (c) 2007-2019 Emmanuel PUYBARET / eTeks <info@eteks.com>
 ;
-; SweetHome3D-6.1.2-windows.exe setup program creator
+; SweetHome3D-6.2-windows.exe setup program creator
 ; This UTF-8 BOM encoded script requires Inno Setup Unicode available at http://www.jrsoftware.org/isinfo.php
 ; and a build directory stored in current directory containing :
 ;   a SweetHome3D.exe file built with launch4j
@@ -14,9 +14,9 @@
 [Setup]
 DisableWelcomePage=no
 AppName=Sweet Home 3D
-AppVersion=6.1.2
+AppVersion=6.2
 AppCopyright=Copyright (c) 2007-2019 eTeks
-AppVerName=Sweet Home 3D version 6.1.2
+AppVerName=Sweet Home 3D version 6.2
 AppPublisher=eTeks
 AppPublisherURL=http://www.eteks.com
 AppSupportURL=http://sweethome3d.sourceforge.net
@@ -26,13 +26,13 @@ DefaultDirName={pf}\Sweet Home 3D
 DefaultGroupName=eTeks Sweet Home 3D
 LicenseFile=..\..\COPYING.TXT
 OutputDir=.
-OutputBaseFilename=SweetHome3D-6.1.2-windows
+OutputBaseFilename=SweetHome3D-6.2-windows
 Compression=lzma2/ultra64
 SolidCompression=yes
 ChangesAssociations=yes
 ExtraDiskSpaceRequired=107000000
-VersionInfoVersion=6.1.2.0
-VersionInfoTextVersion=6.1.2
+VersionInfoVersion=6.2.0.0
+VersionInfoTextVersion=6.2
 VersionInfoDescription=Sweet Home 3D Setup
 VersionInfoCopyright=Copyright (c) 2007-2019 eTeks
 VersionInfoCompany=eTeks

install/windows/installerLaunch4j-java3d-1.5.2-x64.xml

@@ -53,12 +53,12 @@
     <opt>-Djava.library.path=lib -Dcom.eteks.sweethome3d.applicationId=SweetHome3D#Installer</opt>
   </jre>
   <versionInfo>
-    <fileVersion>6.1.2.0</fileVersion>
-    <txtFileVersion>6.1.2</txtFileVersion>
+    <fileVersion>6.2.0.0</fileVersion>
+    <txtFileVersion>6.2</txtFileVersion>
     <fileDescription>Sweet Home 3D</fileDescription>
     <copyright>Copyright (c) 2007-2019 eTeks</copyright>
-    <productVersion>6.1.2.0</productVersion>
-    <txtProductVersion>6.1.2</txtProductVersion>
+    <productVersion>6.2.0.0</productVersion>
+    <txtProductVersion>6.2</txtProductVersion>
     <productName>Sweet Home 3D</productName>
     <companyName>eTeks</companyName>
     <internalName>SweetHome3D</internalName>