[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.1.0_beta1-1-3-gaa8e17d
The following commit has been merged in the debian-experimental-4.1 branch:
commit 42be89b9072b45958c0d1585f1039e2cc6825e4e
Author: Rene Engelhard <rene@debian.org>
Date: Mon May 27 08:55:10 2013 +0200
use internal harfbuzz until we get a harfbuzz with ICU support again; add build-conflicts on libharfbuzz-dev (= 0.9.17-3)
diff --git a/changelog b/changelog
index bb72f0a..acad449 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:4.1.0~beta1-2) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - use internal harfbuzz until we get a harfbuzz with ICU support again;
+ add build-conflicts on libharfbuzz-dev (= 0.9.17-3)
+
+ -- Rene Engelhard <rene@debian.org> Mon, 27 May 2013 08:53:57 +0200
+
libreoffice (1:4.1.0~beta1-1) experimental; urgency=low
* new upstream beta release
diff --git a/control b/control
index b97a2ef..fb83bbb 100644
--- a/control
+++ b/control
@@ -52,7 +52,6 @@ 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),
@@ -138,7 +137,7 @@ Build-Depends-Indep: bsh (>= 2.0b4),
librepository-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
libsac-java [!hppa !kfreebsd-amd64 !kfreebsd-i386],
libserializer-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
- libservlet2.5-java,
+ libservlet3.0-java,
libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
xml-core
Build-Conflicts: ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
@@ -169,7 +168,7 @@ XS-Python3-Version: 3.3
XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
-Bugs: mailto:debian-openoffice@lists.debian.org
+Bugs:
Homepage: http://www.libreoffice.org
Package: libreoffice
@@ -4459,7 +4458,6 @@ 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),
@@ -4496,7 +4494,7 @@ Depends: ant (>= 1.7.0),
libsac-java,
libsane-dev,
libserializer-java (>= 1.1.6),
- libservlet2.5-java,
+ libservlet3.0-java,
libsm-dev,
libssl-dev,
libsuitesparse-dev (>= 1:3.4.0),
diff --git a/rules b/rules
index 3835c3e..f94e626 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
@@ -1600,6 +1600,12 @@ ifeq "$(WHEEZY_BACKPORT)" "y"
endif
endif
+ifeq "$(WHEEZY_BACKPORT)" "y"
+ ifneq (,$(filter harfbuzz, $(SYSTEM_STUFF)))
+ perl -pi -e "s/(Build-Conflicts: .*)/\1,libharfbuzz-dev (= 0.9.17-3),/" debian/control
+ endif
+endif
+
ifneq "$(USE_MARIADB)" "y"
perl -pi -e "s/(Build-Conflicts: .*)/\1,libmariadbclient-dev,/" debian/control
endif
--
LibreOffice packaging repository
Reply to: