The following commit has been merged in the master branch:
commit 20824c9fcf1aa2d06de53556803930ebf5613cde
Author: Rene Engelhard <[email protected]>
Date: Sun Jun 2 15:49:12 2013 +0200
enable graphite2 on all archs now that it's fixed on armel/sparc
Conflicts:
changelog
diff --git a/changelog b/changelog
index 60e6166..fbdd899 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,8 @@ libreoffice (1:4.0.3-4) UNRELEASED; urgency=low
* debian/control:
- regenerate; uses libservlet3.0-java instead of libservlet3.0-java now
+ * debian/rules:
+ - enable graphite2 on all archs now that it's fixed on armel/sparc
-- Rene Engelhard <[email protected]> Tue, 28 May 2013 20:43:19 +0200
diff --git a/control b/control
index 336ac31..84c06fb 100644
--- a/control
+++ b/control
@@ -46,7 +46,7 @@ Build-Depends: ant (>= 1.7.0),
libgl1-mesa-dev [!armel !mips !mipsel],
libglib2.0-dev (>= 2.15.0),
libglu1-mesa-dev [!armel !mips !mipsel],
- libgraphite2-dev (>= 0.9.3) [!armel !sparc],
+ libgraphite2-dev (>= 0.9.3),
libgstreamer-plugins-base1.0-dev,
libgstreamer1.0-dev,
libgtk-3-dev (>= 3.2~),
diff --git a/rules b/rules
index e483f08..d9dea0b 100755
--- a/rules
+++ b/rules
@@ -591,19 +591,9 @@ ifneq "$(ENABLE_MINIMIZER)" "y"
endif
BUILD_DEPS += , libpoppler-dev (>= 0.8.0), libpoppler-private-dev,
libpoppler-cpp-dev
-# fails their tests
-ifeq "$(DEB_HOST_ARCH)" "armel"
-ENABLE_GRAPHITE=n
-SYSTEM_STUFF := $(filter-out graphite, $(SYSTEM_STUFF))
-endif
-ifeq "$(DEB_HOST_ARCH)" "sparc"
-ENABLE_GRAPHITE=n
-SYSTEM_STUFF := $(filter-out graphite, $(SYSTEM_STUFF))
-endif
-
ifeq "$(ENABLE_GRAPHITE)" "y"
ifneq (,$(filter graphite, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libgraphite2-dev (>= 0.9.3) [!armel !sparc]
+ BUILD_DEPS += , libgraphite2-dev (>= 0.9.3)
endif
else
CONFIGURE_FLAGS += --disable-graphite
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
