[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.4-2-3-g6b28dfb

["Rene Engelhard" <rene@rene-engelhard.de>]

The following commit has been merged in the master branch:
commit 6b28dfb31df420b141b67dd265eba6481c8545e6
Author: Rene Engelhard <rene@rene-engelhard.de>
Date:   Sat Jul 6 14:27:08 2013 +0200

    also filter out binutils for -subsequentcheckbase

diff --git a/changelog b/changelog
index 7880f7e..1febc6e 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:4.0.4-3) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - also filter out binutils so that the mips(el)-only build-dep doesn't
+      end up in -subsequentbases depends for everything
+
+ -- Rene Engelhard <rene@debian.org>  Wed, 19 Jun 2013 20:57:09 +0200
+
 libreoffice (1:4.0.4-2) unstable; urgency=low
 
   * brown paper bag release
diff --git a/control b/control
index efd1661..dcedf42 100644
--- a/control
+++ b/control
@@ -4450,7 +4450,6 @@ Depends: ant (>= 1.7.0),
          autoconf,
          automake,
          bc,
-         binutils (>= 2.23),
          bison,
          bsh (>= 2.0b4),
          bzip2,
diff --git a/rules b/rules
index 6c99439..38f7fa4 100755
--- a/rules
+++ b/rules
@@ -1545,8 +1545,9 @@ ifeq "$(BUILD_TEST_PACKAGE)" "y"
 	# we want the build deps as dep on subsequentcheckbase, but strip the arch
 	# specifics as we are arch-all
 	# for now we filter out the arch-specific libc* and ia64, which is ugly,
-	# but better than manual bookkeeping
-	perl -pi -e "s#%BUILD_DEPS_ARCH_ALL%#$(strip $(shell echo '$(BUILD_DEPS), $(BUILD_DEPS_INDEP)'|sed -e 's/,/,\n /g'|grep -v libc0.1| grep -v libc6| grep -v ia64|sed -e 's/\[[^]]*\]//g'))#g" debian/control
+	# but better than manual bookkeeping. Also filter out the mips(el)-only
+	# binutils build-dep...
+	perl -pi -e "s#%BUILD_DEPS_ARCH_ALL%#$(strip $(shell echo '$(BUILD_DEPS), $(BUILD_DEPS_INDEP)'|sed -e 's/,/,\n /g'|grep -v libc0.1| grep -v libc6| grep -v ia64|grep -v binutils|sed -e 's/\[[^]]*\]//g'))#g" debian/control
 endif
 ifeq "$(BUILD_KDE)" "y"
 	perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome | libreoffice-kde/' debian/control

-- 
LibreOffice packaging repository