[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.2-2-181-g77e0cb8



The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit 77e0cb8f863fad1b29b03f97c59ed53f6577c964
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Fri Aug 26 01:59:43 2011 +0200

    disable sdbc-postgres again

diff --git a/patches/disable-sdbc-postgresql.diff b/patches/disable-sdbc-postgresql.diff
new file mode 100644
index 0000000..94e8a9e
--- /dev/null
+++ b/patches/disable-sdbc-postgresql.diff
@@ -0,0 +1,13 @@
+Index: libreoffice-3.4.1/libreoffice-build/patches/dev300/apply
+===================================================================
+--- libreoffice-3.4.1.orig/libreoffice-build/patches/dev300/apply	2011-07-15 11:40:56.756849286 +0200
++++ libreoffice-3.4.1/libreoffice-build/patches/dev300/apply	2011-07-15 11:41:01.466849351 +0200
+@@ -50,7 +50,7 @@
+ # Slackware
+ Slackware : LinuxCommon, Mono, msaccess
+ # Debian
+-DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PostgreSQL, PowerPC
++DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PowerPC
+ Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only
+ DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
+ # Ubuntu
diff --git a/patches/series b/patches/series
index a0ce9db..12e5d1f 100644
--- a/patches/series
+++ b/patches/series
@@ -4,6 +4,7 @@ no-minimaltoc.diff
 update-debian-opt.diff
 gcc4.6.0.diff
 odk-jni-include.diff
+disable-sdbc-postgresql.diff
 disable-ooinstall-in-package-ooo.diff
 jurt-soffice-location.diff
 packcomponents-remove-split-components.diff

-- 
LibreOffice packaging repository


Reply to: