[sweethome3d-furniture-editor] 05/12: Drop all patches.

Markus Koschany apo at moszumanska.debian.org
Sun Oct 9 21:32:23 UTC 2016


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

apo pushed a commit to branch master
in repository sweethome3d-furniture-editor.

commit d376604a82097c1f02ae2e32f84d5b8e282f4058
Author: Markus Koschany <apo at debian.org>
Date:   Sun Oct 9 22:31:06 2016 +0200

    Drop all patches.
---
 debian/patches/01manifest     | 13 -------------
 debian/patches/02missingclass | 24 ------------------------
 debian/patches/batik.patch    | 33 ---------------------------------
 debian/patches/series         |  3 ---
 4 files changed, 73 deletions(-)

diff --git a/debian/patches/01manifest b/debian/patches/01manifest
deleted file mode 100644
index 10c6b61..0000000
--- a/debian/patches/01manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Add Class-Path to manifest file.
-Author: Gabriele Giacone <1o5g4r8o at gmail.com>
-
---- a/build.xml
-+++ b/build.xml
-@@ -143,6 +143,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/batik-parser.jar /usr/share/icedtea-web/netx.jar"/>
-       </manifest>
-       <zipfileset src="build/FurnitureLibraryEditor.jar"/>
- <!--
diff --git a/debian/patches/02missingclass b/debian/patches/02missingclass
deleted file mode 100644
index f309ac9..0000000
--- a/debian/patches/02missingclass
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Add missing classes
-Authore: Gabriele Giacone <1o5g4r8o at gmail.com>
-Bug-Debian: http://bugs.debian.org/734272
-
---- a/build.xml
-+++ b/build.xml
-@@ -56,7 +56,7 @@
-         <exclude name="**/*.java"/>
-         <exclude name="**/package.html"/> 
-         <exclude name="**/*_*.properties"/>
--        <exclude name="com/eteks/sweethome3d/io/DefaultFurniture*.*"/>
-+<!--        <exclude name="com/eteks/sweethome3d/io/DefaultFurniture*.*"/> -->
-         <exclude name="com/eteks/sweethome3d/io/Contributed*.*"/>
-         <exclude name="com/eteks/sweethome3d/io/DefaultTextures*.*"/>
-         <exclude name="com/eteks/sweethome3d/io/resources/**"/>
-@@ -68,7 +68,7 @@
-       <fileset dir="build/classes-sh3d">
-         <include name="**/*_fr.properties"/>
-         <include name="com/eteks/sweethome3d/io/resources/patterns/**"/>
--        <exclude name="com/eteks/sweethome3d/io/DefaultFurniture*.*"/>
-+<!--        <exclude name="com/eteks/sweethome3d/io/DefaultFurniture*.*"/> -->
-         <exclude name="com/eteks/sweethome3d/io/Contributed*.*"/>
-         <exclude name="com/eteks/sweethome3d/io/DefaultTextures*.*"/>
-       </fileset>
diff --git a/debian/patches/batik.patch b/debian/patches/batik.patch
deleted file mode 100644
index f1f737a..0000000
--- a/debian/patches/batik.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Mon, 29 Aug 2016 21:47:36 +0200
-Subject: batik
-
-Debian-Bug:https://bugs.debian.org/830428
-Forwarded: no
----
- build.xml | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index 0f27452..7106e76 100644
---- a/build.xml
-+++ b/build.xml
-@@ -39,7 +39,7 @@
-         <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-parser.jar"/>
-+        <pathelement location="/usr/share/java/batik-all.jar"/>
-       </classpath>
-     </javac>
-     
-@@ -147,7 +147,8 @@
-     <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/batik-parser.jar /usr/share/icedtea-web/netx.jar"/>
-+        <attribute name="Class-Path" value="/usr/share/java/j3dcore.jar
-+            /usr/share/java/j3dutils.jar /usr/share/java/vecmath.jar /usr/share/java/batik-all.jar /usr/share/icedtea-web/netx.jar"/>
-       </manifest>
-       <zipfileset src="build/FurnitureLibraryEditor.jar"/>
- <!--
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a8d02b0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-01manifest
-02missingclass
-batik.patch

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



More information about the pkg-java-commits mailing list