[libreoffice] 08/21: move liblpsolve55.so into -core if used internally
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-testing-4.0
in repository libreoffice.
commit beb2b8ed1997749683928e5f8054fe14a1e66728
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jul 29 15:40:54 2013 +0200
move liblpsolve55.so into -core if used internally
Conflicts:
changelog
---
changelog | 2 ++
rules | 7 +++++++
2 files changed, 9 insertions(+)
diff --git a/changelog b/changelog
index aed48d0..f34f525 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,8 @@ libreoffice (1:4.0.5~rc2-1) UNRELEASED; urgency=low
- use system-clucene again now that it's in sid & testing
- add -Nlibreoffice-report-builder to jh_depends call for arch-indep
packages so it doesn't get added to -java-commons Depends
+ - move liblpsolve55.so into -core if used internally, as otherwise
+ -writer doesn't start without -calc installed..?!
* debian/libreoffice-common.postrm.in:
- don't create /var/lib/libreoffice/share/config/ anymore and
remove it (and javaunopkginstall.xml if exists) on purge
diff --git a/rules b/rules
index 3dfbd67..46072cc 100755
--- a/rules
+++ b/rules
@@ -2479,6 +2479,13 @@ else
rm -f $(PKGDIR)-core/$(OODIR)/program/ui-previewer
endif
+# see https://bugs.freedesktop.org/show_bug.cgi?id=67349
+# writer doesn't start without it.
+ifeq (,$(filter lpsolve, $(SYSTEM_STUFF)))
+ mv $(PKGDIR)-calc/$(OODIR)/program/liblpsolve55.so \
+ $(PKGDIR)-core/$(OODIR)/program
+endif
+
for i in $(ARCH_DEP_PACKAGES); do \
if [ -e debian/$$i.bug-script.in ]; then \
cat debian/$$i.bug-script.in \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: