This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit c5022c480f09b5f269a7434ed0d93bd98ac65768
Author: Rene Engelhard <r...@debian.org>
Date: Sat Nov 14 13:37:08 2015 +0100
git update; update patches; remove mesa stuff, not used anymore directly
---
changelog | 2 +-
control | 4 ----
patches/disable-flaky-tests.diff | 20 ++++++++------------
patches/rsc-no-error-about-unknown-switch.diff | 2 +-
rules | 4 ----
5 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/changelog b/changelog
index 83ca121..afd9dff 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.1.0~beta1~git20151107-1) UNRELEASED; urgency=medium
+libreoffice (1:5.1.0~beta1~git20151114-1) UNRELEASED; urgency=medium
* New upstream snapshot
- fixes crash when selecting the border style in some window managers
diff --git a/control b/control
index ea94cb8..c23c107 100644
--- a/control
+++ b/control
@@ -63,12 +63,10 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
libfreetype6-dev (>= 2.2.0),
libgcj-common (>= 1:4.4.1) [hppa ia64 s390 sparc],
libgirepository1.0-dev (>= 1.32),
- libgl1-mesa-dev,
libglew-dev,
libglib2.0-dev (>= 2.15.0),
libglm-dev (>= 0.9.6.3),
libgltf-dev (>= 0.0.2-4) [!armel !mips !mipsel],
- libglu1-mesa-dev,
libgraphite2-dev (>= 0.9.3),
libgstreamer-plugins-base1.0-dev,
libgstreamer1.0-dev,
@@ -4475,12 +4473,10 @@ Depends: ant (>= 1.7.0),
libfreehand-dev (>= 0.1),
libfreetype6-dev (>= 2.2.0),
libgirepository1.0-dev (>= 1.32),
- libgl1-mesa-dev,
libglew-dev,
libglib2.0-dev (>= 2.15.0),
libglm-dev (>= 0.9.6.3),
libgltf-dev (>= 0.0.2-4),
- libglu1-mesa-dev,
libgraphite2-dev (>= 0.9.3),
libgstreamer-plugins-base1.0-dev,
libgstreamer1.0-dev,
diff --git a/patches/disable-flaky-tests.diff b/patches/disable-flaky-tests.diff
index a2208ea..b4a9692 100644
--- a/patches/disable-flaky-tests.diff
+++ b/patches/disable-flaky-tests.diff
@@ -82,7 +82,7 @@
http://zyklop.dyndns.org/~rene/libreoffice_4.2.4~rc1~git20140414-1_amd64.build.s
lucky :)
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
-index e9b344c..ffc94f7 100644
+index 2539943..ffc94f7 100644
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sw_complex,\
@@ -93,15 +93,11 @@ index e9b344c..ffc94f7 100644
sw/qa/complex/writer/CheckCrossReferences \
sw/qa/complex/writer/CheckFlies \
sw/qa/complex/writer/CheckIndexedPropertyValues \
-@@ -58,11 +57,4 @@ $(eval $(call gb_JunitTest_add_classes,sw_complex,\
- complex.writer.TextPortionEnumerationTest \
- ))
-
--# FIXME has never worked on windows, hashes are different
--ifneq ($(OS),WNT)
--$(eval $(call gb_JunitTest_add_classes,sw_complex,\
+@@ -50,7 +49,6 @@ $(eval $(call gb_JunitTest_use_jars,sw_complex,\
+ $(eval $(call gb_JunitTest_add_classes,sw_complex,\
+ complex.accessibility.AccessibleRelationSet \
+ complex.checkColor.CheckChangeColor \
- complex.writer.CheckBookmarks \
--))
--endif
--
- # vim: set noet sw=4 ts=4:
+ complex.writer.CheckCrossReferences \
+ complex.writer.CheckFlies \
+ complex.writer.CheckTable \
diff --git a/patches/rsc-no-error-about-unknown-switch.diff
b/patches/rsc-no-error-about-unknown-switch.diff
index 3eeb18c..d8b839d 100644
--- a/patches/rsc-no-error-about-unknown-switch.diff
+++ b/patches/rsc-no-error-about-unknown-switch.diff
@@ -9,7 +9,7 @@ index c5a9fd7..62aa8ab 100644
- if( ERR_USAGE != rError ){
+ if( ERR_USAGE != rError && ERR_UNKNOWNSW != rError ){
nErrors++;
- ErrorFormat( rError, NULL, aId );
+ ErrorFormat( rError, nullptr, aId );
WriteError( rError, pMessage );
@@ -398,7 +398,8 @@ void RscError::FatalError( const ERRTYPE& rError, const
RscId &aId,
else
diff --git a/rules b/rules
index 0ddd39c..837bc30 100755
--- a/rules
+++ b/rules
@@ -446,7 +446,6 @@ SYSTEM_STUFF += expat
SYSTEM_STUFF += odbc
SYSTEM_STUFF += curl
SYSTEM_STUFF += sane
-SYSTEM_STUFF += mesa-headers
SYSTEM_STUFF += poppler
SYSTEM_STUFF += libpng
SYSTEM_STUFF += nss
@@ -744,9 +743,6 @@ endif
BUILDDEB_OPTIONS ?= -- -Zxz
-ifneq (,$(findstring mesa-headers,$(SYSTEM_STUFF)))
- BUILD_DEPS += , libgl1-mesa-dev, libglu1-mesa-dev
-endif
ifneq "$(ENABLE_GLTF)" "y"
CONFIGURE_FLAGS += --disable-gltf
else
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
