[libreoffice] 05/07: the (ever non-working) ENABLE_TELEPATHY stuff is gone upstream

Rene Engelhard rene at moszumanska.debian.org
Thu Jun 15 17:10:40 UTC 2017


This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit 1f1d7ffdbbf522fc0c37ee6332f52ecdd5376eaf
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Jun 13 12:56:59 2017 +0200

    the (ever non-working) ENABLE_TELEPATHY stuff is gone upstream
---
 rules | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/rules b/rules
index 96b2d2f..ed88142 100755
--- a/rules
+++ b/rules
@@ -463,9 +463,6 @@ ifeq "$(DEB_VENDOR)" "Debian"
 BUILD_UNOWINREG_DLL=y
 endif
 FAKEROOT_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/libfakeroot
-# upstream says: "it's 'highly experimental'", I wouldn't enable it for
-# distros"
-ENABLE_TELEPATHY=n
 SYSTEM_STUFF += liblangtag
 SYSTEM_STUFF += orcus
 LIBORCUS_MINVER=0.12
@@ -1253,11 +1250,6 @@ ifneq (,$(filter openldap, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libldap2-dev
 endif
 
-ifeq ($(ENABLE_TELEPATHY),y)
-	BUILD_DEPS += , libtelepathy-glib-dev (>= 0.18)
-	CONFIGURE_FLAGS += --enable-telepathy
-endif
-
 ifneq (,$(filter liblangtag, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , liblangtag-dev (>= 0.4)
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git



More information about the Pkg-openoffice-commits mailing list