[SCM] LibreOffice packaging repository branch, master, updated. 950311bcfae87b64ed7bbff147c3ac7b64f15aa6
The following commit has been merged in the master branch:
commit 950311bcfae87b64ed7bbff147c3ac7b64f15aa6
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jun 14 02:27:35 2011 +0200
adapt for new gcj multiarch dirs
diff --git a/changelog b/changelog
index 8792cf0..b168a4e 100644
--- a/changelog
+++ b/changelog
@@ -11,6 +11,8 @@ libreoffice (1:3.3.3~rc1-1) UNRELEASED; urgency=low
- stop moving vbaevents*.uno.so to -calc. Move libvbaswobj*uno.so
to -writer
- make -l10n-sw (if enabled) depend on locales (>= 2.13-5)
+ - adapt GCJ_JAWT_DIR handling for new multiarch dirs and explicitely
+ give -l to the libgcj_bc.so.1 multiarch dir to dh_shlibdeps...
* debian/control.in:
- build-conflict against libmdds-dev (>= 0.4.0)
* debian/rules, debian/*lintian-overrides:
@@ -23,7 +25,7 @@ libreoffice (1:3.3.3~rc1-1) UNRELEASED; urgency=low
/usr/lib/libreoffice/program/soffice to jurts NativeLibraryLoader;
we know where it is
- -- Rene Engelhard <rene@debian.org> Mon, 13 Jun 2011 23:05:10 +0000
+ -- Rene Engelhard <rene@debian.org> Tue, 14 Jun 2011 00:18:33 +0000
libreoffice (1:3.3.2-4) unstable; urgency=low
diff --git a/rules b/rules
index 0400eea..a79beee 100755
--- a/rules
+++ b/rules
@@ -703,7 +703,7 @@ ifeq "$(ENABLE_JAVA)" "y"
BUILD_DEPS += , ant (>= 1.6.5)$(OOO_NO_JAVA_ARCHS)
endif
GCJ_VERSION = $(shell basename `readlink $(JAVA_HOME)/bin/gcj` | sed -e s/gcj-//)
- GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`readlink /usr/lib/libgcj_bc.so.1` | cut -d: -f1 | sed -e s/$$/-awt/)
+ GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/gcj-$(GCJ_JDK_VERSION)-*/libgcj_bc.so.1 | cut -d: -f1 | sed -e s/$$/-awt/)
DBG_DBG_SUGGESTS+= , $(shell echo $(GCJ_AWT_DEPENDS) | sed -e s/awt/dbg/)
JAVA_RUNTIME_DEPENDS = default-jre | gcj-jre | java-gcj-compat
# ifneq (,$(GCJ_JAWT_DEPENDS))
@@ -3230,7 +3230,7 @@ endif
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" \
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 \
+ -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)) \
$(SHLIBS_OVERRIDE)
ifneq (,$(filter redland, $(SYSTEM_STUFF)))
# dpkg-shlibdeps "in practice" always will look for this in
--
LibreOffice packaging repository
Reply to: