[sweethome3d] 01/01: Remove java3ds-fileloader dependency.

[Gabriele Giacone]

This is an automated email from the git hooks/post-receive script.

gg0-guest pushed a commit to branch master
in repository sweethome3d.

commit a7a75f49ce96e4dad9e05f4e2370b3de1685a708
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Fri Oct 24 03:40:47 2014 +0200

    Remove java3ds-fileloader dependency.
---
 debian/README.source      | 1 -
 debian/changelog          | 8 ++++++++
 debian/control            | 2 --
 debian/patches/04manifest | 2 +-
 debian/sweethome3d.sh     | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index f0373b0..58799c2 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -30,7 +30,6 @@ sweethome3d for Debian
  o The following binary files have been removed from upstream tarball:
 
  - freehep-vectorgraphics-svg-2.1.1b-src-diff.zip
- - lib/Loader3DS1_2u.jar
  - lib/batik-svgpathparser-1.7.jar
  - lib/freehep-vectorgraphics-svg-2.1.1b.jar
  - lib/iText-2.1.7.jar
diff --git a/debian/changelog b/debian/changelog
index e68429d..3f8fc96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sweethome3d (4.5+dfsg-2) unstable; urgency=medium
+
+  * 4.5 replaces Loader3DS with a library inspired from lib3ds.
+    + Remove java3ds-fileloader from build and runtime deps.
+    + Update manifest and java wrapper accordingly.
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Fri, 24 Oct 2014 03:40:59 +0200
+
 sweethome3d (4.5+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 4518965..e3e6658 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: Gabriele Giacone <1o5g4r8o at gmail.com>
 Build-Depends: ant, debhelper (>= 7.0.50~)
 Build-Depends-Indep: icedtea-netx-common,
                      imagemagick,
-                     java3ds-fileloader,
                      libfreehep-graphicsio-svg-java,
                      libitext-java,
                      libjava3d-java,
@@ -22,7 +21,6 @@ Package: sweethome3d
 Architecture: all
 Depends: icedtea-netx-common | sun-java6-bin,
          java-wrappers,
-         java3ds-fileloader,
          libfreehep-graphicsio-svg-java,
          libitext-java,
          libjava3d-java,
diff --git a/debian/patches/04manifest b/debian/patches/04manifest
index 4903fe1..65728c3 100644
--- a/debian/patches/04manifest
+++ b/debian/patches/04manifest
@@ -7,7 +7,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
      <jar destfile="install/SweetHome3D-${version}.jar">
        <manifest>
          <attribute name="Main-Class" value="com.eteks.sweethome3d.SweetHome3DBootstrap"/>
-+        <attribute name="Class-Path" value="/usr/share/java/j3dcore.jar /usr/share/java/j3dutils.jar /usr/share/java/vecmath.jar /usr/share/java/java3ds-fileloader.jar /usr/share/java/sunflow.jar /usr/share/java/itext.jar /usr/share/java/janino.jar /usr/share/java/freehep-util.jar /usr/share/java/freehep-io.jar /usr/share/java/freehep-xml.jar /usr/share/java/freehep-graphics2d.jar /usr/share/java/freehep-graphicsio.jar /usr/share/java/freehep-graphicsio-svg.jar /usr/share/icedtea-web/ne [...]
++        <attribute name="Class-Path" value="/usr/share/java/j3dcore.jar /usr/share/java/j3dutils.jar /usr/share/java/vecmath.jar /usr/share/java/sunflow.jar /usr/share/java/itext.jar /usr/share/java/janino.jar /usr/share/java/freehep-util.jar /usr/share/java/freehep-io.jar /usr/share/java/freehep-xml.jar /usr/share/java/freehep-graphics2d.jar /usr/share/java/freehep-graphicsio.jar /usr/share/java/freehep-graphicsio-svg.jar /usr/share/icedtea-web/netx.jar /usr/lib/jvm/java-6-sun/jre/lib/ [...]
        </manifest>
        <zipfileset src="build/SweetHome3D.jar"/>
        <zipfileset src="build/Furniture.jar"/>
diff --git a/debian/sweethome3d.sh b/debian/sweethome3d.sh
index e42fb9a..3be7463 100755
--- a/debian/sweethome3d.sh
+++ b/debian/sweethome3d.sh
@@ -9,7 +9,7 @@ JAVA_ARGS="-Djava.library.path=/usr/lib/jni \
 
 find_java_runtime java6
 
-find_jars j3dcore j3dutils vecmath java3ds-fileloader batik
+find_jars j3dcore j3dutils vecmath batik
 find_jars sunflow itext janino freehep-util freehep-io freehep-xml
 find_jars freehep-graphics2d freehep-graphicsio freehep-graphicsio-svg
 find_jars /usr/share/sweethome3d/sweethome3d.jar

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sweethome3d.git