This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository nlpsolver.
commit b95dc8c1b58e93d8ea9eb082419e433f87a3bf95 Author: Rene Engelhard <[email protected]> Date: Mon Nov 3 18:53:00 2014 +0100 Imported Debian patch 0.9~beta1-10 --- debian/changelog | 10 ++++++++++ debian/control | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index cd15f53..277b402 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +nlpsolver (0.9~beta1-10) unstable; urgency=medium + + * merge from Ubuntu: + - replace openjdk-6-jdk with default-jre-headless + + * remove alternative | ant1.7 build-dependencies because they are obsolete + and the lintian used by dak complains with "missing-build-dependency ant"(!) + + -- Rene Engelhard <[email protected]> Mon, 03 Nov 2014 18:53:00 +0100 + nlpsolver (0.9~beta1-9) unstable; urgency=low * upload to unstable diff --git a/debian/control b/debian/control index 2fcbb78..c6e2c24 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,13 @@ Section: math Priority: extra Maintainer: Debian LibreOffice Maintainers <[email protected]> Uploaders: Rene Engelhard <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), unzip, default-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 , ant-optional, libreoffice-java-common Build-Conflicts: libreoffice-common (<< 1:3.5.0~) Standards-Version: 3.8.4 Package: libreoffice-nlpsolver Architecture: all -Depends: ${misc:Depends}, libreoffice-calc (>= 1:3.0~), libreoffice-core (>= 1:3.3~), openjdk-6-jdk | java5-runtime | java6-runtime +Depends: ${misc:Depends}, libreoffice-calc (>= 1:3.0~), libreoffice-core (>= 1:3.3~), default-jre-headless | java5-runtime | java6-runtime Description: "Solver for Nonlinear Programming" extension for LibreOffice By default LibreOffice Calc ships with a solver engine for linear programming only. This allows the optimization of models to a certain degree. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/nlpsolver.git
