[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-3-123-gc3618b9
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit f2228f12efa26f92a3752993095c15ce04a36c7e
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
pythonloader patch for linkoo is already upstreamed
diff --git a/patches/pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff b/patches/pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
deleted file mode 100644
index d291625..0000000
--- a/patches/pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-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
-@@ -137,7 +137,7 @@
-
- my @search_dirs = ( 'lib', 'bin', 'class' );
-
--my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm', 'libsqlite3', 'libnssutil3', 'pythonloader.uno', 'pyuno', 'libpyuno' );
-+my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm', 'libsqlite3', 'libnssutil3', 'pythonloader.uno', 'pyuno', 'libpyuno', 'pythonloader.uno', 'pyuno', 'libpyuno' );
-
- sub sniff_target($)
- {
diff --git a/patches/series b/patches/series
index 9ac5bbc..60d9242 100644
--- a/patches/series
+++ b/patches/series
@@ -20,7 +20,6 @@ make-pyuno-work-with-system-wide-module-install.diff
make-package-modules-not-suck.diff
#disable-unoapi-subsequentcheck-for-now.diff
mediwiki-oor-replace.diff
-pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
debian-hardened-buildflags.diff
gtk3-hack-explicit-gmodule.diff
pyuno-py3-module.diff
diff --git a/rules b/rules
index d8b2740..146f019 100755
--- a/rules
+++ b/rules
@@ -1604,7 +1604,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 $@
@@ -1628,7 +1628,6 @@ endif
if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \
$(MAKE) -k check gb_FULLDEPS= gb_Deliver_HARDLINK=T && \
rm -rf $$t
-
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
patch -p1 -R < $(CURDIR)/debian/patches/disable-db-tests.diff
endif
--
LibreOffice packaging repository
Reply to: