The following commit has been merged in the debian-experimental-4.0 branch:
commit b3bc42e16c0d5ac15b2f628917177ab8c837076d
Author: Rene Engelhard <[email protected]>
Date: Sun Dec 9 22:14:22 2012 +0100
guard jh_classpath call...
diff --git a/rules b/rules
index a422957..ee09608 100755
--- a/rules
+++ b/rules
@@ -1826,10 +1826,11 @@ 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
+ ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
# fix the classpath (file:// breaks javahelper)
jh_classpath --classpath="/usr/share/java/hsqldb.jar .." \
$(PKGDIR)-base/$(OODIR)/program/classes/sdbc_hsqldb.jar
-
+ endif
ifeq (,$(filter hsqldb, $(SYSTEM_STUFF)))
# we need this in -base. Otherwise we get unwanted package differences
# in the unstable version and backports which might use internal hsqldb
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
