LICENSE.TXT

-Furniture Library Editor, Copyright (c) 2010-2018 Emmanuel PUYBARET / eTeks
+Furniture Library Editor, Copyright (c) 2010-2020 Emmanuel PUYBARET / eTeks
 
 This software is licensed by eTeks under GNU General Public License.
 Please, read COPYING.TXT file for more details about GNU General Public License.

README.TXT

-FURNITURE LIBRARY EDITOR v 1.24
+FURNITURE LIBRARY EDITOR v 1.25
 -------------------------------
 
 This archive contains source code of the Furniture Library Editor for Sweet Home 3D.
 
 You may also download this source code with the following SVN command:
 
-svn checkout https://svn.code.sf.net/p/sweethome3d/code/tags/V_1_24/FurnitureLibraryEditor FurnitureLibraryEditor
+svn checkout https://svn.code.sf.net/p/sweethome3d/code/tags/V_1_25/FurnitureLibraryEditor FurnitureLibraryEditor
 
 
 As this project depends on Sweet Home 3D, download and install also Sweet Home 3D source code from 
-http://prdownloads.sourceforge.net/sweethome3d/SweetHome3D-6.1-src.zip 
+http://prdownloads.sourceforge.net/sweethome3d/SweetHome3D-6.3-src.zip 
 or with the following SVN command: 
 
-svn checkout https://svn.code.sf.net/p/sweethome3d/code/tags/V_6_1/SweetHome3D SweetHome3D
+svn checkout https://svn.code.sf.net/p/sweethome3d/code/tags/V_6_3/SweetHome3D SweetHome3D
 
 
 HOW TO USE THIS SOURCE CODE
@@ -61,4 +61,4 @@ Read LICENSE.TXT file for more details about licenses applicable to this softwar
 and included materials developed by third parties.
     
     
-Copyright (c) 2010-2018 Emmanuel Puybaret / eTeks. Distributed under GNU General Public License    
\ No newline at end of file
+Copyright (c) 2010-2020 Emmanuel Puybaret / eTeks. Distributed under GNU General Public License    
\ No newline at end of file

build.xml

@@ -10,7 +10,7 @@
 -->
 <project basedir="." default="furnitureLibraryEditorJarExecutable" name="FurnitureLibraryEditor">
   <!-- The current version of the Furniture Library Editor -->
-  <property name="version" value="1.24"/>
+  <property name="version" value="1.25"/>
 
   <target name="furnitureLibraryEditor" 
           description="Builds build/FurnitureLibraryEditor.jar with all its classes">
@@ -24,6 +24,7 @@
       </extdirs>
       <classpath>
         <pathelement location="../SweetHome3D/libtest/AppleJavaExtensions.jar"/>
+        <pathelement location="../SweetHome3D/libtest/javaAwtDesktop.jar"/>
         <pathelement location="../SweetHome3D/libtest/jnlp.jar"/>
       </classpath>
     </javac>

debian/changelog

+sweethome3d-furniture-editor (1.25-1) unstable; urgency=medium
+
+  * New upstream version 1.25.
+  * Switch to debhelper-compat = 13.
+  * Declare compliance with Debian Policy 4.5.0.
+  * Remove get-orig-source target.
+
+ -- Markus Koschany <apo@debian.org>  Mon, 20 Apr 2020 00:52:03 +0200
+
 sweethome3d-furniture-editor (1.24-2) unstable; urgency=medium
 
   * Depend on icedtea-netx instead of icedtea-netx-common.

debian/compat

-11

debian/control

@@ -7,12 +7,12 @@ Uploaders:
  Markus Koschany <apo@debian.org>
 Build-Depends:
  ant,
- debhelper (>= 11),
+ debhelper-compat (= 13),
  default-jdk,
  imagemagick,
  sweethome3d (>= 5.7),
  unzip
-Standards-Version: 4.3.0
+Standards-Version: 4.5.0
 Homepage: http://www.sweethome3d.com
 Vcs-Git: https://salsa.debian.org/java-team/sweethome3d-furniture-editor.git
 Vcs-Browser: https://salsa.debian.org/java-team/sweethome3d-furniture-editor

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: Sweet Home 3D Furniture Library Editor
 Source: http://www.sweethome3d.com
 
 Files: *
-Copyright: 2010-2019, Emmanuel Puybaret, eTeks <info@eteks.com>
+Copyright: 2010-2020, Emmanuel Puybaret, eTeks <info@eteks.com>
 License: GPL-2+
 
 Files: src/com/eteks/sweethome3d/swing/resources/icons/tango/*
@@ -16,7 +16,7 @@ License: public-domain
 
 Files: debian/*
 Copyright: 2012,      Gabriele Giacone <1o5g4r8o@gmail.com>
-           2016-2019, Markus Koschany <apo@debian.org>
+           2016-2020, Markus Koschany <apo@debian.org>
 License: GPL-2+
 
 License: GPL-2+

debian/patches/build.patch

@@ -26,8 +26,8 @@ Forwarded: not-needed
        <extdirs>
          <pathelement location="../SweetHome3D/lib"/>
        </extdirs>
-@@ -26,7 +28,7 @@
-         <pathelement location="../SweetHome3D/libtest/AppleJavaExtensions.jar"/>
+@@ -27,7 +29,7 @@
+         <pathelement location="../SweetHome3D/libtest/javaAwtDesktop.jar"/>
          <pathelement location="../SweetHome3D/libtest/jnlp.jar"/>
        </classpath>
 -    </javac>
@@ -35,7 +35,7 @@ Forwarded: not-needed
      <!-- Compile Furniture Library Editor -->
      <javac srcdir="src" destdir="build/classes"
             encoding="ISO-8859-1" target="1.5">
-@@ -35,7 +37,10 @@
+@@ -36,7 +38,10 @@
        </extdirs>
        <classpath>
          <pathelement location="build/classes"/>
@@ -47,7 +47,7 @@ Forwarded: not-needed
          <pathelement location="../SweetHome3D/libtest/AppleJavaExtensions.jar"/>
        </classpath>
      </javac>
-@@ -48,12 +53,12 @@
+@@ -49,12 +54,12 @@
        </fileset>
      </copy>
      <copy todir="build/classes">
@@ -62,7 +62,7 @@ Forwarded: not-needed
          <exclude name="com/eteks/sweethome3d/io/Contributed*.*"/>
          <exclude name="com/eteks/sweethome3d/io/DefaultTextures*.*"/>
          <exclude name="com/eteks/sweethome3d/io/resources/**"/>
-@@ -62,10 +67,10 @@
+@@ -63,10 +68,10 @@
        </fileset>
      </copy>
      <copy todir="build/classes">
@@ -75,7 +75,7 @@ Forwarded: not-needed
          <exclude name="com/eteks/sweethome3d/io/Contributed*.*"/>
          <exclude name="com/eteks/sweethome3d/io/DefaultTextures*.*"/>
        </fileset>
-@@ -134,15 +139,16 @@
+@@ -135,15 +140,16 @@
      </zip>
    </target>
  
@@ -94,7 +94,7 @@ Forwarded: not-needed
        <fileset dir="../SweetHome3D/lib">
          <include name="*.jar"/>
          <include name="macosx/*.jar"/>
-@@ -173,7 +179,7 @@
+@@ -174,7 +180,7 @@
          <include name="THIRDPARTY-LICENSE-JAVA3D.TXT"/>
          <include name="THIRDPARTY-LICENSE-TANGO.TXT"/>
          <include name="THIRDPARTY-LICENSE-CONTRIBUTIONS.TXT"/>

debian/rules

@@ -31,12 +31,3 @@ override_dh_auto_clean:
 	rm -rf debian/icons
 	dh_clean
 
-TXZ=$(NAME)_$(VERS).orig.tar.xz
-TMPDIR=_tmpdir
-get-orig-source:
-	rm -f ../$(TXZ)
-	mkdir -p $(TMPDIR)
-	uscan --verbose --download-version $(VERS) --force-download --destdir $(TMPDIR)
-	unzip -q $(TMPDIR)/*.zip -d $(TMPDIR)
-	cd $(TMPDIR)/*-src; tar Jcvf ../../../$(TXZ) .
-	rm -rf $(TMPDIR)

src/com/eteks/furniturelibraryeditor/swing/package.properties

 # package.properties
 #
-# Furniture Library Editor, Copyright (c) 2009-2018 Emmanuel PUYBARET / eTeks <info@eteks.com>
+# Furniture Library Editor, Copyright (c) 2009-2020 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
@@ -119,10 +119,10 @@ EditorPane.about.message=<html><font face="sanssherif"><center><font size="+2"><
     <br><font size="-1">SVG path compilation provided by Batik</font>\
     <p>Please, visit http://www.sweethome3d.com/\
     <br>for software updates and bug report.\
-    </p><p><font size="-2">\u00a9 Copyrights 2010-2019 eTeks  info@eteks.com\
+    </p><p><font size="-2">\u00a9 Copyrights 2010-2020 eTeks  info@eteks.com\
     <br>Distributed under GNU General Public License</font>
 # Note to translators: dot not copy the 2 following keys in localized file
-EditorPane.about.version=1.24
+EditorPane.about.version=1.25
 EditorPane.about.icon=/com/eteks/furniturelibraryeditor/swing/resources/aboutIcon.png
 
 

src/com/eteks/furniturelibraryeditor/swing/package_fr.properties

 # package_fr.properties
 #
-# Furniture Library Editor, Copyright (c) 2009-2018 Emmanuel PUYBARET / eTeks <info@eteks.com>
+# Furniture Library Editor, Copyright (c) 2009-2020 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
@@ -79,7 +79,7 @@ EditorPane.about.message=<html><font face="sanssherif"><center><font size="+2"><
     <br><font size="-1">Compilation SVG path fournie par Batik</font>\
     <p>Rendez-vous sur http://www.sweethome3d.com/fr/\
     <br>pour mettre  jour ce logiciel ou faire des suggestions.\
-    </p><p><font size="-2">\u00a9 Copyrights 2010-2019 eTeks  info@eteks.com\
+    </p><p><font size="-2">\u00a9 Copyrights 2010-2020 eTeks  info@eteks.com\
     <br>Distribu sous licence GNU General Public License</font>
 
 FurnitureLanguageComboBox.defaultLanguage=Langue par dfaut

src/com/eteks/furniturelibraryeditor/viewcontroller/DefaultCategories_vi.properties

@@ -26,4 +26,5 @@ defaultFurnitureCategory#7=Ph\u00f2ng kh\u00e1ch
 defaultFurnitureCategory#8=C\u00e1c \u0111\u1ed1i t\u01b0\u1ee3ng kh\u00e1c
 defaultFurnitureCategory#9=V\u0103n ph\u00f2ng
 defaultFurnitureCategory#10=Xe c\u1ed9
+defaultFurnitureCategory#11=Nhn v\u1eadt
 defaultFurnitureCategory#12=C\u1ea7u thang

src/com/eteks/furniturelibraryeditor/viewcontroller/DefaultCategories_zh_TW.properties

@@ -17,7 +17,7 @@
 # Place, Suite 330, Boston, MA 02111-1307 USA
 
 defaultFurnitureCategory#1=3\u6d74\u5ba4
-defaultFurnitureCategory#2=5\u5367\u5ba4
+defaultFurnitureCategory#2=5\u81e5\u5ba4
 defaultFurnitureCategory#3=2\u9580\u548c\u7a97
 defaultFurnitureCategory#4=9\u6236\u5916
 defaultFurnitureCategory#5=4\u5eda\u623f