[Git][java-team/sweethome3d][master] Import Debian changes 5.7+dfsg-3
Markus Koschany
gitlab at salsa.debian.org
Sun Sep 2 15:40:16 BST 2018
Markus Koschany pushed to branch master at Debian Java Maintainers / sweethome3d
Commits:
96b42865 by Markus Koschany at 2018-09-02T14:39:56Z
Import Debian changes 5.7+dfsg-3
sweethome3d (5.7+dfsg-3) unstable; urgency=medium
* Declare compliance with Debian Policy 4.2.1.
* Add import-library-with-OpenJDK10.patch and make it possible to import
furniture libraries with OpenJDK 10 or later.
Thanks to Jiri Slaby for the patch. (LP: #1773532)
- - - - -
9 changed files:
- debian/changelog
- debian/control
- debian/patches/04manifest
- debian/patches/build.patch
- + debian/patches/import-library-with-OpenJDK10.patch
- debian/patches/java9-compatibility.patch
- debian/patches/no-video.patch
- debian/patches/noadditionalprovisions.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+sweethome3d (5.7+dfsg-3) unstable; urgency=medium
+
+ * Declare compliance with Debian Policy 4.2.1.
+ * Add import-library-with-OpenJDK10.patch and make it possible to import
+ furniture libraries with OpenJDK 10 or later.
+ Thanks to Jiri Slaby for the patch. (LP: #1773532)
+
+ -- Markus Koschany <apo at debian.org> Sat, 01 Sep 2018 16:14:22 +0200
+
sweethome3d (5.7+dfsg-2) unstable; urgency=medium
[ Emmanuel Bourg ]
=====================================
debian/control
=====================================
@@ -15,7 +15,7 @@ Build-Depends:
libitext-java,
libjava3d-java,
libsunflow-java (>= 0.07.2.svn396+dfsg-11)
-Standards-Version: 4.1.3
+Standards-Version: 4.2.1
Vcs-Git: https://anonscm.debian.org/git/pkg-java/sweethome3d.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/sweethome3d.git
Homepage: http://www.sweethome3d.com/
=====================================
debian/patches/04manifest
=====================================
@@ -7,10 +7,10 @@ Subject: manifest
1 file changed, 1 insertion(+)
diff --git a/build.xml b/build.xml
-index 7a3bd8a..ae4e821 100644
+index 5001047..9e24c72 100644
--- a/build.xml
+++ b/build.xml
-@@ -465,6 +465,7 @@
+@@ -468,6 +468,7 @@
<jar destfile="install/SweetHome3D-${version}.jar">
<manifest>
<attribute name="Main-Class" value="com.eteks.sweethome3d.SweetHome3DBootstrap"/>
=====================================
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 c079b4f..87c0df8 100644
+index faef3e5..2383b1d 100644
--- a/build.xml
+++ b/build.xml
@@ -49,7 +49,8 @@
@@ -28,7 +28,7 @@ index c079b4f..87c0df8 100644
</javac>
<!-- Copy resources excepted furniture, textures and help files -->
-@@ -461,7 +463,7 @@
+@@ -464,7 +466,7 @@
<echo message="deploy dir ready for ftp"/>
</target>
=====================================
debian/patches/import-library-with-OpenJDK10.patch
=====================================
@@ -0,0 +1,59 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 1 Sep 2018 15:00:33 +0200
+Subject: import library with OpenJDK10+
+
+Thanks to Jiri Slaby for the patch.
+
+Bug-Upstream: https://sourceforge.net/p/sweethome3d/bugs/832/
+Origin: https://sourceforge.net/p/sweethome3d/bugs/_discuss/thread/f89e926a/4ff0/9629/06fe/955f/attachment/plugins-load-fix.patch
+---
+ .../eteks/sweethome3d/io/URLContentClassLoader.java | 21 +++++++++++++++++++--
+ 1 file changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/src/com/eteks/sweethome3d/io/URLContentClassLoader.java b/src/com/eteks/sweethome3d/io/URLContentClassLoader.java
+index 46ae745..898fff9 100644
+--- a/src/com/eteks/sweethome3d/io/URLContentClassLoader.java
++++ b/src/com/eteks/sweethome3d/io/URLContentClassLoader.java
+@@ -21,6 +21,7 @@ package com.eteks.sweethome3d.io;
+
+ import java.io.IOException;
+ import java.io.InputStream;
++import java.net.MalformedURLException;
+ import java.net.URISyntaxException;
+ import java.net.URL;
+
+@@ -37,15 +38,31 @@ class URLContentClassLoader extends ClassLoader {
+ this.url = url;
+ }
+
++ private URL getResourceURL(String name)
++ throws URISyntaxException, MalformedURLException {
++ return new URL("jar:" + this.url.toURI() + "!/" + name);
++ }
++
++ @Override
++ public URL findResource(final String name) {
++ try {
++ return getResourceURL(name);
++ } catch (IOException ex) {
++ return null;
++ } catch (URISyntaxException ex) {
++ return null;
++ }
++ }
++
+ @Override
+ public InputStream getResourceAsStream(String name) {
+ try {
+ // Return a stream managed by URLContent to be able to delete the writable files accessed with jar protocol
+- return new URLContent(new URL("jar:" + this.url.toURI() + "!/" + name)).openStream();
++ return new URLContent(getResourceURL(name)).openStream();
+ } catch (IOException ex) {
+ return null;
+ } catch (URISyntaxException ex) {
+ return null;
+ }
+ }
+-}
+\ No newline at end of file
++}
=====================================
debian/patches/java9-compatibility.patch
=====================================
@@ -1,9 +1,17 @@
-Description: Fixes the compatibility with Java 9
-Author: Emmanuel Bourg <ebourg at apache.org>
+From: Emmanuel Bourg <ebourg at apache.org>
+Date: Sat, 1 Sep 2018 15:00:25 +0200
+Subject: Fixes the compatibility with Java 9
+
Bug: https://sourceforge.net/p/sweethome3d/bugs/783/
+---
+ src/com/eteks/sweethome3d/swing/FileContentManager.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/com/eteks/sweethome3d/swing/FileContentManager.java b/src/com/eteks/sweethome3d/swing/FileContentManager.java
+index 2df12ce..68d0ae3 100644
--- a/src/com/eteks/sweethome3d/swing/FileContentManager.java
+++ b/src/com/eteks/sweethome3d/swing/FileContentManager.java
-@@ -1219,7 +1219,7 @@
+@@ -1219,7 +1219,7 @@ public class FileContentManager implements ContentManager {
public int updateChildren(File [] childDirectories) {
if (this.children == null) {
=====================================
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 ae4e821..a2ad068 100644
+index 9e24c72..71c5ab7 100644
--- a/build.xml
+++ b/build.xml
@@ -55,6 +55,8 @@
@@ -52,10 +52,10 @@ index 0723419..54fe73c 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 b21a4bd..2d1298f 100644
+index 190815e..f748fcb 100644
--- a/src/com/eteks/sweethome3d/swing/package.properties
+++ b/src/com/eteks/sweethome3d/swing/package.properties
-@@ -1201,8 +1201,8 @@ HomePane.CREATE_PHOTOS_AT_POINTS_OF_VIEW.Name=Create photos at points of view...
+@@ -1202,8 +1202,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
@@ -67,7 +67,7 @@ index b21a4bd..2d1298f 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 56e5eb1..e766a00 100644
+index 292402a..1b70338 100644
--- a/src/com/eteks/sweethome3d/viewcontroller/HomeController.java
+++ b/src/com/eteks/sweethome3d/viewcontroller/HomeController.java
@@ -336,7 +336,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 a2ad068..c079b4f 100644
+index 71c5ab7..faef3e5 100644
--- a/build.xml
+++ b/build.xml
@@ -95,6 +95,7 @@
=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@ noadditionalprovisions.patch
build.patch
no-MacOSX.patch
java9-compatibility.patch
+import-library-with-OpenJDK10.patch
View it on GitLab: https://salsa.debian.org/java-team/sweethome3d/commit/96b4286501605b43d5f123e678e9be8ff348578d
--
View it on GitLab: https://salsa.debian.org/java-team/sweethome3d/commit/96b4286501605b43d5f123e678e9be8ff348578d
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/20180902/737137b2/attachment.html>
More information about the pkg-java-commits
mailing list