[libreoffice] 01/02: enable system-xmlsec

[Rene Engelhard]

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 58a44bf050afbf3252fe7f416f6fb55ab70dbec7
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sun Jun 25 20:04:06 2017 +0200

    enable system-xmlsec
---
 changelog     | 3 +--
 control       | 1 +
 rules         | 2 +-
 tests/control | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/changelog b/changelog
index 8831eca..32a8b72 100644
--- a/changelog
+++ b/changelog
@@ -7,8 +7,7 @@ libreoffice (1:5.4.0~rc1-1) experimental; urgency=medium
     of autopgktest running uitest 
 
   * debian/rules, debian/patches/system-xmlsec.diff: backport patch from
-    master and add conditional for system-xmlsec. yay. not enabled yet given
-    it needs >= 1.2.24 which is not yet in Debian.
+    master and add conditional for system-xmlsec. use it.
 
   * debian/rules, debian/control.lokit.in:
     - move /usr/share/gir-1.0/LOKDocView-0.1.gir to libreofficekit-dev and
diff --git a/control b/control
index d046f05..3f2a4c7 100644
--- a/control
+++ b/control
@@ -133,6 +133,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libxkbfile-dev,
                libxml2-dev (>= 2.8),
                libxml2-utils,
+               libxmlsec1-dev (>= 1.2.24),
                libxrandr-dev,
                libxrender-dev,
                libxslt1-dev,
diff --git a/rules b/rules
index 5a4127d..38a96fa 100755
--- a/rules
+++ b/rules
@@ -195,7 +195,7 @@ KDELIBS_MINVER= (>= 4:4.3.4)
 ifneq (noddebs,$(findstring noddebs,$(DEB_BUILD_OPTIONS)))
 BUILD_DBGSYM_PACKAGES=y
 endif
-#SYSTEM_STUFF += xmlsec
+SYSTEM_STUFF += xmlsec
 
 # this changes the packages' built/contents of packages (-subsequentcheckbase)
 # This is not exactly allowed in policy but it doesn't have real practical difference,
diff --git a/tests/control b/tests/control
index 00242d7..3bf857c 100644
--- a/tests/control
+++ b/tests/control
@@ -1,11 +1,11 @@
 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
 
 Tests: uicheck
-Depends: libreoffice, python3, python3-uno, locales, 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~20140703.ddf8f47+dfsg1-2) , libpcr [...]
+Depends: libreoffice, python3, python3-uno, locales, 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~20140703.ddf8f47+dfsg1-2) , libpcr [...]
 Restrictions: build-needed
 
 Tests: sdk-examples

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git