[SCM] Sweet Home 3D Furniture Library Editor branch, master, updated. 91174dc7de227af0d897a821962ad50d24788721

[Gabriele Giacone]

The following commit has been merged in the master branch:
commit 91174dc7de227af0d897a821962ad50d24788721
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Tue Oct 9 00:49:45 2012 +0200

    Improve classpath.

diff --git a/debian/patches/00build b/debian/patches/00build
index b9ad3d4..0c1f66e 100644
--- a/debian/patches/00build
+++ b/debian/patches/00build
@@ -16,7 +16,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
        <extdirs>
          <pathelement location="../SweetHome3D/lib"/>
        </extdirs>
-@@ -27,12 +30,18 @@
+@@ -27,12 +30,16 @@
          <pathelement location="../SweetHome3D/libtest/jnlp.jar"/>
        </classpath>
      </javac>
@@ -27,16 +27,14 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
        <classpath>
          <pathelement location="build/classes"/>
 -        <pathelement location="../SweetHome3D/lib/batik-svgpathparser-1.7.jar"/>
-+        <pathelement location="/usr/share/java"/>
-+        <pathelement location="/usr/share/icedtea-web"/>
 +        <pathelement location="/usr/share/sweethome3d/sweethome3d.jar"/>
 +        <pathelement location="/usr/share/java/j3dcore.jar"/>
 +        <pathelement location="/usr/share/java/vecmath.jar"/>
-+        <pathelement location="/usr/share/java/batik.jar"/>
++        <pathelement location="/usr/share/java/batik-parser.jar"/>
        </classpath>
      </javac>
      
-@@ -44,7 +53,7 @@
+@@ -44,7 +51,7 @@
        </fileset>
      </copy>
      <copy todir="build/classes">
@@ -45,7 +43,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
          <include name="**"/>
          <exclude name="**/*.java"/>
          <exclude name="**/package.html"/> 
-@@ -58,7 +67,7 @@
+@@ -58,7 +65,7 @@
        </fileset>
      </copy>
      <copy todir="build/classes">
@@ -54,7 +52,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
          <include name="**/*_fr.properties"/>
          <include name="com/eteks/sweethome3d/io/resources/patterns/**"/>
          <exclude name="com/eteks/sweethome3d/io/DefaultFurniture*.*"/>
-@@ -117,6 +126,7 @@
+@@ -117,6 +124,7 @@
          <attribute name="Main-Class" value="com.eteks.furniturelibraryeditor.FurnitureLibraryEditorBootstrap"/>
        </manifest>
        <zipfileset src="build/FurnitureLibraryEditor.jar"/>
@@ -62,7 +60,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
        <fileset dir="../SweetHome3D/lib">
          <include name="windows/**/*.dll"/>
          <include name="linux/**/*.so"/>
-@@ -141,6 +151,7 @@
+@@ -141,6 +149,7 @@
          <include name="THIRDPARTY-LICENSE-TANGO.TXT"/>
          <include name="THIRDPARTY-LICENSE-CONTRIBUTIONS.TXT"/>
        </fileset>
diff --git a/debian/patches/01manifest b/debian/patches/01manifest
new file mode 100644
index 0000000..1243c8a
--- /dev/null
+++ b/debian/patches/01manifest
@@ -0,0 +1,13 @@
+Description: Add Class-Path to manifest file.
+Author: Gabriele Giacone <1o5g4r8o at gmail.com>
+
+--- a/build.xml
++++ b/build.xml
+@@ -122,6 +122,7 @@
+     <jar destfile="FurnitureLibraryEditor-${version}.jar">
+       <manifest>
+         <attribute name="Main-Class" value="com.eteks.furniturelibraryeditor.FurnitureLibraryEditorBootstrap"/>
++        <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/batik-parser.jar /usr/share/icedtea-web/netx.jar"/>
+       </manifest>
+       <zipfileset src="build/FurnitureLibraryEditor.jar"/>
+ <!--
diff --git a/debian/patches/series b/debian/patches/series
index 68d1432..bcffc32 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 00build
+01manifest
diff --git a/debian/sweethome3d-furniture-editor.sh b/debian/sweethome3d-furniture-editor.sh
index c842ebb..a657cdd 100755
--- a/debian/sweethome3d-furniture-editor.sh
+++ b/debian/sweethome3d-furniture-editor.sh
@@ -8,7 +8,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 java3ds-fileloader batik-parser
 find_jars /usr/share/icedtea-web/netx.jar
 find_jars /usr/share/sweethome3d/sweethome3d-furniture-editor.jar
 

-- 
Sweet Home 3D Furniture Library Editor