[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.1.0_beta1-2-5-g1dcdff2
The following commit has been merged in the debian-experimental-4.1 branch:
commit f6b7631ba095374bb8b365f67df2af8a67bb3703
Author: Rene Engelhard <rene@rene-engelhard.de>
Date: Sun Jun 2 15:49:12 2013 +0200
enable graphite2 on all archs now that it's fixed on armel/sparc
diff --git a/changelog b/changelog
index 78aee51..2f42403 100644
--- a/changelog
+++ b/changelog
@@ -9,6 +9,8 @@ libreoffice (1:4.1.0~beta2~git20130601-1) UNRELEASED; urgency=low
* debian/control.sdk.in:
- update Replaces: for gengal move to -dev (closes: #710767)
+ * debian/rules:
+ - enable graphite2 on all archs now that it's fixed on armel/sparc
-- Rene Engelhard <rene@debian.org> Sat, 01 Jun 2013 19:48:31 +0200
diff --git a/control b/control
index aac6090..40038d9 100644
--- a/control
+++ b/control
@@ -47,7 +47,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 07a7426..6c8c766 100755
--- a/rules
+++ b/rules
@@ -595,19 +595,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
Reply to: