[libreoffice] 02/06: bump build-dependency on icu to >= 52; problem was icu, not libc6
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.4
in repository libreoffice.
commit 4370793c3b5006c0e40a36444707fbdfea1f960f
Author: Rene Engelhard <rene@debian.org>
Date: Thu Nov 6 11:37:21 2014 +0100
bump build-dependency on icu to >= 52; problem was icu, not libc6
This reverts commit 0af472decd4508d58680dda29665ec28c74cbdfc.
Conflicts:
shlibs.override.libc
---
changelog | 4 +++-
control | 24 ++++++++++++------------
rules | 4 +++-
shlibs.override.libc | 4 +---
4 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/changelog b/changelog
index 5fc6389..93d98da 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,8 @@ libreoffice (1:4.4.0~beta1~git20141103-1) UNRELEASED; urgency=medium
- add conditional/includes/libs for system-opencollada
- use libmariadb-client-lgpl-dev instead of libmariadbclient-dev
when USE_MARIADB=y
+ - bump build-dependency on icu to >= 52 (see
+ https://bugs.freedesktop.org/show_bug.cgi?id=82229#c38)
* debian/shlibs.override.icu:
- update to actual cuurent SOVERSION...
@@ -58,7 +60,7 @@ libreoffice (1:4.3.3~rc2~git20141011-1) unstable; urgency=low
- go sure and make the package depend on libc6/libc6.1/libc0.1 >= 2.19,
see https://bugs.freedesktop.org/show_bug.cgi?id=82229
- -- Rene Engelhard <rene@debian.org> Sun, 12 Oct 2014 18:55:48 +0200
+ -- Rene Engelhard <rene@debian.org> Sat, 11 Oct 2014 15:36:58 +0200
libreoffice (1:4.3.2-2) unstable; urgency=medium
diff --git a/control b/control
index 8702dff..757c2ac 100644
--- a/control
+++ b/control
@@ -79,7 +79,7 @@ Build-Depends: ant (>= 1.7.0),
libhunspell-dev (>= 1.1.5-2),
libhyphen-dev (>= 2.4),
libice-dev,
- libicu-dev (>= 4.6),
+ libicu-dev (>= 52),
libjpeg-dev,
liblangtag-dev (>= 0.4),
liblcms2-dev,
@@ -188,7 +188,7 @@ XS-Python3-Version: 3.4
XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git -b debian-experimental-4.4
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
-Bugs:
+Bugs: mailto:debian-openoffice@lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@ -2157,23 +2157,23 @@ Description: office productivity suite -- Korean language package
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
-Package: libreoffice-l10n-kmr
+Package: libreoffice-l10n-
Section: localization
Architecture: all
Depends: libreoffice-common, locales | locales-all, ${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-kmr
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-
Provides: libreoffice-l10n-${help-l10n-virtual-version}
-Suggests: hunspell-dictionary-kmr | myspell-dictionary-kmr,
- hyphen-kmr,
- libreoffice-grammarcheck-kmr,
- libreoffice-help-kmr,
- mythes-kmr
-Description: office productivity suite -- Kurmanji language package
+Suggests: hunspell-dictionary- | myspell-dictionary-,
+ hyphen-,
+ libreoffice-grammarcheck-,
+ libreoffice-help-,
+ mythes-
+Description: office productivity suite -- language package
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the localization of LibreOffice in
- Kurmanji.
+ .
It contains the user interface, the templates and the autotext features.
(please note that not all this is available for all possible languages).
You can switch user interface language using the locales system.
@@ -4422,7 +4422,7 @@ Depends: ant (>= 1.7.0),
libhunspell-dev (>= 1.1.5-2),
libhyphen-dev (>= 2.4),
libice-dev,
- libicu-dev (>= 4.6),
+ libicu-dev (>= 52),
libjpeg-dev,
liblangtag-dev (>= 0.4),
liblcms2-dev,
diff --git a/rules b/rules
index 3aa7c70..5547efd 100755
--- a/rules
+++ b/rules
@@ -168,7 +168,7 @@ SYSTEM_STUFF += vigra
USE_EXTERNAL_CXXLIBS=y
SYSTEM_STUFF += mythes
SYSTEM_STUFF += icu
-ICU_MINVER= (>= 4.6)
+ICU_MINVER= (>= 52)
SYSTEM_STUFF += librevenge
SYSTEM_STUFF += libwpd libwpg libwps
SYSTEM_STUFF += libvisio
@@ -3139,7 +3139,9 @@ endif
mv $$TMP debian/uno-libs3/DEBIAN/symbols && \
chmod 644 debian/uno-libs3/DEBIAN/symbols
dh_installdeb -s
+ifeq "$(BUILD_KFREEBSD)" "y"
cat debian/shlibs.override.libc >> debian/shlibs.local
+endif
ifeq (,$(filter icu, $(SYSTEM_STUFF)))
cat debian/shlibs.override.icu >> debian/shlibs.local
endif
diff --git a/shlibs.override.libc b/shlibs.override.libc
index 2b5c421..0f04116 100644
--- a/shlibs.override.libc
+++ b/shlibs.override.libc
@@ -1,3 +1 @@
-libc 0.1 libc0.1 (>= 2.19)
-libc 6 libc6 (>= 2.19)
-libc 6.1 libc6.1 (>= 2.19)
+libc 0.1 libc0.1 (>= 2.10.2-7)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: