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 ed82407a9d8c590a8b02b04c9c54a98c425d1e1c
Merge: 16b0069 1c47c08
Author: Rene Engelhard <r...@debian.org>
Date: Thu Mar 10 23:02:35 2016 +0100
Merge remote-tracking branch 'origin/debian-experimental-5.1' into
debian-experimental-5.2
Conflicts:
control
changelog | 28 +++++++++++++++++
control | 4 +++
control.subsequentcheckbase.in | 2 +-
patches/disable-flaky-tests.diff | 35 ++++++++++++++++++++++
rules | 28 ++++++-----------
tests/control | 2 +-
tests/control.in | 2 +-
tests/junit-subsequentcheck | 2 +-
tests/patches/java-subsequentcheck-standalone.diff | 12 ++++----
9 files changed, 87 insertions(+), 28 deletions(-)
diff --cc control
index 40075da,c06710c..e77dc83
--- a/control
+++ b/control
@@@ -4373,147 -4363,7 +4373,151 @@@ Package: libreoffice-subsequentcheckbas
Section: libs
Priority: extra
Architecture: all
++<<<<<<< HEAD
+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 (>= 1.1.0),
+ 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.11.0),
+ 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),
+ 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}
++>>>>>>> origin/debian-experimental-5.1
Description: LibreOffice java test libraries
LibreOffice subsequentchecks integration test suite
diff --cc tests/control
index 49d656c,f183afe..176845a
--- a/tests/control
+++ b/tests/control
@@@ -1,5 -1,5 +1,5 @@@
Tests: junit-subsequentcheck
- Depends: libreoffice-subsequentcheckbase, gdb, libreoffice-core-dbgsym,
libreoffice-writer-dbgsym, libreoffice-calc-dbgsym, libreoffice-impress-dbgsym,
libreoffice-draw-dbgsym, libreoffice-math-dbgsym, libreoffice-base-core-dbgsym,
libreoffice-base-dbgsym, libreoffice-gtk-dbgsym, libreoffice-gnome-dbgsym,
python3-uno-dbgsym, libreoffice-officebean-dbgsym,
libreoffice-pdfimport-dbgsym, libreoffice-avmedia-backend-gstreamer-dbgsym,
libreoffice-avmedia-backend-vlc-dbgsym, libreoffice-sdbc- [...]
-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~ [...]
++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~ [...]
Tests: pyuno-import
Depends: python3-uno
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
