[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.4-4-91-g3201b85
The following commit has been merged in the debian-experimental-3.6 branch:
commit 3201b85e85f584030ba598855520c99e6b193a40
Author: Rene Engelhard <rene@debian.org>
Date: Sun Jun 17 14:59:18 2012 +0200
clean up dh_shlibdeps/jh_depends warnings
diff --git a/changelog b/changelog
index 5d9d92d..bb761fa 100644
--- a/changelog
+++ b/changelog
@@ -17,6 +17,11 @@ libreoffice (1:3.6.0~beta1-1) UNRELEASED; urgency=low
(closes: #662411)
- remove squeeze-backports stuff, add wheezy-backports
- install upstreams README(_en-US) (closes: #676340)
+ - clean up some warnings:
+ + readd /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libfakeroot
+ to LD_LIBRARY_PATH for dh_shlibdeps
+ + don't run jh_depends -i/-a, use -p for each package, otherwise it
+ gets confused by help.jar/s*.jar which is just zips, no "real" jar
* debian/uno-libs3.symbols: update
-- Rene Engelhard <rene@debian.org> Thu, 03 May 2012 13:44:05 +0200
diff --git a/rules b/rules
index ab6ef83..58568b0 100755
--- a/rules
+++ b/rules
@@ -297,6 +297,7 @@ PACKAGE_UNOWINREG_DLL=y
ifeq "$(DEB_VENDOR)" "Debian"
BUILD_UNOWINREG_DLL=y
endif
+FAKEROOT_LIBDIR=/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libfakeroot
# Default flags to pass to configure
CONFIGURE_FLAGS= \
@@ -2799,7 +2800,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="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/$(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)) \
@@ -2823,7 +2824,7 @@ endif
# .. and prevent ure to depend on itself..
perl -pi -e 's/, ure \(.*\)$$//' debian/ure.substvars
ifeq "$(ENABLE_JAVA)" "y"
- LD_LIBRARY_PATH="debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
+ LD_LIBRARY_PATH="$(FAKEROOT_LIBDIR):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) \
@@ -2833,7 +2834,10 @@ ifeq "$(LINK_TO_STLPORT)" "y"
perl -pi -e 's/(shlibs.*$$)/$$1, $(shell cat /var/lib/dpkg/info/libstlport4.6*.shlibs | awk '{ print $$3,$$4,$$5 }')/' debian/ure.substvars
endif
ifeq "$(ENABLE_JAVA)" "y"
- jh_depends -s -Xlibreoffice$(VER)-gcj -Xlibreoffice$(VER)-dbg -Xure
+ for p in $(ARCH_DEP_PACKAGES); do \
+ if [ "$$p" = "libreoffice$(VER)-presentation-console" ]; then continue; fi; \
+ jh_depends -p$$p -Xlibreoffice$(VER)-gcj -Xlibreoffice$(VER)-dbg -Xure; \
+ done
ifeq "$(PACKAGE_BASE)" "y"
perl -pi -e "s/libhsqldb-java/$(BASE_HSQLDB_DEPENDS)/" \
debian/libreoffice$(VER)-base.substvars
@@ -2981,7 +2985,10 @@ endif
dh_compress -i -X.py -X.mk -X.sxd -X.xcd.sample
dh_installdeb -i
ifeq "$(ENABLE_JAVA)" "y"
- jh_depends -i -Xlibreoffice$(VER)-gcj -Xlibreoffice$(VER)-dbg
+ for p in $(ARCH_INDEP_PACKAGES); do \
+ if echo "$$p" | grep -q help; then continue; fi; \
+ jh_depends -p$$p -Xlibreoffice$(VER)-gcj -Xlibreoffice$(VER)-dbg; \
+ done
endif
dh_gencontrol -i $(DEBHELPER_OPTIONS) \
-Nlibreoffice$(VER)-report-builder \
--
LibreOffice packaging repository
Reply to: