[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-173-g3127934
The following commit has been merged in the debian-experimental-3.5 branch:
commit e8d4f048f78560a424bfbf3f665f13fb5d17c692
Author: Rene Engelhard <rene@debian.org>
Date: Wed Dec 21 22:26:36 2011 +0100
migrate jdbc-driver-classpaths.diff from libreoffice/build
diff --git a/changelog b/changelog
index a25b184..f4d8220 100644
--- a/changelog
+++ b/changelog
@@ -32,6 +32,7 @@ libreoffice (1:3.5.0~beta2-1) UNRELEASED; urgency=low
- update descriptions for new Gtk(3) print dialog
* debian/patches:
- migrate reportdesign-mention-package.diff from libreoffice/build
+ - migrate jdbc-driver-classpaths.diff from libreoffice/build
[ Bjoern Michaelsen ]
* debian/rules:
@@ -50,7 +51,7 @@ libreoffice (1:3.5.0~beta2-1) UNRELEASED; urgency=low
sensible-lomua; add icedove and thunderbird as fallbacks
- migrate sensible-browser.diff from libreoffice/build
- -- Rene Engelhard <rene@debian.org> Wed, 21 Dec 2011 22:12:16 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 21 Dec 2011 22:26:04 +0100
libreoffice (1:3.4.4-3) UNRELEASED; urgency=low
diff --git a/patches/jdbc-driver-classpaths.diff b/patches/jdbc-driver-classpaths.diff
new file mode 100644
index 0000000..8fc7404
--- /dev/null
+++ b/patches/jdbc-driver-classpaths.diff
@@ -0,0 +1,30 @@
+diff --git a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
+index 9be30a2..59c87cb 100644
+--- a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
++++ b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
+@@ -141,6 +141,25 @@
+ </node>
+ </node>
+ </node>
++ <node oor:name="JDBC">
++ <node oor:name="DriverClassPaths">
++ <node oor:name="com.mysql.jdbc.Driver" oor:op="replace">
++ <prop oor:name="Path">
++ <value>file:///usr/share/java/mysql.jar</value>
++ </prop>
++ </node>
++ <node oor:name="org.postgresql.Driver" oor:op="replace">
++ <prop oor:name="Path">
++ <value>file:///usr/share/java/posgresql.jar</value>
++ </prop>
++ </node>
++ <node oor:name="net.sourceforge.jtds.jdbc.Driver" oor:op="replace">
++ <prop oor:name="Path">
++ <value>file:///usr/share/java/jtds.jar</value>
++ </prop>
++ </node>
++ </node>
++ </node>
+ <node oor:name="RegisteredNames">
+ <node oor:name="EvolutionLocal" oor:op="replace" install:module="evoab2">
+ <prop oor:name="Location" oor:type="xs:string">
diff --git a/patches/series b/patches/series
index 59b56c0..8a347d2 100644
--- a/patches/series
+++ b/patches/series
@@ -19,3 +19,4 @@ sensible-lomua.diff
sensible-browser.diff
fix-unordf_complex-check.diff
reportdesign-mention-package.diff
+jdbc-driver-classpaths.diff
--
LibreOffice packaging repository
Reply to: