[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-3-2-g79098b1
The following commit has been merged in the master branch:
commit 8e975172d86be744efffa1e281c7c7378f61a8e2
Author: Rene Engelhard <rene@debian.org>
Date: Fri Sep 30 01:24:22 2011 +0200
use jh_manifest instead of manual MANIFEST.MF hacking for jurt.jar
diff --git a/changelog b/changelog
index fb76593..4e2e9f0 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:3.4.3-4) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - use jh_manifest instead of manual MANIFEST.MF hacking for jurt.jar
+
+ -- Rene Engelhard <rene@debian.org> Fri, 30 Sep 2011 01:23:27 +0200
+
libreoffice (1:3.4.3-3) unstable; urgency=low
* debian/patches/jdk-1.7.0-vendorname.diff: backport from master; allow
diff --git a/rules b/rules
index c8991a3..20dafb8 100755
--- a/rules
+++ b/rules
@@ -2234,15 +2234,8 @@ 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
- t=`mktemp -q -d`; \
- mkdir -p $$t && cd $$t && \
- unzip $(CURDIR)/debian/ure/usr/share/java/jurt.jar \
- META-INF/MANIFEST.MF && \
- perl -pi -e 's#../../lib/#../../lib/ /$(OOUREDIR)/lib/#g' \
- META-INF/MANIFEST.MF && \
- zip -r $(CURDIR)/debian/ure/usr/share/java/jurt.jar \
- META-INF/MANIFEST.MF && \
- cd $(CURDIR) && rm -rf $$t
+ jh_manifest --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
mkdir -p debian/uno-libs3/$(OOUREDIR)/lib
--
LibreOffice packaging repository
Reply to: