[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4-1-175-gb2b34d5
The following commit has been merged in the debian-experimental-4.0 branch:
commit 58a4d4b20ab7a7096762e0c76da54ea8d4e0d7ab
Author: Rene Engelhard <rene@debian.org>
Date: Sun Dec 9 21:55:08 2012 +0100
fix sdbc_hsqldb.jar Class-Path: so that jh_depends works again
diff --git a/rules b/rules
index 3b71e5d..3b06496 100755
--- a/rules
+++ b/rules
@@ -1826,6 +1826,9 @@ ifeq "$(ENABLE_JAVA)" "y"
$(PKGDIR)-base/$(shell echo $(OODIR) | sed -e s/lib/share/)/program/classes; \
ln -s $(shell echo /$(OODIR) | sed -e s/lib/share/)/program/classes/sdbc_hsqldb.jar \
$(PKGDIR)-base/$(OODIR)/program/classes/sdbc_hsqldb.jar
+ # fix the classpath (file:// breaks javahelper)
+ jh_classpath --classpath="/usr/share/java/hsqldb.jar .." \
+ $(PKGDIR)-base/$(OODIR)/program/classes/sdbc_hsqldb.jar
ifeq (,$(filter hsqldb, $(SYSTEM_STUFF)))
# we need this in -base. Otherwise we get unwanted package differences
--
LibreOffice packaging repository
Reply to: