[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-127-g8062df1
The following commit has been merged in the debian-experimental-3.5 branch:
commit 8194cdf72990ca229c0fb703a1cc95c7c2ee5733
Author: Rene Engelhard <rene@debian.org>
Date: Tue Dec 13 20:18:03 2011 +0000
remove fakeroot hackaround
diff --git a/changelog b/changelog
index 97163f8..1350b5e 100644
--- a/changelog
+++ b/changelog
@@ -19,6 +19,7 @@ libreoffice (1:3.5.0~beta1-1) UNRELEASED; urgency=low
from libreoffice-builds' distro-configs
- run new "make check" instead of solenv/bin/subsequenttests and
manual smoketest
+ - remove fakeroot hackaround
* debian/rules, debian/control.in:
- move from self-defined UPSTREAM_VERSION/ARCH etc. to use
/usr/share/dpkg/*.mk
@@ -40,7 +41,7 @@ libreoffice (1:3.5.0~beta1-1) UNRELEASED; urgency=low
* add icedove and thunderbird as fallbacks
* migrate sensible-browser.diff from libreoffice/build
- -- Rene Engelhard <rene@debian.org> Tue, 13 Dec 2011 20:14:40 +0000
+ -- Rene Engelhard <rene@debian.org> Tue, 13 Dec 2011 20:17:01 +0000
libreoffice (1:3.4.4-3) UNRELEASED; urgency=low
diff --git a/rules b/rules
index f61ea46..4b72250 100755
--- a/rules
+++ b/rules
@@ -1189,7 +1189,7 @@ else
endif
endif
BUILD_PATH := $(CURDIR)/debian/usr/bin:$(BUILD_PATH)
-BUILD_LD_LIBRARY_PATH := /usr/lib/libfakeroot:$(BUILD_LD_LIBRARY_PATH):$(GCJ_JAWT_DIR)
+BUILD_LD_LIBRARY_PATH := $(BUILD_LD_LIBRARY_PATH):$(GCJ_JAWT_DIR)
ifeq "$(ENABLE_LDAP)" "y"
ifeq "$(USE_OPENLDAP)" "y"
@@ -1599,13 +1599,6 @@ endif
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) build
- # apparently setting this here globally doesn't work, so hack around.
- # If we don't do this we get loads of harmless, but log-bloating
- # warnings
- if ! grep fakeroot $(OOO_BUILD_TREE)/bin/setup; then \
- perl -pi -e 's,LD_LIBRARY_PATH=\"(.*)\",LD_LIBRARY_PATH=\"/usr/lib/libfakeroot:\1\",' $(OOO_BUILD_TREE)/bin/setup; \
- fi
-
# DPKG is only set on with-EPM build what we don't do and the menu stuff
# is only built wenn DPKG is set.. Same with PKGFORMAT.
cd $(SOURCE_TREE)/sysui; \
@@ -1670,14 +1663,9 @@ $(STAMP_DIR)/install: $(STAMP_DIR)/build
rm -rf $(SOURCE_TREE)/instsetoo_native/util/LibreOffice
# install LibreOffice.
- # somehow in the installer LD_LIBRARY_PATH doesn't contain
- # /usr/lib/libfakeroot anymore, causiong loads of ERROR:'s from
- # ld.so. Set LD_PRELOAD to the full path here manually.
cd $(SOURCE_TREE)/; \
. $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
PATH=$(BUILD_PATH) \
- LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(BUILD_LD_LIBRARY_PATH)" \
- LD_PRELOAD=/usr/lib/libfakeroot/libfakeroot-$(shell update-alternatives --query fakeroot | grep Value: | cut -d"-" -f2).so \
DESTDIR=$(CURDIR)/debian/tmp \
$(MAKE) distro-pack-install
export DESTDIR=$(CURDIR)/debian/tmp ;\
@@ -2999,7 +2987,7 @@ 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="/usr/lib/libfakeroot: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="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" \
dh_shlibdeps -s -Nlibreoffice$(VER)-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)) \
@@ -3023,7 +3011,7 @@ endif
# .. and prevent ure to depend on itself..
perl -pi -e 's/, ure \(.*\)$$//' debian/ure.substvars
ifeq "$(ENABLE_JAVA)" "y"
- LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
+ LD_LIBRARY_PATH="debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
dh_shlibdeps -plibreoffice$(VER)-officebean \
-Lure -Luno-libs3 \
-ldebian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(GCJ_JAWT_DIR) \
--
LibreOffice packaging repository
Reply to: