------------------------------------------------------------
revno: 842
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2007-08-13 22:59:08 +0200
message:
- remove hack for #340468; seems to be not needed anymore
- readd MySQL, MaxDB and PostgreSQL JDBC drivers to
UNO_JAVA_JFW_CLASSPATH_URLS (removed in m224-1 due to the hsqldb
problems fixed in dba23e)
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2007-08-13 20:50:48 +0000
+++ b/changelog 2007-08-13 20:59:08 +0000
@@ -2,6 +2,8 @@
* ooo-build:
- update (r10067)
+ + cws-jl68.diff: handle bundled Java extensions
+ + cws-dba23e.diff: fix system-hsqldb
* debian/shell-lib.sh, debian/openoffice.org-report-builder.{pre,post}*.in:
impove maintainer scripts (based on cws jl68). Check whether the extension
is registered before trying to remove it (it's not in case unopkg fails,
@@ -13,8 +15,12 @@
gsicheck instead
* debian/rules:
- fix control target dependencies
+ - remove hack for #340468; seems to be not needed anymore
+ - readd MySQL, MaxDB and PostgreSQL JDBC drivers to
+ UNO_JAVA_JFW_CLASSPATH_URLS (removed in m224-1 due to the hsqldb
+ problems fixed in dba23e)
- -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 13 Aug 2007 22:49:47 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 13 Aug 2007 22:58:23 +0200
openoffice.org (2.3.0~src680m225-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2007-08-13 20:50:48 +0000
+++ b/rules 2007-08-13 20:59:08 +0000
@@ -1696,9 +1696,6 @@
mv $(PKGDIR)-core/$(OODIR)/program/lib$$i* \
$(PKGDIR)-base/$(OODIR)/program; \
done
- # hack, #340468
- ln -s libhsqldb2.so \
- $(PKGDIR)-base/$(OODIR)/program/libhsqldb2
endif
mv $(PKGDIR)-core/$(OODIR)/program/libflat*so \
$(PKGDIR)-base/$(OODIR)/program; \
@@ -2346,11 +2343,11 @@
cp ooo-build/desktop/48x48/*.png \
$(PKGDIR)-common/usr/share/icons/hicolor/48x48/apps
- # fix jvmfwk, see http://www.openoffice.org/issues/show_bug.cgi?id=80338
+ # add MySQL, MaxDB and PostgreSQL JDBC drivers to OOos CLASSPATH
TMP=`mktemp -q`; \
- sed -e 's|file:///usr/share/java/bsh.jar||' \
- -e 's|file:///usr/share/java/hsqldb.jar||' \
- < $(PKGDIR)-common/$(OODIR)/program/jvmfwk3rc > $$TMP && \
+ sed -e 's|\(UNO_JAVA_JFW_CLASSPATH_URLS=.*\)|\1
file:///usr/share/java/mysql.jar|' \
+ -e 's|\(UNO_JAVA_JFW_CLASSPATH_URLS=.*\)|\1
file:///usr/share/java/sapdbc.jar|' \
+ -e -e 's|\(UNO_JAVA_JFW_CLASSPATH_URLS=.*\)|\1
file:///usr/share/java/postgresql.jar|' <
$(PKGDIR)-common/$(OODIR)/program/jvmfwk3rc > $$TMP && \
mv $$TMP $(PKGDIR)-common/$(OODIR)/program/jvmfwk3rc
# move psprint.conf into /etc
