[libreoffice] 05/21: add -Nlibreoffice-report-builder to jh_depends call for arch-indep
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-testing-4.0
in repository libreoffice.
commit 624087dfad26f9041b8c54bf2a82ef76d20b0ba2
Author: Rene Engelhard <rene@debian.org>
Date: Fri Jul 26 20:24:47 2013 +0200
add -Nlibreoffice-report-builder to jh_depends call for arch-indep
Conflicts:
changelog
---
changelog | 2 ++
rules | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index 7ee626e..196675d 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,8 @@ libreoffice (1:4.0.5~rc2-1) UNRELEASED; urgency=low
- temporarily use internal orcus and mdds as the new 4.1-usable versions
already are in unstable & testing
- use system-clucene again now that it's in sid & testing
+ - add -Nlibreoffice-report-builder to jh_depends call for arch-indep
+ packages so it doesn't get added to -java-commons Depends
* debian/libreoffice-common.postrm.in:
- don't create /var/lib/libreoffice/share/config/ anymore and
remove it (and javaunopkginstall.xml if exists) on purge
diff --git a/rules b/rules
index 0838213..3dfbd67 100755
--- a/rules
+++ b/rules
@@ -3148,7 +3148,8 @@ endif
ifeq "$(ENABLE_JAVA)" "y"
for p in $(ARCH_INDEP_PACKAGES); do \
if echo "$$p" | grep -q help; then continue; fi; \
- jh_depends -p$$p -Xlibreoffice-gcj -Xlibreoffice-dbg; \
+ jh_depends -v -p$$p -Xlibreoffice-gcj -Xlibreoffice-dbg \
+ -Xlibreoffice-report-builder; \
done
endif
dh_gencontrol -i $(DEBHELPER_OPTIONS) \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: