[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.3-3-11-g1f046fc
The following commit has been merged in the master branch:
commit 905af8acd7b6ca4253c5cdd3a0ee1b514c258973
Author: Rene Engelhard <rene@rene-engelhard.de>
Date: Sat Jun 15 13:18:58 2013 +0200
temporarily force gcc-4.6(!) (instead of build-conflicting against gcc (>< 4:4.7~) on all archs except *i386/*amd64
diff --git a/changelog b/changelog
index 28bf9bf..6d19957 100644
--- a/changelog
+++ b/changelog
@@ -5,8 +5,11 @@ libreoffice (1:4.0.3-4) UNRELEASED; urgency=low
* debian/rules:
- enable graphite2 on all archs now that it's fixed on armel/sparc
- fix -dbg suggests: s/python/$(PYTHON)/. to suggest python3.3-dbg
+ - temporarily force gcc-4.6(!) (instead of build-conflicting
+ against gcc (>< 4:4.7~) on all archs except *i386/*amd64 until
+ all bridges are ported to the new gcc 4.7+ behaviour
- -- Rene Engelhard <rene@debian.org> Tue, 11 Jun 2013 00:17:34 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 13 Jun 2013 21:19:31 +0200
libreoffice (1:4.0.3-3) unstable; urgency=low
diff --git a/control b/control
index 84c06fb..3d6d8b4 100644
--- a/control
+++ b/control
@@ -16,7 +16,9 @@ Build-Depends: ant (>= 1.7.0),
dpkg-dev (>= 1.16.1),
fastjar,
flex | flex-old,
+ g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
g++-mingw-w64-i686 [i386 amd64],
+ gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebas-amd64],
gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64],
gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386],
gdb,
@@ -145,7 +147,6 @@ Build-Conflicts: ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
g++-4.6 (= 4.6.1-10),
g++-4.6 (= 4.6.1-11),
g++-4.7 (<< 4.7.1-3),
- gcc (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
gcj-4.2 (= 4.2.2-6),
gjdoc (= 0.7.8-2),
graphicsmagick-imagemagick-compat (<< 1.3.9~),
@@ -164,7 +165,7 @@ XS-Python3-Version: 3.3
XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
-Bugs:
+Bugs: mailto:debian-openoffice@lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@ -4428,7 +4429,9 @@ Depends: ant (>= 1.7.0),
fastjar,
flex | flex-old,
fontforge,
+ g++-4.6,
g++-mingw-w64-i686,
+ gcc-4.6,
gcj-jdk,
gcj-native-helper,
gdb,
diff --git a/control.in b/control.in
index 62a68e3..c19afaf 100644
--- a/control.in
+++ b/control.in
@@ -13,7 +13,6 @@ Build-Conflicts: ant (= 1.8.0-1) [%OOO_GCJ_JDK_ARCHS%],
g++-4.6 (= 4.6.1-10),
g++-4.6 (= 4.6.1-11),
g++-4.7 (<< 4.7.1-3),
- gcc (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
gcj-4.2 (= 4.2.2-6),
gjdoc (= 0.7.8-2),
graphicsmagick-imagemagick-compat (<< 1.3.9~),
diff --git a/rules b/rules
index 241290f..f48b32f 100755
--- a/rules
+++ b/rules
@@ -173,7 +173,7 @@ else
BOOST_VERSION=1.53
endif
ifeq "$(BOOST_VERSION)" "default"
- ifeq "$(SYSTEM_GCC_VERSION)" "4.8"
+ ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 4.8 && echo true)" "true"
BOOST_MINVER= (>= 1.53)
else
BOOST_MINVER= (>= 1.38)
@@ -201,7 +201,7 @@ CAIRO_FONTS_PATCH=y
BUILD_KDE=y
# not ported to KDE 4
ENABLE_KDEAB=n
-ifeq "$(SYSTEM_GCC_VERSION)" "4.7"
+ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 4.7 && echo true)" "true"
# < 4.8 fails with gcc 4.7, see #667911
QT_MINVER= (>= 4:4.8)
else
@@ -555,6 +555,14 @@ CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
CC_PREFIX:=$(shell gcc -dumpmachine)-
+ BUILD_DEPS += , gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebas-amd64] ,g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64]
+ifeq (,$(findstring i386,$(DEB_HOST_ARCH)))
+ ifeq (,$(findstring amd64,$(DEB_HOST_ARCH)))
+ ifneq "$(SYSTEM_GCC_VERSION)" "4.6"
+ GCC_VERSION := 4.6
+ endif
+ endif
+endif
ifneq "$(GCC_VERSION)" ""
ifneq "$(SYSTEM_GCC_VERSION)" "$(GCC_VERSION)"
BUILD_DEPS += , gcc-$(GCC_VERSION), g++-$(GCC_VERSION)
--
LibreOffice packaging repository
Reply to: