[libreoffice] 01/02: 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 5eb287d1733fa7acb18dbe3518f99ca0483f60d3
Merge: 3f0092f fbbb8b6
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jun 15 19:18:05 2015 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
Conflicts:
changelog
rules
changelog | 4 +++-
patches/fix-perl-deprecation-in-lo-xlate-lang.diff | 26 ++++++++++++++++++++++
patches/series | 1 +
3 files changed, 30 insertions(+), 1 deletion(-)
diff --cc changelog
index 17663df,091add1..6557eb8
--- a/changelog
+++ b/changelog
@@@ -1,20 -1,12 +1,22 @@@
- libreoffice (1:5.0.0~rc1~git20150612-1) UNRELEASED; urgency=medium
-libreoffice (1:4.4.4~rc2-1) unstable; urgency=medium
++libreoffice (1:5.0.0~rc1~git20150615-1) UNRELEASED; urgency=medium
- * New upstream release candidate
+ * New upstream snapshot
++ - fixes "Can't use a hash as a reference" deprecation warning/error in
++ lo-xlate-lang (closes: #788613)
- * 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)
+ -- Rene Engelhard <rene@debian.org> Fri, 12 Jun 2015 20:34:16 +0200
+
+libreoffice (1:5.0.0~beta3-1) experimental; urgency=medium
+
+ * New upstream beta release
+
+ * 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
+
+ * debian/rules:
+ - remove left-over dh_installxmlcatalogs call...
+ - temporarily disable junit tests
* debian/control{,.in}:
- suggest openclipart2-libreoffice | openclipart-libreoffice
diff --cc patches/series
index 360ab55,a98767a..4f512b2
--- a/patches/series
+++ b/patches/series
@@@ -25,6 -25,11 +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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: