[libreoffice] 01/02: mh_installjar wants *one* jar, remove the extra installation one in solver
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 6dbb2bc524b69da974bb9346be978e5392ddacfe
Author: Rene Engelhard <rene@debian.org>
Date: Wed Feb 12 21:35:02 2014 +0100
mh_installjar wants *one* jar, remove the extra installation one in solver
---
rules | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules b/rules
index 8893304..75ccdc4 100755
--- a/rules
+++ b/rules
@@ -2593,7 +2593,7 @@ ifeq "$(ENABLE_JAVA)" "y"
done
mh_installpoms -pure
for i in juh jurt ridl; do \
- mh_installjar -pure -l debian/pom.$$i.xml `find solver -name "$$i.jar"`; \
+ mh_installjar -pure -l debian/pom.$$i.xml `find solver -name "$$i.jar" | grep -v installation`; \
done
endif
@@ -2962,7 +2962,7 @@ ifeq "$(ENABLE_JAVA)" "y"
sed -e s/@version@/$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d~ -f1)/ \
< debian/pom.unoil.xml.in > debian/pom.unoil.xml
mh_installpoms -plibreoffice-java-common
- mh_installjar -plibreoffice-java-common -l debian/pom.unoil.xml `find solver -name "unoil.jar"`
+ mh_installjar -plibreoffice-java-common -l debian/pom.unoil.xml `find solver -name "unoil.jar" | grep -v installation`
endif
touch $@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: