[libreoffice] 02/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 18b93473f5d6e831b8aa2890c07ae88df7b194db
Merge: 37c794c 976f7d1
Author: Rene Engelhard <rene@debian.org>
Date: Sun Jun 28 20:16:34 2015 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
changelog | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --cc changelog
index 19a7987,c08cafb..66bc53e
--- a/changelog
+++ b/changelog
@@@ -5,20 -5,21 +5,20 @@@ libreoffice (1:5.0.0~rc2-1) UNRELEASED
* debian/control.in:
- s/cliipart/clipart/ (closes: #787660 again)
* debian/rules:
- - move libunoidllo.so from ure into uno-libs3, too, as libcppuhelpergcc3.so.3
- is (now) linked to it
+ - move libunoidllo.so from ure into uno-libs3, too, as
+ libcppuhelpergcc3.so.3 is (now) linked to it
+ * debian/rules:
+ - move gnome-open-url (back) to -gnome
+
-- Rene Engelhard <rene@debian.org> Sat, 27 Jun 2015 22:33:36 +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: