[libreoffice] 142/152: Revert "no system epoxy"

[Rene Engelhard]

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

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit a44189a20f35ef3aa74082183c7bab400a2837b4
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Jan 24 16:28:31 2017 +0100

    Revert "no system epoxy"
    
    This reverts commit d06b1569d648c1cd148b538f6b41560b07a7422a.
---
 changelog | 2 +-
 rules     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 5f07ffb..61c6b99 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.3.0~rc2-2ubuntu1~zesty1) zesty; urgency=medium
+libreoffice (1:5.3.0~rc2-2ubuntu1~zesty2) zesty; urgency=medium
 
   * go full gtk3
   * remove remaining BUILD_DBG_PACKAGE parts
diff --git a/rules b/rules
index fa6374c..ddea0cb 100755
--- a/rules
+++ b/rules
@@ -706,7 +706,7 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
   # lp#1034560: MIR troubles make it easier to use internal jfreereport
   SYSTEM_STUFF := $(filter-out jfreereport npapi-headers, $(SYSTEM_STUFF))
   SYSTEM_STUFF := $(filter-out libzmf libstaroffice, $(SYSTEM_STUFF))
-  SYSTEM_STUFF := $(filter-out orcus lpsolve epoxy, $(SYSTEM_STUFF))
+  SYSTEM_STUFF := $(filter-out orcus lpsolve, $(SYSTEM_STUFF))
   ifeq ($(shell echo "$(DEB_VERSION)" | grep -c ppa),1)
     BUGS=mailto:libreoffice at lists.launchpad.net
   endif

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