[SCM] LibreOffice packaging repository branch, debian-experimental-4.2, updated. libreoffice_4.1.0_beta1-2-14-gfd04f16
The following commit has been merged in the debian-experimental-4.2 branch:
commit fd04f16563d02fab459376152da9160c9c231ef8
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jun 5 18:47:34 2013 +0200
build-depend on fonts-liberation when running the tests
diff --git a/changelog b/changelog
index dc618e3..e664120 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,8 @@ libreoffice (1:4.2.0~alpha0~git20130604-1) UNRELEASED; urgency=low
* debian/rules:
- autodoc got deplaced by doxygen. bump doxygen build-dep to needed
(>= 1.8.4-1) and disable packaging the SDK docs on wheezy-backports.
+ - build-depend on fonts-liberation when running the tests - the
+ sc_macros_tests VBA tests need Arial etc.-similar fonts
-- Rene Engelhard <rene@debian.org> Sun, 02 Jun 2013 20:49:18 +0200
diff --git a/control b/control
index 5fffa65..af1630a 100644
--- a/control
+++ b/control
@@ -16,6 +16,7 @@ Build-Depends: ant (>= 1.7.0),
dpkg-dev (>= 1.16.1),
fastjar,
flex | flex-old,
+ fonts-liberation,
g++-mingw-w64-i686 [i386 amd64],
gcj-jdk [hppa],
gcj-native-helper [hppa],
@@ -4416,6 +4417,7 @@ Depends: ant (>= 1.7.0),
fastjar,
flex | flex-old,
fontforge,
+ fonts-liberation,
g++-mingw-w64-i686,
gcj-jdk,
gcj-native-helper,
diff --git a/rules b/rules
index 0ffb594..79fee58 100755
--- a/rules
+++ b/rules
@@ -733,6 +733,11 @@ ifneq (,$(filter cppunit, $(SYSTEM_STUFF)))
endif
ifeq "$(RUN_MAKE_CHECK)" "y"
BUILD_DEPS += , gdb
+ ifeq "$(WHEEZY_BACKPORT)" "y"
+ BUILD_DEPS += , ttf-liberation
+ else
+ BUILD_DEPS += , fonts-liberation
+ endif
ifeq "$(ENABLE_JUNIT4)" "y"
BUILD_DEPS += , junit4 $(JUNIT_MIN_VER)
else
--
LibreOffice packaging repository
Reply to: