[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.3-2-4-gf3d1397
The following commit has been merged in the master branch:
commit f3d1397d9475f917baceafb780fc543f89ab69fc
Author: Rene Engelhard <rene@debian.org>
Date: Sat May 11 02:03:49 2013 +0200
clarify some comments
diff --git a/rules b/rules
index e7310f9..d7ffe51 100755
--- a/rules
+++ b/rules
@@ -2972,9 +2972,10 @@ ifneq (,$(filter redland, $(SYSTEM_STUFF)))
# which quickly can get outdated
perl -pi -e 's/(shlibs.*$$)/$$1, $(shell cat /var/lib/dpkg/info/$(shell dpkg -S /usr/lib/`objdump -p $(PKGDIR)-core/$(OODIR)/program/libunordf*.so | grep NEEDED | grep librdf | awk '{ print $$2 }'` | cut -d: -f1).shlibs | awk '{ print $$3,$$4,$$5 }')/' $(PKGDIR)-core.substvars
endif
- # don't make uno-libs3 depend on ure...
+ # Clean up .substvars values added by uno-libs3.symbols (adds uno-libs3, ure):
+ # 1) don't make uno-libs3 depend on ure...
perl -pi -e 's/, ure$$//' debian/uno-libs3.substvars
- # .. and prevent ure to depend on itself..
+ # 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" \
--
LibreOffice packaging repository
Reply to: