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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0-2-9-gf341371



The following commit has been merged in the debian-experimental-3.5 branch:
commit f341371c2d9682ea2b7a967cd0db4151162d738f
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Feb 24 00:16:51 2012 +0100

    don't set ENABLE_SDBC_POSTGRESQL=n when building no extensions, as this isn't an extension anymore

diff --git a/changelog b/changelog
index 161e694..c427550 100644
--- a/changelog
+++ b/changelog
@@ -5,10 +5,13 @@ libreoffice (1:3.5.0-3) UNRELEASED; urgency=low
 
   * debian/control.fonts.in: make ttf-opensymbol Priority: extra, thanks
     lintian
-  * debian/rules: --with-mingw -> --with-mingw-cross-compiler; remove
-    obsolete "export MINGWSTRIP" hack 
+  * debian/rules:
+    - --with-mingw -> --with-mingw-cross-compiler; remove obsolete
+      "export MINGWSTRIP" hack 
+    - don't set ENABLE_SDBC_POSTGRESQL=n when building no extensions, as
+      this isn't an extension anymore
 
- -- Rene Engelhard <rene@debian.org>  Thu, 23 Feb 2012 21:05:54 +0000
+ -- Rene Engelhard <rene@debian.org>  Fri, 24 Feb 2012 00:13:28 +0100
 
 libreoffice (1:3.5.0-2) experimental; urgency=low
 
diff --git a/rules b/rules
index a64c51e..df2847e 100755
--- a/rules
+++ b/rules
@@ -386,7 +386,6 @@ ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
 	ENABLE_MINIMIZER=n
 	ENABLE_PDFIMPORT=n
 	ENABLE_PRESENTER_CONSOLE=n
-	ENABLE_SDBC_POSTGRESQL=n
 	ENABLE_MYSQLNATIVE=n
 	DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-mysql-connector
 	DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin -Nlibreoffice$(VER)-report-builder

-- 
LibreOffice packaging repository


Reply to: