[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3-1-105-g540a6fc
The following commit has been merged in the debian-experimental-4.1 branch:
commit 089ccd74401ec2789b05188ab00ab1d44175b0fd
Author: Rene Engelhard <rene@debian.org>
Date: Mon May 6 21:07:07 2013 +0200
update post-alpha1; harfbuzz is default now
diff --git a/changelog b/changelog
index 70a3999..9f34dc7 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~alpha1-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~beta1~git20130506-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/control b/control
index c7c72b2..7918c52 100644
--- a/control
+++ b/control
@@ -50,6 +50,7 @@ Build-Depends: ant (>= 1.7.0),
libgstreamer1.0-dev,
libgtk-3-dev (>= 3.2~),
libgtk2.0-dev (>= 2.10),
+ libharfbuzz-dev,
libhsqldb1.8.0-java (>> 1.8.0.10),
libhunspell-dev (>= 1.1.5-2),
libhyphen-dev (>= 2.4),
@@ -1317,6 +1318,7 @@ Depends: ant (>= 1.7.0),
libgstreamer1.0-dev,
libgtk-3-dev (>= 3.2~),
libgtk2.0-dev (>= 2.10),
+ libharfbuzz-dev,
libhsqldb1.8.0-java (>> 1.8.0.10),
libhunspell-dev (>= 1.1.5-2),
libhyphen-dev (>= 2.4),
diff --git a/rules b/rules
index 135feb9..0b22ef5 100755
--- a/rules
+++ b/rules
@@ -319,9 +319,6 @@ endif
PACKAGE_BASE=y
ENABLE_GRAPHITE=y
SYSTEM_STUFF += graphite
-# not complete yet and needs a export SAL_USE_HARFBUZZ to be enabled
-# anyway
-ENABLE_HARFBUZZ=n
SYSTEM_STUFF += harfbuzz
ALLOC=system
SYSTEM_STUFF += libexttextcat
@@ -602,15 +599,10 @@ else
CONFIGURE_FLAGS += --disable-graphite
endif
-ifeq "$(ENABLE_HARFBUZZ)" "y"
- ifneq (,$(filter harfbuzz, $(SYSTEM_STUFF)))
+ifneq (,$(filter harfbuzz, $(SYSTEM_STUFF)))
BUILD_DEPS += , libharfbuzz-dev
- endif
-else
- CONFIGURE_FLAGS += --disable-harfbuzz
endif
-
ifneq (,$(filter libexttextcat, $(SYSTEM_STUFF)))
BUILD_DEPS += , libexttextcat-dev (>= 3.1.1)
TEXTCAT_DATA_RECOMMENDS := libexttextcat-data
--
LibreOffice packaging repository
Reply to: