The following commit has been merged in the debian-experimental-4.1 branch:
commit 3c031efb6e25f64ce511d912432c070b3967ace9
Author: Rene Engelhard <[email protected]>
Date: Fri Mar 29 13:53:52 2013 +0100
git update; update for chanegd gio/gnome-vfs defaults
diff --git a/changelog b/changelog
index 02b0815..316ea35 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~alpha1~git20130318-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~alpha1~git20130329-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/rules b/rules
index a52422e..dfbface 100755
--- a/rules
+++ b/rules
@@ -1187,14 +1187,14 @@ ifneq (,$(filter redland, $(SYSTEM_STUFF)))
endif
ifeq "$(ENABLE_GIO)" "y"
- CONFIGURE_FLAGS += --enable-gio --disable-gnome-vfs
BUILD_DEPS += , libglib2.0-dev (>= 2.15.0)
+else
+ CONFIGURE_FLAGS += --disable-gio
endif
ifeq "$(ENABLE_GVFS)" "y"
BUILD_DEPS += , libgnomevfs2-dev
-else
- CONFIGURE_FLAGS += --disable-gnome-vfs
+ CONFIGURE_FLAGS += --enable-gnome-vfs
endif
ifeq "$(ENABLE_GCONF)" "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]
