------------------------------------------------------------
revno: 1522
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Tue 2009-05-05 00:56:55 +0200
message:
update ooo-build with DataAccess.xcu setting JDBC paths, remove changing
jvmfwk3rc from rules and suggest libjtds-java, too
modified:
changelog
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-05-04 20:43:27 +0000
+++ b/changelog 2009-05-04 22:56:55 +0000
@@ -4,8 +4,10 @@
* upload to unstable
* ooo-build:
- - update (05aab24c38a4f4ffe2649d116edc90c768aebab3)
+ - update (190e433673712d33ce0d44c07ac519cd0d618fa1)
- forces OpenJDK javadoc even on gcj builds, fixes odk build breakage
+ - use 3.1s new feature of setting JDBC CLASSPATHs in DataAcess.xcu
+ directly
* debian/rules:
- move python version setting before the python conditionals deciding
@@ -13,10 +15,13 @@
- remove arch specifier from openjdk build-dep
- fix GCC_VERSION handling to work again with OOo build calling
e.g. i486-linux-gnu-gcc
+ - remove changing jvmfwk3rc for adding JDBC CLASSPATHs
* debian/watch: move from ftp.stardiv.de (not master anymore) to
ftp.gwdg.de
+ * debian/control.in:
+ - also suggest libjtds-java
- -- Rene Engelhard <[email protected]> Thu, 30 Apr 2009 01:02:53 +0200
+ -- Rene Engelhard <[email protected]> Tue, 05 May 2009 00:54:48 +0200
openoffice.org (1:3.1.0~rc2-1) experimental; urgency=low
=== modified file 'control.in'
--- a/control.in 2009-04-27 13:34:49 +0000
+++ b/control.in 2009-05-04 22:56:55 +0000
@@ -455,7 +455,7 @@
${misc:Depends}
Suggests: unixodbc,
libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools,
- libmysql-java | libpg-java,
+ libmysql-java | libpg-java | libjtds-java,
openoffice.orgVER-gcj,
openoffice.orgVER-report-builder
Replaces: openoffice.orgVER-core (<< 2.0.1),
@@ -491,10 +491,11 @@
- SQLite
- MS SQL / Sybase SQL
- *.mdb (JET / MS Access)
- * libmysql-java | libpg-java: JDBC Drivers
+ * libmysql-java | libpg-java | libjtds-java: JDBC Drivers
for:
- MySQL
- PostgreSQL
+ - MS SQL Server and Sybase
Package: openoffice.orgVER-style-crystal
Architecture: all
=== modified file 'rules'
--- a/rules 2009-05-04 20:43:27 +0000
+++ b/rules 2009-05-04 22:56:55 +0000
@@ -1945,12 +1945,6 @@
ln -sf /$(OOUREDIR)/lib/`basename $$i`
debian/uno-libs3/usr/lib/`basename $$i`; \
done
- # add MySQL and PostgreSQL JDBC drivers to OOos CLASSPATH
- sed -i -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 's|\(UNO_JAVA_JFW_CLASSPATH_URLS=.*\)|\1
file:///usr/share/java/postgresql.jar|' \
- debian/ure/$(OOUREDIR)/lib/jvmfwk3rc
-
ifeq "$(BUILD_KDE)" "y"
mkdir -p -m755 $(PKGDIR)-kde/$(OODIR)/program
mkdir -p -m755 $(PKGDIR)-kde/$(OOBRANDDIR)/program
