[Git][java-team/sweethome3d][master] 3 commits: Fix FTBFS with FreeHEP 2.4.

[Andrius Merkys]

Andrius Merkys pushed to branch master at Debian Java Maintainers / sweethome3d


Commits:
43acee73 by Andrius Merkys at 2020-07-29T01:28:53-04:00
Fix FTBFS with FreeHEP 2.4.

- - - - -
eca7a26b by Andrius Merkys at 2020-07-29T01:29:32-04:00
Describing FreeHEP.patch.

- - - - -
007d5822 by Andrius Merkys at 2020-07-29T01:30:04-04:00
Update changelog for 6.3+dfsg-2 release

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/FreeHEP.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+sweethome3d (6.3+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fix FTBFS with FreeHEP 2.4.
+
+ -- Andrius Merkys <merkys at debian.org>  Wed, 29 Jul 2020 01:29:48 -0400
+
 sweethome3d (6.3+dfsg-1) unstable; urgency=medium
 
   * New upstream version 6.3+dfsg.


=====================================
debian/control
=====================================
@@ -11,6 +11,7 @@ Build-Depends:
  icedtea-netx,
  imagemagick,
  libbatik-java,
+ libfreehep-graphicsbase-java,
  libfreehep-graphicsio-svg-java,
  libitext-java,
  libjava3d-java,
@@ -27,6 +28,7 @@ Depends:
  icedtea-netx | sun-java6-bin,
  java-wrappers,
  libbatik-java,
+ libfreehep-graphicsbase-java,
  libfreehep-graphicsio-svg-java,
  libitext-java,
  libjava3d-java,


=====================================
debian/patches/FreeHEP.patch
=====================================
@@ -0,0 +1,13 @@
+Description: Adjusting to FreeHEP 2.4.
+Author: Andrius Merkys <merkys at debian.org>
+--- a/src/com/eteks/sweethome3d/swing/PlanComponent.java
++++ b/src/com/eteks/sweethome3d/swing/PlanComponent.java
+@@ -163,7 +163,7 @@
+ 
+ import org.freehep.graphicsio.ImageConstants;
+ import org.freehep.graphicsio.svg.SVGGraphics2D;
+-import org.freehep.util.UserProperties;
++import org.freehep.graphicsbase.util.UserProperties;
+ 
+ import com.eteks.sweethome3d.j3d.Component3DManager;
+ import com.eteks.sweethome3d.j3d.ModelManager;


=====================================
debian/patches/series
=====================================
@@ -4,3 +4,4 @@ disable-checkForUpdates.patch
 no-video.patch
 build.patch
 no-MacOSX.patch
+FreeHEP.patch



View it on GitLab: https://salsa.debian.org/java-team/sweethome3d/-/compare/0376c36151629ecd102f9a260fdcf3ea12f57953...007d5822ca7664e845b0214ac3fbeaaa4c0cc3ac

-- 
View it on GitLab: https://salsa.debian.org/java-team/sweethome3d/-/compare/0376c36151629ecd102f9a260fdcf3ea12f57953...007d5822ca7664e845b0214ac3fbeaaa4c0cc3ac
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20200729/24876e25/attachment.html>