[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3-2-137-gddf6e1a
The following commit has been merged in the debian-experimental-4.1 branch:
commit ddf6e1aa663f41b766f6a3e3b331f387c2337b3d
Author: Rene Engelhard <rene@debian.org>
Date: Mon May 20 22:54:55 2013 +0200
enable the tightended binutils build-dep
diff --git a/changelog b/changelog
index 112592e..8aa8234 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,8 @@ libreoffice (1:4.1.0~beta1~git20130520-1) UNRELEASED; urgency=low
- add new conditionals: libmwaw, libodfgen, harfbuzz, mariadb
(use MySQL instead of MariaDB, though as long as we need mysqlcppconn anyway)
- build with explicit --enable-python=system
+ - enable the tightended binutils build-dep, we're in experimental anyway and
+ need harfbuzz (only in experimental), too
* debian/uno-libs3.symbols: update
-- Rene Engelhard <rene@debian.org> Sat, 22 Dec 2012 18:03:18 +0100
diff --git a/control b/control
index 409ca05..421df67 100644
--- a/control
+++ b/control
@@ -8,6 +8,7 @@ Build-Depends: ant (>= 1.7.0),
autoconf,
automake,
bc,
+ binutils (>= 2.32) [mips mipsel},
bison,
bzip2,
cpp-4.7,
@@ -1272,6 +1273,7 @@ Depends: ant (>= 1.7.0),
autoconf,
automake,
bc,
+ binutils (>= 2.32) [mips mipsel},
bison,
bsh (>= 2.0b4),
bzip2,
diff --git a/rules b/rules
index ebd9270..3e75c15 100755
--- a/rules
+++ b/rules
@@ -536,11 +536,11 @@ $(eval $(call gen_no_archs,OOO_NSPLUGIN_ARCHS))
# see uno-executables-link-to-xmlreader.diff. That workaround is not needed
# with said binutils. Thanks Aurelien Jarno for the hint.
-#ifneq "$(WHEEZY_BACKPORT)" "y"
-# ifneq (,$(findstring mips, $(OOO_ARCHS)))
-#BUILD_DEPS += , binutils (>= 2.32) [mips mipsel}
-# endif
-#endif
+ifneq "$(WHEEZY_BACKPORT)" "y"
+ ifneq (,$(findstring mips, $(OOO_ARCHS)))
+BUILD_DEPS += , binutils (>= 2.32) [mips mipsel}
+ endif
+endif
#############
# Distro-specific overrides
--
LibreOffice packaging repository
Reply to: