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

[libreoffice] 01/02: solver -> instdir



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 a38996913db00655ac301e3f6c8b938681d83766
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Feb 12 07:38:02 2014 +0100

    solver -> instdir
---
 rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules b/rules
index 21bb468..bdc03d6 100755
--- a/rules
+++ b/rules
@@ -2703,7 +2703,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 instdir/ure/share/java/$$i.jar; \
 	done
 endif
 
@@ -3071,7 +3071,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 instdir/program/classes/unoil.jar
 endif
 
 	touch $@

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


Reply to: