[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 03/08: strip down -subsequentcheck deps



This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-4.2
in repository libreoffice.

commit bf352b1879489fdbf31ac06d779b0eeb7a4e865b
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Thu Mar 13 17:26:03 2014 +0100

    strip down -subsequentcheck deps
    
    Conflicts:
    	changelog
    	rules
---
 rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules b/rules
index 90c9306..c3cecb1 100755
--- a/rules
+++ b/rules
@@ -1683,7 +1683,7 @@ ifeq "$(BUILD_TEST_PACKAGE)" "y"
 	# 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
 endif
 ifeq "$(BUILD_KDE)" "y"
 	perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome | libreoffice-kde/' debian/control

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git


Reply to: