[libreoffice] 03/03: remove unowinreg.dll special-casing in sdk-examples test
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit 7f11ae508c58e8194fe088620f86133dac491999
Author: Rene Engelhard <rene@debian.org>
Date: Fri Apr 15 00:33:09 2016 +0200
remove unowinreg.dll special-casing in sdk-examples test
---
changelog | 2 ++
tests/control | 2 +-
tests/control.in | 2 +-
tests/sdk-examples | 9 +++------
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/changelog b/changelog
index 5f45bd6..65fc86d 100644
--- a/changelog
+++ b/changelog
@@ -13,6 +13,8 @@ libreoffice (1:5.2.0~alpha1~git20160411-1) UNRELEASED; urgency=medium
-dev-common. Move g++-mingw-w64-i686 to BUILD_DEPS_INDEP and only try to
(re)build unowinreg.dll in build-indep. Remove arch-qualifiers.
* debian/uno-libs3.symbols: update
+ * debian/tests/control.in, debian/tests/sdk-examples: remove unowinreg.dll
+ special-casing, we now have unowinreg.dll in a Arch: all. Depend on that.
-- Rene Engelhard <rene@debian.org> Thu, 26 Nov 2015 10:37:57 +0100
diff --git a/tests/control b/tests/control
index 90b6f46..c3cb809 100644
--- a/tests/control
+++ b/tests/control
@@ -5,4 +5,4 @@ Tests: pyuno-import
Depends: python3-uno
Tests: sdk-examples
-Depends: libreoffice-dev, libreoffice-dev-doc, libreoffice-java-common, build-essential, default-jdk
+Depends: libreoffice-dev, libreoffice-dev-doc, libreoffice-dev-common, libreoffice-java-common, build-essential, default-jdk
diff --git a/tests/control.in b/tests/control.in
index c79a2c8..2233c44 100644
--- a/tests/control.in
+++ b/tests/control.in
@@ -5,4 +5,4 @@ Tests: pyuno-import
Depends: python3-uno
Tests: sdk-examples
-Depends: libreoffice-dev, libreoffice-dev-doc, libreoffice-java-common, build-essential, default-jdk
+Depends: libreoffice-dev, libreoffice-dev-doc, libreoffice-dev-common, libreoffice-java-common, build-essential, default-jdk
diff --git a/tests/sdk-examples b/tests/sdk-examples
index d522caf..abae535 100755
--- a/tests/sdk-examples
+++ b/tests/sdk-examples
@@ -22,10 +22,7 @@ make
echo "====== Running countermain.run ======"
make countermain.run
-# This needs unowinreg.dll which is in -dev, but only for i386/amd64...
-if [ -e /usr/lib/libreoffice/sdk/classes/win/unowinreg.dll ]; then
- echo "====== Building Java DocumentHandling example ======"
- cd $SRCDIR/examples/java/DocumentHandling
- make
-fi
+echo "====== Building Java DocumentHandling example ======"
+cd $SRCDIR/examples/java/DocumentHandling
+make
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: