[libreoffice] 01/02: bump libxml2-dev B-D to >= 2.8 as that's what xmlsec needs nowadays
Rene Engelhard
rene at moszumanska.debian.org
Sat May 20 12:40:52 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.
commit 34f6a4f7452a3e503d9c972917ec43d1378ecc6a
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Sat May 20 14:35:41 2017 +0200
bump libxml2-dev B-D to >= 2.8 as that's what xmlsec needs nowadays
---
control | 58 +++++++++++++++++++++++++++++-----------------------------
rules | 2 +-
tests/control | 2 +-
3 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/control b/control
index 72f4818..0099717 100644
--- a/control
+++ b/control
@@ -130,7 +130,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
libxext-dev,
libxinerama-dev,
libxkbfile-dev,
- libxml2-dev,
+ libxml2-dev (>= 2.8),
libxml2-utils,
libxrandr-dev,
libxrender-dev,
@@ -190,7 +190,7 @@ Build-Conflicts: amd-libopencl1,
Standards-Version: 3.9.4
Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.3
Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
-Bugs:
+Bugs: mailto:debian-openoffice at lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@ -970,24 +970,24 @@ Description: office productivity suite -- Afrikaans language package
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
-Package: libreoffice-l10n-am
+Package: libreoffice-l10n-
Section: localization
Architecture: all
Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-common, locales | locales-all, ${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-am
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-am | myspell-dictionary-am,
- hyphen-am,
- libreoffice-grammarcheck-am,
- libreoffice-help-am,
- mythes-am
-Description: office productivity suite -- Amharic 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
- Amharic.
+ .
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.
@@ -1847,24 +1847,24 @@ Description: office productivity suite -- Gujarati language package
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
-Package: libreoffice-l10n-gug
+Package: libreoffice-l10n-
Section: localization
Architecture: all
Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-common, locales | locales-all, ${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-gug
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-gug | myspell-dictionary-gug,
- hyphen-gug,
- libreoffice-grammarcheck-gug,
- libreoffice-help-gug,
- mythes-gug
-Description: office productivity suite -- Guarani 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
- Guarani.
+ .
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.
@@ -2241,24 +2241,24 @@ 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
Pre-Depends: ${misc:Pre-Depends}
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.
diff --git a/rules b/rules
index 3ec89da..c249207 100755
--- a/rules
+++ b/rules
@@ -839,7 +839,7 @@ ifneq (,$(filter jpeg, $(SYSTEM_STUFF)))
BUILD_DEPS += , libjpeg-dev
endif
ifneq (,$(filter libxml, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libxml2-dev, libxml2-utils
+ BUILD_DEPS += , libxml2-dev (>= 2.8), libxml2-utils
BUILD_DEPS += , libxslt1-dev
else
CONFIGURE_FLAGS += --without-system-libxml
diff --git a/tests/control b/tests/control
index f2223c6..bd89282 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.1.0) , opencollada-dev (>= 0.1.0~2014070 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.1.0) , opencollada-dev (>= 0.1.0~2014070 [...]
Tests: pyuno-import
Depends: python3-uno
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list