------------------------------------------------------------
revno: 2289
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Sat 2011-01-01 14:37:14 +0100
message:
fix hsqldb install for new SYSTEM_STUFF
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-12-31 17:27:41 +0000
+++ b/changelog 2011-01-01 13:37:14 +0000
@@ -12,6 +12,7 @@
+ disable gconf as gconftool-2 -g /desktop/gnome/interface/accessibility
hangs in the smoketest in a lenny chroot
- add explicit --with-system-mesa-headers
+ - update hsqldb conditionnals for new SYSTEM_STUFF variable.
[ Matthias Klose ]
* debian/rules:
@@ -33,7 +34,7 @@
* debian/scripts/joinctrl.py:
- Normalize whitespace in dependencies and similiar fields.
- -- Rene Engelhard <[email protected]> Fri, 31 Dec 2010 01:30:59 +0100
+ -- Rene Engelhard <[email protected]> Sat, 01 Jan 2011 14:36:05 +0100
libreoffice (1:3.3.0~rc2-2) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2010-12-31 00:34:33 +0000
+++ b/rules 2011-01-01 13:37:14 +0000
@@ -2122,7 +2122,7 @@
ln -s $(shell echo /$(OOBASISDIR) | sed -e
s/lib/share/)/program/classes/sdbc_hsqldb.jar \
$(PKGDIR)-base/$(OODIR)/program/classes/sdbc_hsqldb.jar
- ifneq "$(USE_SYSTEM_HSQLDB)" "y"
+ 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
mkdir -p $(PKGDIR)-base/$(OODIR)/program/classes
@@ -2560,7 +2560,7 @@
done
ifeq "$(ENABLE_JAVA)" "y"
- ifeq "$(USE_SYSTEM_HSQLDB)" "y"
+ ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
# link to system hsqldb
mkdir -p $(PKGDIR)-base/$(OODIR)/program/classes
ln -sf /usr/share/java/hsqldb.jar \
