This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit a7c3999ffadbca9ddf1ec6d8733694a6e6e9a673
Author: Rene Engelhard <r...@debian.org>
Date: Mon Nov 30 23:45:10 2015 +0100
re-enable avahi
---
changelog | 3 +++
control | 2 ++
rules | 11 +----------
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/changelog b/changelog
index 4bcaf57..f206af9 100644
--- a/changelog
+++ b/changelog
@@ -20,6 +20,9 @@ libreoffice (1:5.1.0~beta1-1) experimental; urgency=medium
use pure perl for determining the version; taken from upstreams win
installer
+ * debian/rules:
+ - re-enable avahi
+
* debian/pom.unoloader.xml.in, debian/ure.poms, debian/rules: also
install ures unoloader.jar into maven
* debian/pom.officebean.xml.in, debian/libreoffice-officebean.poms,
diff --git a/control b/control
index d63846b..a445770 100644
--- a/control
+++ b/control
@@ -40,6 +40,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
kdelibs5-dev (>= 4:4.3.4),
libabw-dev (>= 0.1),
libarchive-zip-perl,
+ libavahi-client-dev,
libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386],
libboost-date-time-dev (>= 1.58),
libboost-dev (>= 1.58),
@@ -4454,6 +4455,7 @@ Depends: ant (>= 1.7.0),
kdelibs5-dev (>= 4:4.3.4),
libabw-dev (>= 0.1),
libarchive-zip-perl,
+ libavahi-client-dev,
libbluetooth-dev,
libboost-date-time-dev (>= 1.58),
libboost-dev (>= 1.58),
diff --git a/rules b/rules
index c29d435..9b09cfa 100755
--- a/rules
+++ b/rules
@@ -255,16 +255,7 @@ ifeq "$(USE_DBUS)" "y"
SYSTEM_STUFF += bluez
endif
endif
-#22:47 < siqi_> I think the best thing to do now is to disable avahi
completely since it doesn't work anyway..
-#[...]
-#22:56 <@_rene_> I don't care much about the dependency..
-#22:57 <@_rene_> but those two bugs are bad.
-#22:57 < siqi_> I know but I'm actually not sure about wether avahi was
working proprely for now
-#22:57 <@_rene_> ok
-#[...]
-#22:58 <@_rene_> so I disable it in all branches I have for now
-#22:58 < siqi_> I think it's safe to disable it for now
-ENABLE_AVAHI=n
+ENABLE_AVAHI=y
USE_GSTREAMER=y
USE_VLC=y
ENABLE_WEBDAV=y
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
