[med-svn] r11174 - in trunk/packages/libmtj-java/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2012-06-03 11:34:54 +0000 (Sun, 03 Jun 2012)
New Revision: 11174

Modified:
   trunk/packages/libmtj-java/trunk/debian/get-orig-source
   trunk/packages/libmtj-java/trunk/debian/libmtj-java.jlibs
   trunk/packages/libmtj-java/trunk/debian/patches/use_debian_jar_files.patch
Log:
Stick closer to original build system to enable successful build


Modified: trunk/packages/libmtj-java/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/libmtj-java/trunk/debian/get-orig-source	2012-06-03 11:21:28 UTC (rev 11173)
+++ trunk/packages/libmtj-java/trunk/debian/get-orig-source	2012-06-03 11:34:54 UTC (rev 11174)
@@ -22,12 +22,11 @@
 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}

Modified: trunk/packages/libmtj-java/trunk/debian/libmtj-java.jlibs
===================================================================
--- trunk/packages/libmtj-java/trunk/debian/libmtj-java.jlibs	2012-06-03 11:21:28 UTC (rev 11173)
+++ trunk/packages/libmtj-java/trunk/debian/libmtj-java.jlibs	2012-06-03 11:34:54 UTC (rev 11174)
@@ -1 +1 @@
-lib/mtj.jar
+dist/Matrix_Toolkits_for_Java.jar

Modified: trunk/packages/libmtj-java/trunk/debian/patches/use_debian_jar_files.patch
===================================================================
--- trunk/packages/libmtj-java/trunk/debian/patches/use_debian_jar_files.patch	2012-06-03 11:21:28 UTC (rev 11173)
+++ trunk/packages/libmtj-java/trunk/debian/patches/use_debian_jar_files.patch	2012-06-03 11:34:54 UTC (rev 11174)
@@ -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