[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/postgresql

[René Engelhard]

 patches/postgresql/sdbc-postgresql-oxt.diff |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit a0ba32a18d1debd37a782f1e475fe53fe5468027
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Nov 27 12:10:38 2010 +0100

    make patches/postgresql/sdbc-postgresql-oxt.diff apply again

diff --git a/patches/postgresql/sdbc-postgresql-oxt.diff b/patches/postgresql/sdbc-postgresql-oxt.diff
index 8aed505..e8e08a6 100644
--- a/patches/postgresql/sdbc-postgresql-oxt.diff
+++ b/patches/postgresql/sdbc-postgresql-oxt.diff
@@ -41,7 +41,7 @@
  ALLTAR : $(DLLDEST)$/$(DRIVERNAME)
  
  # --- Targets ------------------------------------------------------
-@@ -191,8 +191,9 @@ INI_EXT=.ini
+@@ -191,19 +191,29 @@
  $(DLLDEST)$/$(SHL1TARGET)$(INI_EXT): $(SHL1TARGET)
      +cp $? $@
  
@@ -49,10 +49,9 @@
  $(DLLDEST)$/$(DRIVERNAME): \
 +        $(DLLDEST)$/META-INF$/manifest.xml \
 +        $(DLLDEST)$/description.xml \
-         $(DLLDEST)$/DataAccess.xcu \
          $(DLLDEST)$/postgresql.xcu \
          $(DLLDEST)$/$(SHL1TARGET)$(DLLPOST) \
-@@ -200,12 +201,21 @@ $(DLLDEST)$/$(DRIVERNAME): \
+         $(DLLDEST)$/$(SHL2TARGET)$(DLLPOST) \
          $(DLLDEST)$/$(SHL1TARGET)$(INI_EXT)
      +cd $(DLLDEST) && \
          zip -r  $(DRIVERNAME) \
@@ -61,7 +60,6 @@
              $(SHL2TARGET)$(DLLPOST) \
              $(SHL1TARGET)$(INI_EXT) \
 +            description.xml \
-             DataAccess.xcu \
              postgresql.xcu
  
 +$(DLLDEST)$/META-INF$/manifest.xml : manifest.xml