[libmtj-java] 04/23: Update packaging to use debian packaged JAR files; some fix for build system is needed

[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 2dd1991c4d02119bc313fbecf0ee815f39b4ba88
Author: Andreas Tille <tille at debian.org>
Date:   Sun Jun 3 11:21:28 2012 +0000

    Update packaging to use debian packaged JAR files; some fix for build system is needed
---
 debian/changelog                          | 6 ++----
 debian/control                            | 3 ++-
 debian/get-orig-source                    | 5 +++--
 debian/patches/series                     | 1 +
 debian/patches/use_debian_jar_files.patch | 9 +++++++++
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index da43fa6..f1ffae0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/control b/debian/control
index 1f3e235..37bced1 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
 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
diff --git a/debian/get-orig-source b/debian/get-orig-source
index 6c5b391..aca93bf 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -24,8 +24,9 @@ mv ../${UPSTREAMARCHIVE} .
 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}"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..61a6094
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use_debian_jar_files.patch
diff --git a/debian/patches/use_debian_jar_files.patch b/debian/patches/use_debian_jar_files.patch
new file mode 100644
index 0000000..706837a
--- /dev/null
+++ b/debian/patches/use_debian_jar_files.patch
@@ -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>

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