This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 0ba5548a3c64bd9900f5579a8279f17829f465f2
Author: Rene Engelhard <r...@debian.org>
Date: Mon Mar 7 23:33:15 2016 +0100
clean up test dependencies
---
changelog | 10 ++-
control | 143 +----------------------------------------
control.subsequentcheckbase.in | 2 +-
rules | 25 ++++---
tests/control | 2 +-
tests/control.in | 5 ++
6 files changed, 32 insertions(+), 155 deletions(-)
diff --git a/changelog b/changelog
index b992077..da012ec 100644
--- a/changelog
+++ b/changelog
@@ -5,8 +5,14 @@ libreoffice (1:5.1.1~rc3-2) unstable; urgency=medium
* debian/rules:
- unset DISPLAY before running make check; some test(s) might fail
otherwise
- * debian/rules, debian/test/*: stop adding -dbgsym to the test Depends:,
- ci.debian.net doesn't have the debug archive in sources.list -> fail
+ * debian/rules, debian/test/*:
+ - stop adding -dbgsym to the test Depends:,
+ ci.debian.net doesn't have the debug archive in sources.list -> fail
+ - clean up: don't add %BUILD_DEPS_ARCH_ALL% to -subsequentcheckbases
+ Depends: as it doesn't really need it; the tests do, add in in
+ tests/control. Only depend on junit, ure, java-common in
+ -subsequentcheckbase. Add libreoffice{,-sdbc-hsqldb} dependencies in
+ tests/control.in
* merge from Ubuntu:
- update autopkgtest runner patch, removing unhelpful build system deps for
out-of-tree integration testing
diff --git a/control b/control
index ea756b5..c06710c 100644
--- a/control
+++ b/control
@@ -4363,148 +4363,7 @@ Package: libreoffice-subsequentcheckbase
Section: libs
Priority: extra
Architecture: all
-Depends: ant (>= 1.7.0),
- ant-optional (>= 1.7.0),
- autoconf,
- automake,
- bc,
- bison,
- build-essential,
- bzip2,
- chromium (>= 39.0.2171.71-1),
- coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2),
- coinor-libcoinutils-dev (>= 2.9.15-3.1),
- debhelper (>= 9.20160115),
- default-jdk,
- default-jdk (>= 2:1.7-52.1),
- dh-python,
- doxygen (>= 1.8.4),
- dpkg-dev (>= 1.18.2~),
- fastjar,
- firebird-dev (>= 2.5.2.26540.ds4-2),
- flex (>= 2.3.35),
- fontconfig,
- fonts-crosextra-carlito,
- fonts-liberation,
- g++-mingw-w64-i686,
- gdb,
- gettext,
- gobject-introspection (>= 1.32.0),
- gperf,
- java-common (>= 0.49),
- javahelper (>= 0.37~),
- junit4 (>= 4.8.2-2),
- kdelibs5-dev (>= 4:4.3.4),
- libabw-dev (>= 0.1),
- libarchive-zip-perl,
- libavahi-client-dev,
- libbluetooth-dev,
- libboost-date-time-dev (>= 1.58),
- libboost-dev (>= 1.58),
- libboost-iostreams-dev (>= 1.58),
- libboost-system-dev (>= 1.58),
- libbsh-java,
- libcairo2-dev,
- libcdr-dev (>= 0.1),
- libclucene-dev (>= 2.3.3.4-4.1),
- libcmis-dev (>= 0.5.0-3),
- libcollada2gltfconvert-dev (>= 20140924-2),
- libcommons-logging-java,
- libcppunit-dev (>= 1.13.2-2.1),
- libcups2-dev,
- libcurl4-gnutls-dev,
- libdbus-glib-1-dev (>= 0.70),
- libdconf-dev,
- libe-book-dev,
- libebook1.2-dev,
- libeot-dev,
- libetonyek-dev,
- libexpat1-dev,
- libexttextcat-dev (>= 3.4.1),
- libfontconfig1-dev,
- libfreehand-dev (>= 0.1),
- libfreetype6-dev (>= 2.2.0),
- libgirepository1.0-dev (>= 1.32),
- libglew-dev,
- libglib2.0-dev (>= 2.15.0),
- libglm-dev (>= 0.9.6.3),
- libgltf-dev (>= 0.0.2-4),
- libgraphite2-dev (>= 0.9.3),
- libgstreamer-plugins-base1.0-dev,
- libgstreamer1.0-dev,
- libgtk-3-dev (>= 3.8~),
- libgtk2.0-dev (>= 2.10),
- libharfbuzz-dev (>= 0.9.18),
- libhsqldb1.8.0-java (>> 1.8.0.10),
- libhunspell-dev (>= 1.1.5-2),
- libhyphen-dev (>= 2.4),
- libice-dev,
- libicu-dev (>= 52),
- libjpeg-dev,
- liblangtag-dev (>= 0.4),
- liblcms2-dev,
- libldap2-dev,
- liblpsolve55-dev (>= 5.5.0.13-5+b1),
- libmdds-dev (>= 0.12),
- libmspub-dev (>= 0.1),
- libmwaw-dev (>= 0.3.1),
- libmysqlclient-dev,
- libmysqlcppconn-dev (>= 1.1.3-7),
- libmythes-dev (>= 2:1.2),
- libneon27-gnutls-dev,
- libnss3-dev (>= 3.12.3),
- libo3dgc-dev (>= 0~20131011-2),
- libodfgen-dev (>= 0.1),
- liborcus-dev (>= 0.9.2-2),
- libpagemaker-dev,
- libpcre3-dev,
- libpng-dev,
- libpoppler-cpp-dev,
- libpoppler-dev (>= 0.12.0),
- libpoppler-private-dev,
- libpq-dev (>= 9.0~),
- libqt4-dev (>= 4:4.8),
- librdf0-dev (>= 1.0.16-2),
- libreoffice,
- librevenge-dev,
- libsane-dev,
- libsm-dev,
- libssl-dev (>= 0.9.8),
- libsuitesparse-dev (>= 1:3.4.0),
- libvigraimpex-dev,
- libvisio-dev (>= 0.1),
- libvlc5,
- libwpd-dev (>= 0.10),
- libwpg-dev (>= 0.3),
- libwps-dev (>= 0.4),
- libx11-dev,
- libxaw7-dev,
- libxext-dev,
- libxinerama-dev,
- libxkbfile-dev,
- libxml2-dev,
- libxml2-utils,
- libxrandr-dev,
- libxrender-dev,
- libxslt1-dev,
- libxt-dev,
- libxtst-dev,
- lp-solve (>= 5.5.0.13-5+b1),
- make (>= 3.81-8.2),
- maven-repo-helper,
- opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2),
- pkg-config,
- python3,
- python3-dev (>= 3.3),
- rapidjson-dev,
- ucpp,
- unixodbc-dev (>= 2.2.11),
- unzip,
- x11proto-render-dev,
- xsltproc,
- zip,
- zlib1g-dev,
- ${misc:Depends}
+Depends: junit4 (>= 4.8.2-2), libreoffice-java-common, ure, ${misc:Depends}
Description: LibreOffice java test libraries
LibreOffice subsequentchecks integration test suite
diff --git a/control.subsequentcheckbase.in b/control.subsequentcheckbase.in
index 5d85b5f..ba8c6b8 100644
--- a/control.subsequentcheckbase.in
+++ b/control.subsequentcheckbase.in
@@ -2,7 +2,7 @@ Package: libreoffice-subsequentcheckbase
Section: libs
Priority: extra
Architecture: all
-Depends: libreoffice, build-essential, %BUILD_DEPS_ARCH_ALL%, ${misc:Depends}
+Depends: libreoffice-java-common, ure, junit4 %JUNIT_MIN_VER%, ${misc:Depends}
Description: LibreOffice java test libraries
LibreOffice subsequentchecks integration test suite
diff --git a/rules b/rules
index f3d3ec2..ec327c8 100755
--- a/rules
+++ b/rules
@@ -1646,7 +1646,11 @@ endif
# Generate control file, because we have so many different languages
# Based on script by Martin Quinson <martin.quin...@tuxfamily.org>
+ifeq "$(BUILD_TEST_PACKAGE)" "y"
+control: debian/control debian/tests/control
+else
control: debian/control
+endif
debian/control: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang
debian/rules
chmod 755 $(SOURCE_TREE)/bin/lo-xlate-lang
sed -e "s#%$(DEB_VENDOR)=\([^%]*\)%#, \1#g#" \
@@ -1816,14 +1820,7 @@ endif
perl -pi -e "s,%OOO_REPORTDESIGN_ARCHS%,$(OOO_REPORTDESIGN_ARCHS),g"
debian/control
perl -pi -e
"s,%OOO_NO_REPORTDESIGN_ARCHS%,$(OOO_NO_REPORTDESIGN_ARCHS),g" debian/control
perl -pi -e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" debian/control
-ifeq "$(BUILD_TEST_PACKAGE)" "y"
- # we want the build deps as dep on subsequentcheckbase, but strip the
arch
- # specifics as we are arch-all
- # for now we filter out the arch-specific libc* and ia64, which is ugly,
- # but better than manual bookkeeping. Also filter out the mips(el)-only
- # binutils build-dep...
- perl -pi -e "s#%BUILD_DEPS_ARCH_ALL%#$(strip $(shell echo
'$(BUILD_DEPS), $(BUILD_DEPS_INDEP)'|sed -e 's/,/,\n /g'|grep -v libc0.1| grep
-v libc6| grep -v ia64|grep -v binutils|grep -v gcj-jdk|grep -v
gcj-native-helper|grep -v libgcj-common|grep -v openjdk-6-jdk|sed -e
's/\[[^]]*\]//g'))#g" debian/control
-endif
+ perl -pi -e "s#%JUNIT_MIN_VER%#$(JUNIT_MIN_VER)#g" debian/control
ifeq "$(BUILD_KDE)" "y"
perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome |
libreoffice-kde/' debian/control
else
@@ -1878,7 +1875,17 @@ ifneq "$(DICT_DIR)" "/usr/share/hunspell"
perl -pi -e 's/^Breaks:.*myspell.*\n//' debian/control
endif
-.DELETE_ON_ERROR: debian/control
+ifeq "$(BUILD_TEST_PACKAGE)" "y"
+debian/tests/control: debian/tests/control.in debian/control
+ # we want the build deps as dep on subsequentcheckbase, but strip the
arch
+ # specifics as we are arch-all
+ # for now we filter out the arch-specific libc* and ia64, which is ugly,
+ # but better than manual bookkeeping. Also filter out the mips(el)-only
+ # binutils build-dep...
+ sed -e "s#%BUILD_DEPS_ARCH_ALL%#$(strip $(shell echo '$(BUILD_DEPS),
$(BUILD_DEPS_INDEP)'|sed -e 's/,/,\n /g'|grep -v libc0.1| grep -v libc6| grep
-v ia64|grep -v binutils|grep -v gcj-jdk|grep -v gcj-native-helper|grep -v
libgcj-common|grep -v openjdk-6-jdk|sed -e 's/\[[^]]*\]//g'))#g" <
debian/tests/control.in > debian/tests/control
+endif
+
+.DELETE_ON_ERROR: debian/control debian/tests/control
# All 'important' targets have 2 lines. The one that is run by
# dpkg-buildpackage or the user, and the one that does the actual work. This
diff --git a/tests/control b/tests/control
index dfdf89b..f183afe 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
Tests: junit-subsequentcheck
-Depends: libreoffice-subsequentcheckbase
+Depends: libreoffice, libreoffice-subsequentcheckbase,
libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex
(>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev,
libfreetype6-dev (>= 2.2.0), 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.0.2-4) , opencollada-dev (>= 0.1.0~2 [...]
Tests: pyuno-import
Depends: python3-uno
diff --git a/tests/control.in b/tests/control.in
new file mode 100644
index 0000000..38b762b
--- /dev/null
+++ b/tests/control.in
@@ -0,0 +1,5 @@
+Tests: junit-subsequentcheck
+Depends: libreoffice, libreoffice-subsequentcheckbase,
libreoffice-sdbc-hsqldb, %BUILD_DEPS_ARCH_ALL%, build-essential, default-jdk
+
+Tests: pyuno-import
+Depends: python3-uno
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
