[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.1.0-1-9-ga93dcb2
The following commit has been merged in the master branch:
commit a93dcb20b60c801656785ff2c7be6afa5fa87dd3
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
diff --git a/changelog b/changelog
index 9f60000..b4b3310 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,9 @@ libreoffice (1:4.1.0-2) UNRELEASED; urgency=low
* debian/rules:
- fix uno.py, actually add starting / in LOs path (closes: #717930)
+ - add -Nlibreoffice-report-builder to jh_depends call for arch-indep
+ packages so it doesn't get added to -java-commons Depends
+ (closes: #717903
* 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 be2588d..0139aa4 100755
--- a/rules
+++ b/rules
@@ -3176,7 +3176,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) \
--
LibreOffice packaging repository
Reply to: