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

[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4-1-181-gecd9760



The following commit has been merged in the debian-experimental-4.0 branch:
commit ecd97605d2e0396f69aae1fe917bf1f90dfc5ac6
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Dec 10 23:07:07 2012 +0100

    fix path of sdbc_hsqldb.jar in jh_classpath (doesn't work on symlinks)

diff --git a/rules b/rules
index 6ec6daa..2dbf7ca 100755
--- a/rules
+++ b/rules
@@ -1840,7 +1840,7 @@ ifeq "$(ENABLE_JAVA)" "y"
     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
+		$(PKGDIR)-base/$(shell echo /$(OODIR) | sed -e s/lib/share/)/program/classes/sdbc_hsqldb.jar
     endif
     ifeq (,$(filter hsqldb, $(SYSTEM_STUFF)))
 	# we need this in -base. Otherwise we get unwanted package differences

-- 
LibreOffice packaging repository


Reply to: