This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository nlpsolver.
commit 9fd51f4cdfb6a2f6da273196bf4a5755d61c95c9 Author: Rene Engelhard <[email protected]> Date: Fri Feb 24 18:58:05 2012 +0000 Imported Debian patch 0.9~beta1-8 --- debian/changelog | 6 ++++++ debian/control | 1 + debian/rules | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 57c4d28..5632b81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nlpsolver (0.9~beta1-8) experimental; urgency=low + + * update for gone basis-link in LO 3.5 + + -- Rene Engelhard <[email protected]> Fri, 24 Feb 2012 18:58:05 +0000 + nlpsolver (0.9~beta1-7) unstable; urgency=low * use default-jdk (closes: #642755) diff --git a/debian/control b/debian/control index 51ca8d5..2fcbb78 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ 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-Conflicts: libreoffice-common (<< 1:3.5.0~) Standards-Version: 3.8.4 Package: libreoffice-nlpsolver diff --git a/debian/rules b/debian/rules index bc92dd3..42a98e2 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/default-java -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 -Dsplit.ure=/usr/lib/ure -Dsplit.install=/usr/lib/libreoffice/program %: dh $@ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/nlpsolver.git
