[libreoffice] 19/152: Revert "move liblpsolve55.so into -core if used internally"

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit b1b5c518f531d4ffaa6e227c08bc6abbdd304c05
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Nov 24 05:10:51 2015 +0100

    Revert "move liblpsolve55.so into -core if used internally"
    
    This reverts commit 44c752c1ecdaf70b5c393f91646c20e6d65f77c1.
---
 changelog | 7 +++++++
 rules     | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/changelog b/changelog
index 5b45a76..5629b17 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:5.1.0~alpha1-4ubuntu3) UNRELEASED; urgency=medium
+
+  * revert move of liblpsolve when --with-system-lpsolve, is already done
+    upstream
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Tue, 24 Nov 2015 05:09:06 +0100
+
 libreoffice (1:5.1.0~alpha1-4ubuntu2) xenial; urgency=medium
 
   * debian/rules:
diff --git a/rules b/rules
index fd59f15..8f916f2 100755
--- a/rules
+++ b/rules
@@ -2512,13 +2512,6 @@ 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
-
 ifeq "$(USE_GSTREAMER)" "y"
 	mkdir -p $(PKGDIR)-avmedia-backend-gstreamer/$(OODIR)/program
 	mv $(PKGDIR)-core/$(OODIR)/program/libavmediagst.so \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git