[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.4.2-2-10-g83f9d3d
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 07ee409292b9003f87fe33f5c41c943e6b389378
Author: Rene Engelhard <rene@debian.org>
Date: Fri Aug 19 17:33:23 2011 +0200
partially revert 165efec47b35fa52a88e3b4bc8eaa410d2c323e0. Keep the new patches but disable again
diff --git a/changelog b/changelog
index 7e09fdc..0bdad55 100644
--- a/changelog
+++ b/changelog
@@ -1,10 +1,6 @@
libreoffice (1:3.4.2-3) UNRELEASED; urgency=low
* debian/patches/fdo35784.diff: add patch from fdo35784, thanks lmamane
- * debian/patches/disable-sdbc-postgresql.diff: remove
-
- * debian/rules:
- - re-enable -sdbc-postgresql
-- Rene Engelhard <rene@debian.org> Wed, 17 Aug 2011 09:25:08 +0000
diff --git a/patches/disable-sdbc-postgresql.diff b/patches/disable-sdbc-postgresql.diff
new file mode 100644
index 0000000..5a78ff2
--- /dev/null
+++ b/patches/disable-sdbc-postgresql.diff
@@ -0,0 +1,13 @@
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index dd51188..6e09796 100644
+--- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply
++++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply
+@@ -50,7 +50,7 @@ SUSE : NovellBase, ImpressFontSize, PostgreSQL
+ # Slackware
+ Slackware : LinuxCommon, Mono, msaccess
+ # Debian
+-DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PostgreSQL
++DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split
+ Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only
+ DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
+ # Ubuntu
diff --git a/patches/series b/patches/series
index 013d3bc..5db5fb5 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
@@ -19,5 +20,5 @@ fix-bridges-cpp-uno-depends.diff
no-prctl-on-kfreebsd.diff
make-gengal-work-again.diff
fix-distro-config.diff
-fdo35784.diff
-sdbc-postgresql-obsolete-hash-map.diff
+#fdo35784.diff
+#sdbc-postgresql-obsolete-hash-map.diff
diff --git a/rules b/rules
index cd15f18..d79a92a 100755
--- a/rules
+++ b/rules
@@ -252,7 +252,8 @@ else
ENABLE_REPORTDESIGN=n
ENABLE_MEDIAWIKI=n
endif
-ENABLE_SDBC_POSTGRESQL=y
+# NOTE: if enabling this, disable debian/patches/disable-sdbc-postgresql.diff!
+ENABLE_SDBC_POSTGRESQL=n
ENABLE_MINIMIZER=y
ENABLE_PRESENTER_CONSOLE=y
ENABLE_PDFIMPORT=y
--
LibreOffice packaging repository
Reply to: