[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-3-4-g0d385f4
The following commit has been merged in the master branch:
commit 0d385f4569bbcb8d2ae397356a2d4808231e5070
Author: Rene Engelhard <rene@debian.org>
Date: Fri Sep 30 03:25:59 2011 +0200
jh_manifest -> jh_classpath
diff --git a/changelog b/changelog
index 92f6f7c..d3f4383 100644
--- a/changelog
+++ b/changelog
@@ -4,7 +4,7 @@ libreoffice (1:3.4.3-4) UNRELEASED; urgency=low
make pdfimport build with poppler 0.17.x
* debian/rules:
- - use jh_manifest instead of manual MANIFEST.MF hacking for jurt.jar
+ - use jh_classpath instead of manual MANIFEST.MF hacking for jurt.jar
- build-depend on libpoppler-cpp-dev
- fix libsslX.Y.Z in -dbgs suggests for multiarch
diff --git a/rules b/rules
index 3b599ae..f88c042 100755
--- a/rules
+++ b/rules
@@ -2245,7 +2245,7 @@ ifeq "$(ENABLE_JAVA)" "y"
done
# fix up Class-Path of jurt.jar to be able to find libjpipe.so.
# See See http://www.openoffice.org/servlets/ReadMsg?list=dev&msgNo=27765
- jh_manifest --classpath="ridl.jar unoloader.jar ../../lib /$(OOUREDIR)/lib/ ../bin/" \
+ jh_classpath --classpath="ridl.jar unoloader.jar ../../lib /$(OOUREDIR)/lib/ ../bin/" \
$(CURDIR)/debian/ure/usr/share/java/jurt.jar
endif
# and the public libs to uno-libs3
--
LibreOffice packaging repository
Reply to: