[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.1.0-2-6-gb335fe7
The following commit has been merged in the master branch:
commit 44c752c1ecdaf70b5c393f91646c20e6d65f77c1
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jul 29 15:40:54 2013 +0200
move liblpsolve55.so into -core if used internally
diff --git a/changelog b/changelog
index 357169f..1435e7c 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,8 @@ libreoffice (1:4.1.0-3) unstable; urgency=low
* debian/rules:
- use system-clucene again now that it's in sid
+ - move liblpsolve55.so into -core if used internally, as otherwise
+ -writer doesn't start without -calc installed..?!
* debian/libreoffice-common.postrm.in:
- add missed || true and use rm -f for javasettinsgunopkginstall.xml...
* debian/control.librelogo.in:
diff --git a/rules b/rules
index 6ed030d..f5073c6 100755
--- a/rules
+++ b/rules
@@ -2527,6 +2527,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 \
--
LibreOffice packaging repository
Reply to: