The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 0a58d08926065f9b35fc31629566f8589d8643e1
Author: Bjoern Michaelsen <[email protected]>
Date: Wed Mar 27 06:33:04 2013 +0100
reduce diff to debian: just silently disable-gnome-vfs, when enabling gio
diff --git a/rules b/rules
index 8658984..447e687 100755
--- a/rules
+++ b/rules
@@ -1254,10 +1254,7 @@ ifneq (,$(filter redland, $(SYSTEM_STUFF)))
endif
ifeq "$(ENABLE_GIO)" "y"
- ifeq "$(ENABLE_GVFS)" "y"
- $(warn GIO and GVFS cant be enabled at the same time!)
- endif
- CONFIGURE_FLAGS += --enable-gio
+ CONFIGURE_FLAGS += --enable-gio --disable-gnome-vfs
BUILD_DEPS += , libglib2.0-dev (>= 2.15.0)
endif
--
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]
