[libreoffice] 02/02: update dh_shlibdeps for URE in /usr/lib/libreoffice/program and remove obsolete OOUREDIR
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 5fc87379faf0ee2a902c463bc2417e4002c87922
Author: Rene Engelhard <rene@debian.org>
Date: Fri Oct 2 11:34:02 2015 +0200
update dh_shlibdeps for URE in /usr/lib/libreoffice/program and remove obsolete OOUREDIR
---
changelog | 2 ++
rules | 11 +++++------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/changelog b/changelog
index c7118fd..9f19c7a 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,8 @@ libreoffice (1:5.0.2-2) UNRELEASED; urgency=medium
* debian/rules:
- use dh_installdocs --link-doc=libreoffice-{core,common}
+ - update dh_shlibdeps calls for URE in /usr/lib/libreoffice/program and
+ remove obsolete OOUREDIR
* debian/control.in:
- update -style-* dependencies based on the recommendation in
https://lists.debian.org/debian-openoffice/2015/09/msg00343.html ff.
diff --git a/rules b/rules
index 4bee7bc..7a8ec5e 100755
--- a/rules
+++ b/rules
@@ -43,7 +43,6 @@ SYSTEM_GCJ_VERSION = $(shell basename `readlink /usr/lib/jvm/java-gcj/bin/gcj` |
PKGDIR:=debian/libreoffice
OODIRNAME=libreoffice
OODIR:=usr/lib/$(OODIRNAME)
-OOUREDIR:=usr/lib/ure
OOSDKDIR:=$(OODIR)/sdk
# Figure out who's building this package.
@@ -2694,7 +2693,7 @@ ifeq "$(PACKAGE_SDK)" "y"
echo "#!/bin/sh"; \
echo "# wrapper script for OOos SDK programs"; \
echo ""; \
- echo 'LD_LIBRARY_PATH=/$(OOUREDIR)/lib /$(OOSDKDIR)/bin/`basename $$0`.bin "$$@"'; \
+ echo 'LD_LIBRARY_PATH=/$(OODIR)/program /$(OOSDKDIR)/bin/`basename $$0`.bin "$$@"'; \
) > $$i; \
chmod 755 $$i; \
done
@@ -3259,10 +3258,10 @@ endif
# /usr/lib/libgcj-bc.so when specifying -l$(GCJ_JAWT_DIR)
# and therefore we must not use it for -gcj. But we *do* need it
# for -officebean (libjawt.so is referenced there)
- LD_LIBRARY_PATH="$(FAKEROOT_LIBDIR):debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program:$(PKGDIR)-writer/$(OODIR)/program" \
+ LD_LIBRARY_PATH="$(FAKEROOT_LIBDIR):debian/uno-libs3/$(OODIR)/program:debian/ure/$(OODIR)/program:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program:$(PKGDIR)-writer/$(OODIR)/program" \
dh_shlibdeps -s -Nlibreoffice-officebean \
-Lure -Luno-libs3 \
- -ldebian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program:$(shell dirname $(shell dpkg -L `echo $(GCJ_JAWT_DEPENDS) | sed -e s/-awt//` | grep _bc)) \
+ -ldebian/uno-libs3/$(OODIR)/program:debian/ure/$(OODIR)/program:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program:$(shell dirname $(shell dpkg -L `echo $(GCJ_JAWT_DEPENDS) | sed -e s/-awt//` | grep _bc)) \
$(SHLIBS_OVERRIDE)
ifneq (,$(filter redland, $(SYSTEM_STUFF)))
# dpkg-shlibdeps "in practice" always will look for this in
@@ -3278,10 +3277,10 @@ endif
# 2) and prevent ure to depend on itself..
perl -pi -e 's/, ure \(.*\)$$//' debian/ure.substvars
ifeq "$(ENABLE_JAVA)" "y"
- LD_LIBRARY_PATH="$(FAKEROOT_LIBDIR):debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
+ LD_LIBRARY_PATH="$(FAKEROOT_LIBDIR):debian/uno-libs3/$(OODIR)/program:debian/ure/$(OODIR)/program:$(PKGDIR)-core/$(OODIR)/program" \
dh_shlibdeps -plibreoffice-officebean \
-Lure -Luno-libs3 \
- -ldebian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(GCJ_JAWT_DIR) \
+ -ldebian/uno-libs3/$(OODIR)/program:debian/ure/$(OODIR)/program:$(PKGDIR)-core/$(OODIR)/program:$(GCJ_JAWT_DIR) \
$(SHLIBS_OVERRIDE)
endif
ifeq "$(ENABLE_JAVA)" "y"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: