[libmtj-java] 05/23: Stick closer to original build system to enable successful build

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libmtj-java.

commit c5aba62c78380dfa2718db33fcf36f8ceb75818b
Author: Andreas Tille <tille at debian.org>
Date:   Sun Jun 3 11:34:54 2012 +0000

    Stick closer to original build system to enable successful build
---
 debian/get-orig-source                    |  7 +++----
 debian/libmtj-java.jlibs                  |  2 +-
 debian/patches/use_debian_jar_files.patch | 12 ++++++++++++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/debian/get-orig-source b/debian/get-orig-source
index aca93bf..47a18c7 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -22,12 +22,11 @@ mkdir -p ../tarballs
 cd ../tarballs
 mv ../${UPSTREAMARCHIVE} .
 unzip -q ${UPSTREAMARCHIVE}
-cd ${UARCHIVEDIR}
 
 # Remove all *.jar files
-rm -rf lib/*
-rm -f *.jar
+# rm -rf ${UARCHIVEDIR}/lib/*
+find ${UARCHIVEDIR} -name "*.jar" -delete
+find ${UARCHIVEDIR} -type d -empty -delete
 
-cd ..
 GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -czf "$NAME"_"$VERSION"~dfsg.orig.tar.gz "${UARCHIVEDIR}"
 rm -rf ${UARCHIVEDIR}
diff --git a/debian/libmtj-java.jlibs b/debian/libmtj-java.jlibs
index 616230e..77731a9 100644
--- a/debian/libmtj-java.jlibs
+++ b/debian/libmtj-java.jlibs
@@ -1 +1 @@
-lib/mtj.jar
+dist/Matrix_Toolkits_for_Java.jar
diff --git a/debian/patches/use_debian_jar_files.patch b/debian/patches/use_debian_jar_files.patch
index 706837a..a31a994 100644
--- a/debian/patches/use_debian_jar_files.patch
+++ b/debian/patches/use_debian_jar_files.patch
@@ -7,3 +7,15 @@
 +    <property name="src.dir" value="src"/>
 +    <property name="javac.classpath" value="/usr/share/java/junit.jar:/usr/share/java/f2jutil.jar:/usr/share/java/netlib-java.jar"/>
  </project>
+--- mtj-0.9.14.orig/lib/nblibraries.properties
++++ mtj-0.9.14/lib/nblibraries.properties
+@@ -1,7 +1,6 @@
+ libs.junit.classpath=\
+-    ${base}/junit/junit-3.8.2.jar
++    /usr/share/java/junit.jar
+ libs.junit.javadoc=\
+     ${base}/junit/junit-3.8.2-api.zip
+ libs.netlib-java.classpath=\
+-    ${base}/netlib-java/arpack_combo-0.1.jar:\
+-    ${base}/netlib-java/netlib-java-0.9.3.jar
++    /usr/share/java/netlib-java.jar

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