[libreoffice] 03/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 aefe327adcf8df7a6ad1c9567069e9c678d415c9
Merge: c998d73 92b5f40
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jun 27 17:44:09 2015 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
Conflicts:
changelog
changelog | 3 +++
control | 2 +-
control.in | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --cc changelog
index df26a4b,0555285..9dcff17
--- a/changelog
+++ b/changelog
@@@ -1,18 -1,22 +1,21 @@@
-libreoffice (1:4.4.4~rc3-1) UNRELEASED; urgency=medium
+libreoffice (1:5.0.0~rc2-1) UNRELEASED; urgency=medium
- * New upstream release candidate
+ * New upstream snapshot
+ * debian/control.in:
+ - s/cliipart/clipart/ (closes: #787660 again)
+
- -- Rene Engelhard <rene@debian.org> Wed, 24 Jun 2015 08:24:30 +0200
+ * debian/rules:
+ - move gnome-open-url (back) to -gnome
+
+ -- Rene Engelhard <rene@debian.org> Sat, 27 Jun 2015 12:31:14 +0200
-libreoffice (1:4.4.4~rc2-1) unstable; urgency=medium
+libreoffice (1:5.0.0~rc1-1) experimental; urgency=medium
* New upstream release candidate
+ - 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)
- * 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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: