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

[Andreas Tille]

Author: tille
Date: 2012-06-03 11:21:28 +0000 (Sun, 03 Jun 2012)
New Revision: 11173

Added:
   trunk/packages/libmtj-java/trunk/debian/patches/
   trunk/packages/libmtj-java/trunk/debian/patches/series
   trunk/packages/libmtj-java/trunk/debian/patches/use_debian_jar_files.patch
Modified:
   trunk/packages/libmtj-java/trunk/debian/changelog
   trunk/packages/libmtj-java/trunk/debian/control
   trunk/packages/libmtj-java/trunk/debian/get-orig-source
Log:
Update packaging to use debian packaged JAR files; some fix for build system is needed


Modified: trunk/packages/libmtj-java/trunk/debian/changelog
===================================================================
--- trunk/packages/libmtj-java/trunk/debian/changelog	2012-06-03 05:10:03 UTC (rev 11172)
+++ trunk/packages/libmtj-java/trunk/debian/changelog	2012-06-03 11:21:28 UTC (rev 11173)
@@ -1,7 +1,5 @@
-mtj (0.9.14-1) UNRELEASED; urgency=low
+mtj (0.9.14~dfsg-1) UNRELEASED; urgency=low
 
-  + TODO: Getting the JAR files included in the source package packaged
-          first
   * Initial release (Closes: #??????)
 
- -- Andreas Tille <tille at debian.org>  Sat, 21 Jan 2012 15:15:57 +0100
+ -- Andreas Tille <tille at debian.org>  Sun, 03 Jun 2012 13:02:47 +0200

Modified: trunk/packages/libmtj-java/trunk/debian/control
===================================================================
--- trunk/packages/libmtj-java/trunk/debian/control	2012-06-03 05:10:03 UTC (rev 11172)
+++ trunk/packages/libmtj-java/trunk/debian/control	2012-06-03 11:21:28 UTC (rev 11173)
@@ -4,7 +4,8 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 8), javahelper (>=0.25), openjdk-6-jdk, ant
+Build-Depends: debhelper (>= 9), javahelper (>=0.25), openjdk-6-jdk, ant,
+ libnetlib-java
 Standards-Version: 3.9.3
 Homepage: http://code.google.com/p/matrix-toolkits-java/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/libmtj-java/trunk

Modified: trunk/packages/libmtj-java/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/libmtj-java/trunk/debian/get-orig-source	2012-06-03 05:10:03 UTC (rev 11172)
+++ trunk/packages/libmtj-java/trunk/debian/get-orig-source	2012-06-03 11:21:28 UTC (rev 11173)
@@ -24,8 +24,9 @@
 unzip -q ${UPSTREAMARCHIVE}
 cd ${UARCHIVEDIR}
 
-# Remove unneeded binaries
-rm -rf lib/junit
+# Remove all *.jar files
+rm -rf lib/*
+rm -f *.jar
 
 cd ..
 GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -czf "$NAME"_"$VERSION"~dfsg.orig.tar.gz "${UARCHIVEDIR}"

Added: trunk/packages/libmtj-java/trunk/debian/patches/series
===================================================================
--- trunk/packages/libmtj-java/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/libmtj-java/trunk/debian/patches/series	2012-06-03 11:21:28 UTC (rev 11173)
@@ -0,0 +1 @@
+use_debian_jar_files.patch

Added: trunk/packages/libmtj-java/trunk/debian/patches/use_debian_jar_files.patch
===================================================================
--- trunk/packages/libmtj-java/trunk/debian/patches/use_debian_jar_files.patch	                        (rev 0)
+++ trunk/packages/libmtj-java/trunk/debian/patches/use_debian_jar_files.patch	2012-06-03 11:21:28 UTC (rev 11173)
@@ -0,0 +1,9 @@
+--- mtj-0.9.14.orig/build.xml
++++ mtj-0.9.14/build.xml
+@@ -16,4 +16,6 @@
+ 			<zipfileset dir="." excludes="**/lib/nblibraries-private.properties **/nbproject/private** **/.ant-targets-build.xml dist/** build/** **/*.zip **/.svn**" prefix="mtj-${version}" />
+ 		</zip>
+ 	</target>
++    <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>