[libreoffice] 80/152: dont use system orcus for now, prerelease dont build against -proposed

[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 f9484eaae6578856b3b242e172e654c51ff4161a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Jun 4 02:06:25 2016 +0200

    dont use system orcus for now, prerelease dont build against -proposed
---
 rules | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/rules b/rules
index 9024982..2a981d1 100755
--- a/rules
+++ b/rules
@@ -743,7 +743,7 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
   USE_VLC:=n
   #temp. hacks
   ENABLE_EVO2:=n
-  #SYSTEM_STUFF := $(filter-out orcus, $(SYSTEM_STUFF))
+  SYSTEM_STUFF := $(filter-out orcus, $(SYSTEM_STUFF))
 
   ENABLE_COLLADA := n
   ENABLE_GLTF := n
@@ -760,9 +760,6 @@ 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
 ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
 UNO_LIBS_DBG=uno-libs3-dbgsym

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