[SCM] glpk-java branch, master, updated. 6a85a83cdee27fd8c2682bb3f1abab5987b4dd12

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit 6a85a83cdee27fd8c2682bb3f1abab5987b4dd12
Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
Date:   Mon Sep 19 17:44:43 2011 +0200

    Use as variable instead of a patch

diff --git a/debian/changelog b/debian/changelog
index 964e65a..b658bc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ glpk-java (1.0.18-1) unstable; urgency=low
   * Cleanup uploader list (Closes: #571829)
   * Update to the default-jdk & default-jre packages (Closes: #599117)
   * glpk-java.pdf is now installed (Closes: #599119)
-  * Provide the path to jni.h (Closes: #618167)
+  * Provide the path to jni.h with the JAVA_HOME variable (Closes: #618167)
   * Switch to dpkg-source 3.0 (quilt) format
   * Do not compress pdf
   * Do not ship .la file
diff --git a/debian/patches/series b/debian/patches/series
index 32babe1..8b13789 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-jnipath.diff 
 
diff --git a/debian/rules b/debian/rules
index 871fa6b..08693ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 
-DEB_MAKE_BUILD_TARGET = all prefix=/usr 
+DEB_MAKE_BUILD_TARGET = all prefix=/usr JAVA_HOME="/usr/lib/jvm/default-java/"
 DEB_MAKE_CHECK_TARGET = check
 DEB_MAKE_INSTALL_TARGET = prefix=/usr DESTDIR=$(CURDIR)/debian/libglpk-java install
 DEB_DH_MAKESHLIBS_ARGS_ALL = --no-act

-- 
glpk-java