[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. e49c4755fb3ca70ed3fe5806757d42357837c6f2
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 0f1b2d6269c354240c6816849a45948ee9f6e570
Author: Rene Engelhard <rene@debian.org>
Date: Fri Jun 3 13:11:46 2011 +0000
fix installation
diff --git a/patches/disable-ooinstall-in-package-ooo.diff b/patches/disable-ooinstall-in-package-ooo.diff
new file mode 100644
index 0000000..ced3861
--- /dev/null
+++ b/patches/disable-ooinstall-in-package-ooo.diff
@@ -0,0 +1,44 @@
+diff --git a/bin/package-ooo b/bin/package-ooo
+index 040ea48..389627f 100755
+--- libreoffice-3.4.0/libreoffice-build/bin/package-ooo
++++ libreoffice-3.4.0/libreoffice-build/bin/package-ooo
+@@ -34,10 +34,6 @@ if test "z$PIECE" != "z"; then
+ exit 0;
+ fi
+
+-echo "Cleaning $OOINSTDIR";
+-rm -Rf $OOINSTDIR;
+-set -e
+-
+ mkdir -p $PREFIX/bin
+
+ sed -e "s|@OOINSTBASE@|$OOINSTBASE|g" $TOOLSDIR/bin/ootool.in \
+@@ -215,28 +211,6 @@ Libs: -L\${libdir} -lprot_uno_uno
+ Cflags: -I\${includeddir}" > $LIBDIRBASE/pkgconfig/openoffice$BINSUFFIX.pc
+ fi
+
+-export DISPLAY=''; # clobber;
+-echo "Execute ooinstall ...";
+-
+-cd $TOOLSDIR/bin
+-
+-./ooinstall $OOINSTDIR || exit 1;
+-##cp -ra $OODESTDIR $OODESTDIR.1 || exit 1
+-##rm -r $OODESTDIR
+-##cp -ra $OODESTDIR.1 $OODESTDIR || exit 1
+-echo "Cleaning up ...";
+-
+-# No idea what these files are good for (?)
+-# they don't appear in the RPM file lists.
+-rm -Rf $OOINSTDIR/share/uno_packages/cache/*
+-
+-# FIXME: we need to packagethe extensions some way
+-if test -n "$OODESTDIR" ; then
+- rm -f $OOINSTDIR/share/extension/install/scsolver.uno.oxt
+-fi
+-
+-echo "Done";
+-
+ remove_help_localization()
+ {
+ lang=$1
diff --git a/patches/series b/patches/series
index 3c9a40a..113659e 100644
--- a/patches/series
+++ b/patches/series
@@ -8,3 +8,4 @@ buildfix-patches.diff
update-debian-opt.diff
#odk-jni-include.diff
disable-sdbc-postgresql.diff
+disable-ooinstall-in-package-ooo.diff
diff --git a/rules b/rules
index 964c389..628b1dd 100755
--- a/rules
+++ b/rules
@@ -1729,10 +1729,18 @@ $(STAMP_DIR)/install: $(STAMP_DIR)/build
# 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 $(OOO_BUILD_TREE)/; PATH=$(BUILD_PATH) \
+ cd $(SOURCE_TREE)/; \
+ . $(CURDIR)/$(SOURCE_TREE)/*Env*.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) install
+ DESTDIR=$(CURDIR)/debian/tmp \
+ solenv/bin/ooinstall /$(OOBRANDDIR)
+ # FIXME: Move here so that we don't rely on libreoffice-build here.
+ # Would also obsolete disable-ooinstall-in-package-ooo.diff
+ cd $(OOO_BUILD_TREE)/bin; \
+ export OODESTDIR=$(CURDIR)/debian/tmp; \
+ ./package-ooo
# prepare install/dir files for dh
for i in `cd $(CURDIR)/debian/tmp/pkg; ls -1 | xargs`; do \
--
LibreOffice packaging repository
Reply to: