This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository nlpsolver.
commit c7a9b73e8f805924f2e6596d7511e6b67443d5cf Author: Rene Engelhard <[email protected]> Date: Fri Sep 25 21:16:35 2015 +0200 Imported Debian patch 0.9~beta1-11 --- debian/changelog | 9 +++++++++ debian/control | 3 +-- debian/patches/jars.diff | 15 ++++++++++++--- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 277b402..291a6a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +nlpsolver (0.9~beta1-11) unstable; urgency=medium + + * merge from Ubuntu: + - fix build against LibreOffice 5.0 series + + adjust classpath + (closes: #795329) + + -- Rene Engelhard <[email protected]> Fri, 25 Sep 2015 21:16:35 +0200 + nlpsolver (0.9~beta1-10) unstable; urgency=medium * merge from Ubuntu: diff --git a/debian/control b/debian/control index c6e2c24..7337eb6 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,7 @@ 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 , ant-optional, libreoffice-java-common -Build-Conflicts: libreoffice-common (<< 1:3.5.0~) +Build-Depends: debhelper (>= 7.0.50~), unzip, default-jdk, libreoffice-dev, ant , ant-optional, libreoffice-java-common (>= 1:5.0.0~) Standards-Version: 3.8.4 Package: libreoffice-nlpsolver diff --git a/debian/patches/jars.diff b/debian/patches/jars.diff index d2b27e4..274e8a8 100644 --- a/debian/patches/jars.diff +++ b/debian/patches/jars.diff @@ -11,6 +11,15 @@ <target name="-check-class-path"> --- nlpsolver-0.9.orig/nbproject/build-impl.xml +++ nlpsolver-0.9/nbproject/build-impl.xml +@@ -185,7 +185,7 @@ is divided into following sections: + <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3";> + <attribute default="${src.dir}" name="srcdir"/> + <attribute default="${build.classes.dir}" name="destdir"/> +- <attribute default="${javac.classpath}" name="classpath"/> ++ <attribute default="${javac.classpath}:/usr/lib/libreoffice/program/classes/juh.jar:/usr/lib/libreoffice/program/classes/jurt.jar:/usr/lib/libreoffice/program/classes/ridl.jar" name="classpath"/> + <attribute default="${includes}" name="includes"/> + <attribute default="${excludes}" name="excludes"/> + <attribute default="${javac.debug}" name="debug"/> @@ -360,6 +360,8 @@ is divided into following sections: --> <target depends="init" name="deps-jar" unless="no.deps"> @@ -26,9 +35,9 @@ javac.classpath=\ ${libs.StarOffice 9.classpath}:\ ${libs.OpenOffice.org 3.0.classpath}:\ -+ ${split.ure}/share/java/juh.jar:\ -+ ${split.ure}/share/java/jurt.jar:\ -+ ${split.ure}/share/java/ridl.jar:\ ++ ${office.program.dir}/classes/juh.jar:\ ++ ${office.program.dir}/classes/jurt.jar:\ ++ ${office.program.dir}/classes/ridl.jar:$\ + ${split.install}/classes/unoil.jar:\ ${reference.EvolutionarySolver.jar} # Space-separated list of extra javac options -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/nlpsolver.git
