[libreoffice] 01/01: ENABLE_AVAHI=n
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 1f79a4697dab148c21d5f7d12110e1fa0f339edf
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jul 19 21:40:02 2014 +0200
ENABLE_AVAHI=n
---
changelog | 3 ++-
control | 2 --
rules | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/changelog b/changelog
index 2d1d870..ef8ba46 100644
--- a/changelog
+++ b/changelog
@@ -10,10 +10,11 @@ libreoffice (1:4.2.5-2) UNRELEASED; urgency=low
- don't uselessly rebuild sdext - it's not a extension anymore and thus in
"proper" langpacks
- s/iceweasel-dev/npapi-sdk-dev/. Re-enable system-npapi-headers
+ - ENABLE_AVAHI=n (closes: #749770, #755309)
* debian/control.debug.in: suggest python-six (used by the gdb helpers)
* debian/control.in, debian/rules: specify -b in Vcs-Git:
- -- Rene Engelhard <rene@debian.org> Sun, 22 Jun 2014 11:31:48 +0200
+ -- Rene Engelhard <rene@debian.org> Sat, 19 Jul 2014 20:46:41 +0200
libreoffice (1:4.2.5-1) unstable; urgency=medium
diff --git a/control b/control
index 789a294..33195dd 100644
--- a/control
+++ b/control
@@ -34,7 +34,6 @@ Build-Depends: ant (>= 1.7.0),
kdelibs5-dev (>= 4:4.3.4),
libabw-dev,
libarchive-zip-perl,
- libavahi-client-dev,
libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386],
libboost-date-time-dev (>= 1.49.0-4),
libboost-dev (>= 1.49.0-4),
@@ -4481,7 +4480,6 @@ Depends: ant (>= 1.7.0),
kdelibs5-dev (>= 4:4.3.4),
libabw-dev,
libarchive-zip-perl,
- libavahi-client-dev,
libbluetooth-dev,
libboost-date-time-dev (>= 1.49.0-4),
libboost-dev (>= 1.49.0-4),
diff --git a/rules b/rules
index 5be13dc..de7ad62 100755
--- a/rules
+++ b/rules
@@ -261,7 +261,7 @@ ifeq "$(USE_DBUS)" "y"
SYSTEM_STUFF += bluez
endif
endif
-ENABLE_AVAHI=y
+ENABLE_AVAHI=n
USE_GSTREAMER=y
ifneq "$(WHEEZY_BACKPORT)" "y"
GSTREAMER_VERSION=1.0
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: