------------------------------------------------------------
revno: 1103
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:25:12 +0000
+++ b/changelog 2008-05-15 14:48:19 +0000
@@ -6,8 +6,9 @@
- update for new xulrunner 1.9 packaging using iceape-dev.
Use MOZILLA=iceape (closes: #480813)
- specify -Nopenoffice.org-gcj when building without Java
- * 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
* debian/control.qa.in:
- fix -qa-tools' depends
* debian/copyright: fix "Obtained from", mention go-oo.org. Remove obsolete
=== modified file 'rules'
--- a/rules 2008-05-12 10:01:43 +0000
+++ b/rules 2008-05-15 14:48:19 +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
