[libreoffice] 02/03: Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.0
in repository libreoffice.
commit 8e0454b08c01fa919a5ee6048e42a94fffed2291
Merge: d364a0a 7d8f755
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jun 16 22:51:58 2015 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
Conflicts:
changelog
patches/series
rules
changelog | 8 +-
control | 4 +-
patches/liborcus-0.9.1.diff | 291 ++++++++++++++++++++++++++++++++++++++++++++
patches/series | 1 +
rules | 4 +-
5 files changed, 303 insertions(+), 5 deletions(-)
diff --cc changelog
index 6557eb8,833192e..0ce7214
--- a/changelog
+++ b/changelog
@@@ -1,16 -1,38 +1,22 @@@
-libreoffice (1:4.4.4-1) unstable; urgency=medium
+libreoffice (1:5.0.0~rc1~git20150615-1) UNRELEASED; urgency=medium
- * New upstream release
+ * New upstream snapshot
+ - fixes "Can't use a hash as a reference" deprecation warning/error in
+ lo-xlate-lang (closes: #788613)
- -- Rene Engelhard <rene@debian.org> Fri, 12 Jun 2015 20:34:16 +0200
- * debian/patches/rsc-no-error-about-unknown-switch.diff: *really* don't
- error out on unknown CPPFLAGS
- * debian/patches/fix-perl-deprecation-in-lo-xlate-lang.diff: fix
- "Can't use a hash as a reference" deprecation warning/error in
- lo-xlate-lang (closes: #788613)
- * debian/patches/libwps-0.4.diff: adapt for libwps 0.4
+ * debian/patches/liborcus.diff: backport build fixes for using liborcus
+ 0.9.1 from master
+
- * debian/control{,.in}:
- - suggest openclipart2-libreoffice | openclipart-libreoffice
- (closes: #787660)
-
- * debian/copyright:
- - remove long gone dmake (closes: #788311)
-
+ * debian/rules:
- - build-depend on libwps >= 0.4
+ - build-depend on liborcus >= 0.9.0
+
+ -- Rene Engelhard <rene@debian.org> Tue, 16 Jun 2015 20:10:01 +0200
-libreoffice (1:4.4.4~rc1-1) unstable; urgency=medium
+libreoffice (1:5.0.0~beta3-1) experimental; urgency=medium
- * New upstream release candidate
+ * New upstream beta release
- * debian/patches/system-collada2gltf.diff: add system-collada2gltf support
- from upstream master
- * debian/patches/libebook-1.2.so.16.diff: add libebook-1.2.so.16 to the
- libebook library search list
- * debian/patches/rsc-no-error-about-unknown-switch.diff: ignore unknown
+ * debian/patches/rsc-no-error-about-unknown-switch.diff: don't error out
CPPFLAGS (e.g. -Wdate-time) to not FTBFS with the patched reproducible
builds toolchain
diff --cc patches/series
index 360ab55,ce38d39..68fb3ac
--- a/patches/series
+++ b/patches/series
@@@ -25,6 -25,13 +25,7 @@@ javadoc-optional.dif
lo-xlate-lang-update-kurdish.diff
build-connectivitytools.diff
odk-no-dot.diff
-disable-icontest-build.diff
hppa-is-32bit.diff
gcj-no-bitness-check.diff
-icu-icudata-link-fix-armhf.diff
-system-collada2gltf.diff
-libebook-1.2.so.16.diff
rsc-no-error-about-unknown-switch.diff
-fix-perl-deprecation-in-lo-xlate-lang.diff
+ liborcus-0.9.1.diff
-libwps-0.4.diff
diff --cc rules
index 5a735e7,03c1a03..b5e41eb
--- a/rules
+++ b/rules
@@@ -633,7 -632,7 +633,7 @@@ endi
# Debian Jessie
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "jessie-backports"
BUGS=mailto:debian-backports@lists.debian.org
- SYSTEM_STUFF := $(filter-out opencollada collada2gltf libmwaw libcmis mdds glm libwps libetonyek,$(SYSTEM_STUFF))
- SYSTEM_STUFF := $(filter-out opencollada collada2gltf libmwaw libcmis mdds libwps liborcus,$(SYSTEM_STUFF))
++ SYSTEM_STUFF := $(filter-out opencollada collada2gltf libmwaw libcmis mdds glm libwps libetonyek liborcus,$(SYSTEM_STUFF))
JESSIE_BACKPORT=y
endif
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: