[Libreoffice-commits] .: 2 commits - patches/postgresql

[René Engelhard]

 patches/postgresql/sdbc-postgresql-oxt.diff |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit cf4b888d7b11ab9b2911fc602c2671b1af780996
Merge: 795f73b... 1793f34...
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Nov 27 19:11:48 2010 +0100

    Merge branch 'libreoffice-3-3'

commit 1793f3460de8c722d1f1e42537827964d30a7327
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Nov 27 19:07:59 2010 +0100

    sdbc-postgresql-oxt.diff: remove gone DataAccess.xcu from manifest

diff --git a/patches/postgresql/sdbc-postgresql-oxt.diff b/patches/postgresql/sdbc-postgresql-oxt.diff
index e8e08a6..85c174a 100644
--- a/patches/postgresql/sdbc-postgresql-oxt.diff
+++ b/patches/postgresql/sdbc-postgresql-oxt.diff
@@ -1,6 +1,6 @@
 --- connectivity/source/drivers/postgresql/manifest.xml.old	2010-11-26 19:01:13.000000000 +0100
 +++ connectivity/source/drivers/postgresql/manifest.xml	2010-11-25 21:18:03.000000000 +0100
-@@ -0,0 +1,12 @@
+@@ -0,0 +1,10 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
 +<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
@@ -9,8 +9,6 @@
 +  <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=native"
 +                       manifest:full-path="postgresql-sdbc.uno.so"/>
 +  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-+                       manifest:full-path="DataAccess.xcu"/>
-+  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
 +                       manifest:full-path="postgresql.xcu"/>
 +</manifest:manifest>
 --- connectivity/source/drivers/postgresql/description.xml.old	2010-11-26 19:01:26.000000000 +0100