[libreoffice] 01/01: gccs default is 7 now, use it also on m68k now (and update build-depends)

[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 d62aa9cdb732dea04d53b878485cffb460b605ae
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Aug 5 12:48:54 2017 +0200

    gccs default is 7 now, use it also on m68k now (and update build-depends)
---
 control | 6 +++---
 rules   | 7 +------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/control b/control
index 12bc37f..a527fb4 100644
--- a/control
+++ b/control
@@ -29,8 +29,8 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                fonts-crosextra-carlito [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                fonts-dejavu [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                fonts-liberation [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
-               g++-7 (>= 7-20170106) [m68k],
-               gcc-7 (>= 7-20170106) [m68k],
+               g++ (>= 4:7),
+               gcc (>= 4:7),
                gdb [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                gettext,
                ghostscript [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
@@ -196,7 +196,7 @@ Build-Conflicts: amd-libopencl1,
 Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
 Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
-Bugs: 
+Bugs: mailto:debian-openoffice at lists.debian.org
 Homepage: http://www.libreoffice.org
 
 Package: libreoffice
diff --git a/rules b/rules
index 13fc428..158ed2b 100755
--- a/rules
+++ b/rules
@@ -769,9 +769,6 @@ ifneq "$(USE_CLANG)" "y"
 #      endif
 #    endif
 #  endif
-  ifeq "$(DEB_HOST_ARCH)" "m68k"
-  GCC_VERSION := 7
-  endif
   ifneq "$(GCC_VERSION)" ""
   ifneq "$(SYSTEM_GCC_VERSION)" "$(GCC_VERSION)"
     BUILD_DEPS += , gcc-$(GCC_VERSION), g++-$(GCC_VERSION)
@@ -780,9 +777,7 @@ ifneq "$(USE_CLANG)" "y"
       CXX=$(CC_PREFIX)g++-$(GCC_VERSION)
     endif
   endif
-  ifneq "$(SYSTEM_GCC_VERSION)" "7"
-  BUILD_DEPS += , gcc-7 (>= 7-20170106) [m68k], g++-7 (>= 7-20170106) [m68k]
-  endif
+	BUILD_DEPS += , gcc (>= 4:7), g++ (>= 4:7)
 else
   ifeq "$(CLANG_VERSION)" "default"
 	CLANG=clang

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