The following commit has been merged in the debian-experimental-3.5 branch:
commit 41b0722b90482bfeba77d2a24667982b2e7bd6ef
Author: Rene Engelhard <[email protected]>
Date: Sun Feb 19 22:54:05 2012 +0100
apply patch from Rico Tzschichholz to update some configure flags to new
names in 3.5.x
diff --git a/changelog b/changelog
index 24830f8..201fca2 100644
--- a/changelog
+++ b/changelog
@@ -12,11 +12,13 @@ libreoffice (1:3.5.0-2) UNRELEASED; urgency=low
* debian/rules:
- remove obsolete (and buggy) conditional icu-on-arm-fails breaking
the build
+ - apply patch from Rico Tzschichholz to update some configure flags
+ to new names in 3.5.x
[ Bjoern Michaelsen ]
* debian/libreoffice-common.postrm.in: remove mismerged superfluous fi
- -- Rene Engelhard <[email protected]> Sun, 19 Feb 2012 14:02:53 +0100
+ -- Rene Engelhard <[email protected]> Sun, 19 Feb 2012 22:46:24 +0100
libreoffice (1:3.5.0-1) experimental; urgency=low
diff --git a/rules b/rules
index 6d7e391..d9bbe46 100755
--- a/rules
+++ b/rules
@@ -281,7 +281,7 @@ SYSTEM_STUFF += expat
SYSTEM_STUFF += odbc
SYSTEM_STUFF += curl
SYSTEM_STUFF += sane
-SYSTEM_STUFF += xrender-headers
+SYSTEM_STUFF += xextensions-headers
SYSTEM_STUFF += mesa-headers
SYSTEM_STUFF += db
SYSTEM_STUFF += poppler
@@ -552,7 +552,7 @@ endif
ifneq (,$(filter sane, $(SYSTEM_STUFF)))
BUILD_DEPS += , libsane-dev
endif
-ifneq (,$(filter xrender-headers, $(SYSTEM_STUFF)))
+ifneq (,$(filter xextensions-headers, $(SYSTEM_STUFF)))
BUILD_DEPS += , libxrender-dev
endif
ifneq (,$(filter libpng, $(SYSTEM_STUFF)))
@@ -1027,7 +1027,7 @@ endif
ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
BUILD_DEPS += , libpq-dev (>= 9.0~)
else
- CONFIGURE_FLAGS += --disable-sdbc-postgresql
+ CONFIGURE_FLAGS += --disable-postgresql-sdbc
endif
ifeq "$(ENABLE_RANDR)" "y"
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
