[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.0-1-37-ga2525a7
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit f4921f71cd3d9b1fa188fcdf970701af5458a3ec
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Feb 21 11:11:40 2012 +0100
make gbuild use hardlinks and use linkoo in smoketest to save some space
diff --git a/patches/pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff b/patches/pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
new file mode 100644
index 0000000..5515df0
--- /dev/null
+++ b/patches/pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
@@ -0,0 +1,26 @@
+From 6b1d19a3242353d84afeec1f0a798a95c851459d Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Tue, 21 Feb 2012 13:43:04 +0100
+Subject: [PATCH] pythonloader.uno.so, libpyuno and pyuno are duplicates for
+ linkoo too
+
+---
+ solenv/bin/linkoo | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
+index 06a103d..450da5a 100755
+--- a/solenv/bin/linkoo
++++ b/solenv/bin/linkoo
+@@ -136,7 +136,7 @@ my %replaceable = (
+
+ my @search_dirs = ( 'lib', 'bin', 'class' );
+
+-my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm', 'libsqlite3', 'libnssutil3' );
++my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm', 'libsqlite3', 'libnssutil3', 'pythonloader.uno', 'pyuno', 'libpyuno' );
+
+ sub sniff_target($)
+ {
+--
+1.7.5.4
+
diff --git a/patches/series b/patches/series
index f94db42..9d84acb 100644
--- a/patches/series
+++ b/patches/series
@@ -34,3 +34,4 @@ armhf-bridges.diff
armhf-bridges-fix-armv4t-armel.diff
icu-arm.diff
pkgconfig-mozilla-plugin.diff
+pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
diff --git a/rules b/rules
index fef1bbf..2e6d715 100755
--- a/rules
+++ b/rules
@@ -303,7 +303,6 @@ CONFIGURE_FLAGS= \
--disable-online-update \
--disable-fetch-external \
--enable-release-build \
- --disable-linkoo \
--without-fonts \
--without-myspell-dicts
@@ -1600,7 +1599,7 @@ build: $(STAMP_DIR)/build
$(STAMP_DIR)/build: config.status
dh_testdir
- 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 gb_FULLDEPS=
+ 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 gb_FULLDEPS= gb_Deliver_HARDLINK=T
ifeq "$(BUILD_PYUNO)" "y"
ifeq "$(ENABLE_PYTHON3)" "y"
@@ -1617,7 +1616,7 @@ ifeq "$(BUILD_PYUNO)" "y"
endif
ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
- unset DISPLAY && $(CURDIR)/debian/rules check gb_FULLDEPS=
+ unset DISPLAY && $(CURDIR)/debian/rules check gb_FULLDEPS= gb_Deliver_HARDLINK=T
endif
touch $@
@@ -1634,7 +1633,7 @@ endif
export TMPDIR=$(CURDIR)/debian/smoketest; \
export HOME=$(CURDIR)/debian/smoketest; \
export SAL_USE_VCLPLUGIN="svp"; \
- $(MAKE) check gb_FULLDEPS=
+ $(MAKE) check gb_FULLDEPS= gb_Deliver_HARDLINK=T
# doesn't get cleaned up.. (at least the dirs, the contents are gone)
if test -d $(CURDIR)/debian/smoketest; then \
cd $(CURDIR)/debian/smoketest && \
--
LibreOffice packaging repository
Reply to: