[libreoffice] 04/04: make (>= 3.81-8.2) is available everywhere even in wheezy

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit 75a8ffb60c16a078e17417be8edbba42e9c60996
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Sun Aug 6 22:47:59 2017 +0200

    make (>= 3.81-8.2) is available everywhere even in wheezy
---
 control | 1 -
 rules   | 2 --
 2 files changed, 3 deletions(-)

diff --git a/control b/control
index d08ff0c..9e3e555 100644
--- a/control
+++ b/control
@@ -145,7 +145,6 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libzmf-dev,
                locales [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                lp-solve (>= 5.5.0.13-5+b1),
-               make (>= 3.81-8.2),
                maven-repo-helper,
                opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) [amd64 i386],
                pkg-config,
diff --git a/rules b/rules
index 5cd5635..caa86ce 100755
--- a/rules
+++ b/rules
@@ -1552,8 +1552,6 @@ endif
 NUM_CPUS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n 's/^\(.* \)\?parallel=\([0-9]\+\).*$$/\2/p')
 AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
 ifeq "$(PARALLEL_BUILD)" "y"
-	# http://bugs.debian.org/622644
-	BUILD_DEPS += , make (>= 3.81-8.2)
   # we need to specify it only if it differs, otherwise configure autodetects
   # it.
   ifneq "$(NUM_CPUS)" "$(AVAIL_CPUS)"

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