The following commit has been merged in the debian-experimental-4.1 branch:
commit eef35d1c987dc7c39699c4bf7dcd91e1b1d2975f
Author: Rene Engelhard <r...@debian.org>
Date: Tue May 28 01:59:04 2013 +0200
use system-harfbuzz again
diff --git a/changelog b/changelog
index d0d0c08..4f9ce7b 100644
--- a/changelog
+++ b/changelog
@@ -4,8 +4,6 @@ libreoffice (1:4.1.0~beta1-2) UNRELEASED; urgency=low
it on gjdoc builds, they miss files we expect.
* debian/rules:
- - use internal harfbuzz until we get a harfbuzz with ICU support again;
- add build-conflicts on libharfbuzz-dev (= 0.9.17-3) (closes: #709973)
- use OpenJDK 7 on everything including kfreebsd-* - except on
mips(el). Stay with 6 there.
diff --git a/control b/control
index 53ef466..a6f611c 100644
--- a/control
+++ b/control
@@ -52,6 +52,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),
@@ -4458,6 +4459,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 a8d52f8..c9b1b41 100755
--- a/rules
+++ b/rules
@@ -325,7 +325,7 @@ endif
PACKAGE_BASE=y
ENABLE_GRAPHITE=y
SYSTEM_STUFF += graphite
-#SYSTEM_STUFF += harfbuzz
+SYSTEM_STUFF += harfbuzz
ALLOC=system
SYSTEM_STUFF += libexttextcat
SYSTEM_STUFF += cppunit
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1uh7z0-0000pt...@vasks.debian.org
