[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.2-1-22-g3a4e0cd
The following commit has been merged in the debian-experimental-3.6 branch:
commit 3a4e0cddcf1317fbfab0e11c7bed6f265b06c41e
Author: Rene Engelhard <rene@debian.org>
Date: Fri Apr 6 17:30:29 2012 +0200
propagate-gb_FULLDEPS.diff is most probably also obsolete
diff --git a/patches/propagate-gb_FULLDEPS.diff b/patches/propagate-gb_FULLDEPS.diff
deleted file mode 100644
index 8175e8a..0000000
--- a/patches/propagate-gb_FULLDEPS.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-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 5118bac..7a19f1b 100644
--- a/patches/series
+++ b/patches/series
@@ -20,7 +20,6 @@ make-pyuno-work-with-system-wide-module-install.diff
search-usr-share-for-images.diff
make-package-modules-not-suck.diff
add-debian-multiarch-support.diff
-propagate-gb_FULLDEPS.diff
disable-sc-sw-unoapi-subsequentcheck-for-now.diff
mediwiki-oor-replace.diff
move-binfilter-mimetypes-in-extra-desktop-file.diff
--
LibreOffice packaging repository
Reply to: