The following commit has been merged in the debian-experimental-4.2 branch:
commit ce6a47780bac4a460d814eecfd49d005b6372d88
Author: Rene Engelhard <r...@debian.org>
Date: Thu Jul 25 20:52:30 2013 +0200
git update; add conditional for avahi-client
diff --git a/changelog b/changelog
index 0677bce..69c5b0e 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.2.0~alpha0~git20130723-1) UNRELEASED; urgency=low
+libreoffice (1:4.2.0~alpha0~git20130725-1) UNRELEASED; urgency=low
* new upstream snapshot
@@ -8,7 +8,7 @@ libreoffice (1:4.2.0~alpha0~git20130723-1) UNRELEASED;
urgency=low
Run dh_doxygen
- build-depend on fonts-liberation when running the tests - the
sc_macros_tests VBA tests need Arial etc.-similar fonts
- - add conditionals for new libs used: opencl, firebird
+ - add conditionals for new libs used: opencl, firebird, avahi-client
-- Rene Engelhard <r...@debian.org> Sun, 02 Jun 2013 20:49:18 +0200
diff --git a/patches/series b/patches/series
index 5bac6ed..cb4fb71 100644
--- a/patches/series
+++ b/patches/series
@@ -29,4 +29,4 @@ javadoc-optional.diff
show-the-startcenter.diff
hack-interlck_sparc.diff
opencl-path.diff
-revert-ba6478560792e0eec161142c8cfbc0e08cd7a4f5.diff
+#revert-ba6478560792e0eec161142c8cfbc0e08cd7a4f5.diff
diff --git a/rules b/rules
index 930d775..02f0c77 100755
--- a/rules
+++ b/rules
@@ -245,6 +245,7 @@ ifeq "$(USE_DBUS)" "y"
SYSTEM_STUFF += bluez
endif
endif
+ENABLE_AVAHI=y
USE_GSTREAMER=y
ifneq "$(WHEEZY_BACKPORT)" "y"
GSTREAMER_VERSION=1.0
@@ -1255,6 +1256,11 @@ ifeq "$(USE_DBUS)" "y"
endif
endif
+ifeq "$(ENABLE_AVAHI)" "y"
+ BUILD_DEPS += , libavahi-client-dev
+ CONFIGURE_FLAGS += --enable-avahi
+endif
+
ifeq "$(USE_GSTREAMER)" "y"
ifeq "$(GSTREAMER_VERSION)" "1.0"
BUILD_DEPS += , libgstreamer$(GSTREAMER_VERSION)-dev
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1v2qen-0005zf...@vasks.debian.org
