[libreoffice] 01/01: Merge remote-tracking branch 'origin/debian-experimental-5.0' into debian-experimental-5.1
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 07b318f095fc567250535fc11baaf656dc052610
Merge: 685074f 2eb87ac
Author: Rene Engelhard <rene@debian.org>
Date: Sat Aug 8 09:18:40 2015 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.0' into debian-experimental-5.1
Conflicts:
changelog
control
patches/series
rules
changelog | 41 +++++++++++++++++
control | 72 +++++++++++++-----------------
control.in | 5 ++-
patches/disable-tiledrendering-test.diff | 17 +++++++
patches/series | 1 +
rules | 76 ++++++++++++++++++++++++--------
6 files changed, 150 insertions(+), 62 deletions(-)
diff --cc changelog
index 63ed10a,bba06d6..7407979
--- a/changelog
+++ b/changelog
@@@ -1,13 -1,44 +1,54 @@@
+libreoffice (1:5.1.0~alpha1~git20150713-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ * debian/rules, debian/vars.mips64*:
+ - add mips64{el,eb} architecture stuff which is now added upstream
+ * debian/uno-libs3.symbols: update
+
+ -- Rene Engelhard <rene@debian.org> Mon, 01 Jun 2015 20:29:43 +0200
+
+ libreoffice (1:5.0.1~rc1-1) UNRELEASED; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/patches/disable-tiledrendering-test.diff: temporarily disable test
+ * debian/rules:
+ - bump build-depends on libgltf, *collada*, cppunit, liborcus, libcmis to
+ build-depend on their gcc 5 rebuilds. Bump boost build-dep to >= 1.58
+ (closes: #794717)
+ - fix SYSTEM_GCC_CHECK for gcc 5; remove obsolete >= 4.7 check for Qt to get
+ correct build-dep
+ - temporarily disable -evolution until libebook1.2-dev is installable again
+ * debian/control.in: suggest breeze-icon-theme in -style-breeze (like the
+ other ones do for oxygen/tango)
+
+ -- Rene Engelhard <rene@debian.org> Thu, 06 Aug 2015 19:36:13 +0200
+
+ libreoffice (1:5.0.0~rc5-1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/rules:
+ - ENABLE_MERGELIBS=n on kfreebsd-* for now ("Argument list too long")
+ - ENABLE_COLLADA=y (for i386/amd64) now that the libs finally are in
+ Debian
+ - KDE_ICONSET_DEP=libreoffice-style-breeze (closes: #794318)
+ * debian/control.in:
+ - update -l10n conflicts in -common, remove 3.5/3.6, add 4.3/4.4
+ (closes: #794024)
+
+ -- Rene Engelhard <rene@debian.org> Sat, 01 Aug 2015 14:00:45 +0200
+
+ libreoffice (1:5.0.0~rc4-1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/rules:
+ - ENABLE_MERGELIBS=y as it's now upstream default
+
+ -- Rene Engelhard <rene@debian.org> Sat, 25 Jul 2015 11:59:25 +0200
+
libreoffice (1:5.0.0~rc3-1) experimental; urgency=medium
* New upstream release candidate
diff --cc control
index dca58eb,c6ab1d9..4b0e526
--- a/control
+++ b/control
@@@ -67,7 -67,7 +67,7 @@@ Build-Depends: ant (>= 1.7.0) [!mips64e
libglew-dev,
libglib2.0-dev (>= 2.15.0),
libglm-dev (>= 0.9.6.3),
- libgltf-dev (>= 0.0.1) [!armel !mips !mipsel !mips64eb !mips64el],
- libgltf-dev (>= 0.0.2-4) [!armel !mips !mipsel],
++ libgltf-dev (>= 0.0.2-4) [!armel !mips !mipsel !mips64eb !mips64el],
libglu1-mesa-dev,
libgraphite2-dev (>= 0.9.3),
libgstreamer-plugins-base1.0-dev,
diff --cc patches/series
index 360ab55,0d8626b..5b79ce8
--- a/patches/series
+++ b/patches/series
@@@ -28,3 -28,5 +28,4 @@@ odk-no-dot.dif
hppa-is-32bit.diff
gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
-liborcus-0.9.1.diff
+ #disable-tiledrendering-test.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: