[libreoffice] 74/152: dont use system mdds, orcus on yakkety forward ports

[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 984149ae29c6d5718532247e664b4e94431a6512
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon May 23 14:10:27 2016 +0200

    dont use system mdds, orcus on yakkety forward ports
---
 changelog | 6 ++++++
 rules     | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/changelog b/changelog
index 58eae9d..e527ba5 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.1.3-0ubuntu4) yakkety; urgency=medium
+
+  * use internal copy of mdds and orcus on yakkety for 5.1 series now
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Tue, 24 May 2016 14:25:58 +0200
+
 libreoffice (1:5.1.3-0ubuntu3) yakkety; urgency=medium
 
   * Fix libpng build dependency.
diff --git a/rules b/rules
index 36c7619..2bcab7a 100755
--- a/rules
+++ b/rules
@@ -764,6 +764,9 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
       SYSTEM_GCJ_VERSION = 5
     endif
   endif
+  ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "yakkety"
+    SYSTEM_STUFF := $(filter-out mdds orcus,$(SYSTEM_STUFF))
+  endif
 endif
 
 CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))

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