[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.4-1-5-g9a9c519
The following commit has been merged in the master branch:
commit 983d8f806f97169d9d2681c40a0404e7707603eb
Author: Rene Engelhard <rene@rene-engelhard.de>
Date: Wed Jun 19 19:58:13 2013 +0200
build-depend on libc6 (>= 2.17-6) additionally to the binutils
diff --git a/changelog b/changelog
index 7f0b9ef..f0c2614 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,7 @@ libreoffice (1:4.0.4-2) UNRELEASED; urgency=low
* debian/rules:
- fix JAVA_MAINVER setting to actually set 6 for mips(el) and not
for ia64.
+ - build-depend on libc6 (>= 2.17-6) additionally to the binutils
-- Rene Engelhard <rene@debian.org> Wed, 19 Jun 2013 19:51:56 +0200
diff --git a/control b/control
index 0e81e6d..6132f53 100644
--- a/control
+++ b/control
@@ -33,6 +33,7 @@ Build-Depends: ant (>= 1.7.0),
libboost-date-time1.53-dev,
libboost1.53-dev,
libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
+ libc6 (>= 2.17-6) [mips mipsel],
libcairo2-dev,
libcdr-dev,
libcmis-dev (>= 0.3.1),
diff --git a/rules b/rules
index 2d87776..414bc6c 100755
--- a/rules
+++ b/rules
@@ -520,7 +520,7 @@ $(eval $(call gen_no_archs,OOO_NSPLUGIN_ARCHS))
ifneq "$(WHEEZY_BACKPORT)" "y"
ifneq (,$(findstring mips, $(OOO_ARCHS)))
-BUILD_DEPS += , binutils (>= 2.23) [mips mipsel]
+BUILD_DEPS += , binutils (>= 2.23) [mips mipsel], libc6 (>= 2.17-6) [mips mipsel]
endif
endif
@@ -1547,9 +1547,9 @@ endif
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 libc0.1 and ia64, which is ugly,
+ # 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 ia64|sed -e 's/\[[^]]*\]//g'))#g" debian/control
+ 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
endif
ifeq "$(BUILD_KDE)" "y"
perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome | libreoffice-kde/' debian/control
--
LibreOffice packaging repository
Reply to: