[nlpsolver] 08/13: Imported Debian patch 0.9~beta1-7
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository nlpsolver.
commit 9947e39407d77d91482f575b0fec398f7d27ba9c
Author: Rene Engelhard <rene@debian.org>
Date: Mon Oct 24 21:38:16 2011 +0000
Imported Debian patch 0.9~beta1-7
---
debian/changelog | 6 ++++++
debian/control | 2 +-
debian/rules | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 97cd4b7..57c4d28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nlpsolver (0.9~beta1-7) unstable; urgency=low
+
+ * use default-jdk (closes: #642755)
+
+ -- Rene Engelhard <rene@debian.org> Mon, 24 Oct 2011 21:38:16 +0000
+
nlpsolver (0.9~beta1-6) unstable; urgency=low
* remove extraneous i in package description (closes: #618775)
diff --git a/debian/control b/debian/control
index 0b68e22..51ca8d5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: math
Priority: extra
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), unzip, openjdk-6-jdk, libreoffice-dev, ant | ant1.7, ant-optional | ant1.7-optional, libreoffice-java-common
+Build-Depends: debhelper (>= 7.0.50~), unzip, default-jdk, libreoffice-dev, ant | ant1.7, ant-optional | ant1.7-optional, libreoffice-java-common
Standards-Version: 3.8.4
Package: libreoffice-nlpsolver
diff --git a/debian/rules b/debian/rules
index bac8b0b..bc92dd3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-ANT_FLAGS=-Dplatforms.JDK_1.5.home=/usr/lib/jvm/java-6-openjdk -Doffice.program.dir=/usr/lib/libreoffice/basis-link -Dsplit.ure=/usr/lib/ure -Dsplit.install=/usr/lib/libreoffice/basis-link/program
+ANT_FLAGS=-Dplatforms.JDK_1.5.home=/usr/lib/jvm/default-java -Doffice.program.dir=/usr/lib/libreoffice/basis-link -Dsplit.ure=/usr/lib/ure -Dsplit.install=/usr/lib/libreoffice/basis-link/program
%:
dh $@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/nlpsolver.git
Reply to: