------------------------------------------------------------
revno: 1105
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Thu 2008-05-15 16:49:30 +0200
message:
merge
modified:
changelog
rules
------------------------------------------------------------
revno: 1097.1.6
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Thu 2008-05-15 16:48:19 +0200
message:
if we don't suggest it anymore because it's removed we don't need to add
it to the CLASSPATH either
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-05-14 22:27:11 +0000
+++ b/changelog 2008-05-15 14:49:30 +0000
@@ -3,10 +3,11 @@
* ooo-build:
- use ooo-build-2-4-1 branch
- update (r12554)
- * debian/control.in:
- - libsapdbc-java was removed, stop suggesting it
+ * debian/control.in, debian/rules:
+ - libsapdbc-java was removed, stop suggesting it and adding it to OOos
+ CLASSPATH
- -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 15 May 2008 00:26:40 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 15 May 2008 16:49:08 +0200
openoffice.org (1:2.4.1~ooh680m14-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2008-05-13 19:48:51 +0000
+++ b/rules 2008-05-15 14:49:30 +0000
@@ -2555,10 +2555,9 @@
cp ooo-build/desktop/48x48/*.png \
$(PKGDIR)-common/usr/share/icons/hicolor/48x48/apps
- # add MySQL, MaxDB and PostgreSQL JDBC drivers to OOos CLASSPATH
+ # add MySQL and PostgreSQL JDBC drivers to OOos CLASSPATH
TMP=`mktemp -q`; \
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 '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
