[libreoffice] 01/01: move libreoffice-subsequentcheckbase.substvars to binary-indep where it belongs
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit f7684faa928c0813ca8a33870d6f5543da817b43
Author: Rene Engelhard <rene@debian.org>
Date: Sun Mar 27 10:39:02 2016 +0200
move libreoffice-subsequentcheckbase.substvars to binary-indep where it belongs
---
rules | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/rules b/rules
index 69df815..cdcbc07 100755
--- a/rules
+++ b/rules
@@ -3334,10 +3334,6 @@ ifeq "$(ENABLE_JAVA)" "y"
perl -pi -e 's/^(java:Depends.*$$)/\1, ure/' \
debian/libreoffice-officebean.substvars
endif
-ifeq "$(BUILD_TEST_PACKAGE)" "y"
- perl -pi -e 's/junit4/junit4 $(JUNIT_MIN_VER)/' \
- debian/libreoffice-subsequentcheckbase.substvars
-endif
# This switch to dh_shlibdeps reduces the 'libXXX not found' warnings but
# causes ldd crashes sometimes when used with fakeroot:
# -l $(PKGDIR)-core/$(OPENOFFICEDIR)/program
@@ -3495,6 +3491,10 @@ ifeq "$(ENABLE_JAVA)" "y"
-Xlibreoffice-report-builder; \
done
endif
+ifeq "$(BUILD_TEST_PACKAGE)" "y"
+ perl -pi -e 's/junit4/junit4 $(JUNIT_MIN_VER)/' \
+ debian/libreoffice-subsequentcheckbase.substvars
+endif
dh_gencontrol -i $(DEBHELPER_OPTIONS) \
-Nlibreoffice-wiki-publisher \
-Nfonts-opensymbol -- \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: