[libreoffice] 08/19: strip down -subsequentcheck deps
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-trusty-4.2
in repository libreoffice.
commit 6536dd7600db08ee93f589de3462769a7fe33483
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Mar 13 17:26:03 2014 +0100
strip down -subsequentcheck deps
---
changelog | 1 +
rules | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index c4476ac..f92ded9 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,7 @@ libreoffice (1:4.2.2~rc1-0ubuntu1~ppa2) UNRELEASED; urgency=low
* build libreoffice-subsequentcheckbase again
* fix tests/junit-subsequentcheck
* reenable junit
+ * strip down -subsequentcheck deps
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 07 Mar 2014 13:10:11 +0100
diff --git a/rules b/rules
index 7fd4251..ed0e554 100755
--- a/rules
+++ b/rules
@@ -1646,7 +1646,7 @@ endif
# for now we filter out the arch-specific libc* and ia64, which is ugly,
# but better than manual bookkeeping. Also filter out the mips(el)-only
# binutils build-dep...
- perl -pi -e "s#%BUILD_DEPS_ARCH_ALL%#$(strip $(shell echo '$(BUILD_DEPS), $(BUILD_DEPS_INDEP)'|sed -e 's/,/,\n /g'|grep -v libc0.1| grep -v libc6| grep -v ia64|grep -v binutils|sed -e 's/\[[^]]*\]//g'))#g" debian/control
+ perl -pi -e "s#%BUILD_DEPS_ARCH_ALL%#$(strip $(shell echo '$(BUILD_DEPS), $(BUILD_DEPS_INDEP)'|sed -e 's/,/,\n /g'|grep -v libc0.1|grep -v libc6|grep -v ia64|grep -v binutils|grep -v gcj-jdk|grep -v gcj-native-helper|grep -v libgcj-common|grep -v openjdk-6-jdk|sed -e 's/\[[^]]*\]//g'))#g" debian/control
ifeq "$(BUILD_KDE)" "y"
perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome | libreoffice-kde/' debian/control
else
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: