[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_beta2-2-22-g0c7ef10
The following commit has been merged in the debian-experimental-3.5 branch:
commit 8a104a76858fdf502aa68fb99a7245193f5cc792
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Dec 22 11:18:06 2011 +0100
propagate gb_FULLDEPS
diff --git a/patches/propagate-gb_FULLDEPS.diff b/patches/propagate-gb_FULLDEPS.diff
new file mode 100644
index 0000000..8175e8a
--- /dev/null
+++ b/patches/propagate-gb_FULLDEPS.diff
@@ -0,0 +1,25 @@
+From 07fc748fb1b242859913df178a0c41dc95a9f3e7 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Wed, 21 Dec 2011 22:29:02 +0100
+Subject: [PATCH] propagate gb_FULLDEPS
+
+---
+ solenv/gbuild/source_and_rerun.mk | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/solenv/gbuild/source_and_rerun.mk b/solenv/gbuild/source_and_rerun.mk
+index a2aaea0..27de233 100644
+--- a/solenv/gbuild/source_and_rerun.mk
++++ b/solenv/gbuild/source_and_rerun.mk
+@@ -2,7 +2,7 @@
+ gb_MAKEFILEDIR:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+ define gb_SourceEnvAndRecurse_recurse
+-$(MAKE) -f $(firstword $(MAKEFILE_LIST)) -j $${GMAKE_PARALLELISM} $(1) gb_SourceEnvAndRecurse_STAGE=$(2)
++$(MAKE) -f $(firstword $(MAKEFILE_LIST)) -j $${GMAKE_PARALLELISM} $(1) gb_SourceEnvAndRecurse_STAGE=$(2) gb_FULLDEPS=$(gb_FULLDEPS)
+ endef
+
+ ifneq ($(strip $(gb_PARTIALBUILD)),)
+--
+1.7.5.4
+
diff --git a/patches/series b/patches/series
index 1d36b8c..56fb724 100644
--- a/patches/series
+++ b/patches/series
@@ -29,3 +29,4 @@ fix-ARM-detection-in-set-soenv.diff
conditionalize-qadevOOo-build.diff
add-debian-multiarch-support.diff
revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff
+propagate-gb_FULLDEPS.diff
--
LibreOffice packaging repository
Reply to: