[med-svn] [mhap] 08/09: Remove obsolete patches

[Afif Elghraoui]

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

afif pushed a commit to branch master
in repository mhap.

commit ee2b1657b55d02bdc309e9b9233d35fc93fa6ab0
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Thu Mar 24 22:07:55 2016 -0700

    Remove obsolete patches
    
    Build system has switched to maven
---
 debian/patches/libdir            | 35 -----------------------------------
 debian/patches/manifestclasspath | 20 --------------------
 debian/patches/series            |  2 --
 3 files changed, 57 deletions(-)

diff --git a/debian/patches/libdir b/debian/patches/libdir
deleted file mode 100644
index 83e50e0..0000000
--- a/debian/patches/libdir
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Remove reference to convenience copies and set proper classpath
- third-party jar files were bundled in lib/, but this directory was removed
- and its absence caused errors when running ant. This patch removes the
- reference to this excluded directory and points the classpath to find the
- third-party libraries in /usr/share/java
-Author: Afif Elghraoui <afif at ghraoui.name>
-Forwarded: not-needed
-Last-Update: 2015-09-12
---- mhap.orig/build.xml
-+++ mhap/build.xml
-@@ -46,7 +46,7 @@
-     <property name="dist.home"               value="${build.home}/dist"/>
- 
-     <!-- The directory for library containing the dependency jar files -->
--    <property name="lib.dir"               value="lib"/>
-+    <property name="lib.dir"               value=""/>
- 
-     <!-- The directory that contains the binary files -->
-     <property name="bin.dir"               value="bin"/>
-@@ -82,7 +82,7 @@
-   
-    <!-- Generate path for binary distrubtion dependencies -->
-    <path id="compile.classpath">
--     <fileset dir="${lib.dir}" includes="**/*.jar"/>
-+     <fileset dir="/usr/share/java" includes="commons-compress.jar fastutil.jar guava.jar jaligner.jar"/>
-      <pathelement location="${build.home}/classes"/>
-    </path>
- 
-@@ -374,4 +374,4 @@
-     
-   </target>
- 
--</project>
-\ No newline at end of file
-+</project>
diff --git a/debian/patches/manifestclasspath b/debian/patches/manifestclasspath
deleted file mode 100644
index fe58e11..0000000
--- a/debian/patches/manifestclasspath
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Remove manifestclasspath target
- This is unnecessary (at least on Debian) and breaks the build because ant
- can't find a relative path to /usr/share/java from the chroot's build
- directory.
-Author: Afif Elghraoui <afif at ghraoui.name>
-Forwarded: not-needed
-Last-Update: 2015-09-12
---- mhap.orig/build.xml
-+++ mhap/build.xml
-@@ -345,10 +345,6 @@
-     <copy file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
-     <copy file="NOTICE.txt"  tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
-     
--    <manifestclasspath property="lib.list" jarfile="mhap-${component.version}.jar">
--        <classpath refid="compile.classpath"/>
--    </manifestclasspath>
--    
-     <manifest file="${build.home}/MANIFEST.MF">
-         <attribute name="Specification-Title"      value="${component.title}"/>
-         <attribute name="Specification-Version"    value="${}"/>
diff --git a/debian/patches/series b/debian/patches/series
index 2d724ad..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-libdir
-manifestclasspath

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mhap.git