[libreoffice] 01/02: 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 aade18bb6a624a5786b4cf9a113ffc6c5d29ce63
Merge: ba4468e b77474d
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jun 29 07:53:32 2015 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.0' into debian-experimental-5.1
Conflicts:
changelog
changelog | 37 +++-
control | 7 +-
control.in | 5 +-
control.ure.in | 2 +-
libreoffice-gtk3.bug-script.in | 8 -
patches/disable-mediaembedding-test.diff | 37 ++++
patches/liborcus-0.9.1.diff | 291 +++++++++++++++++++++++++++++++
patches/series | 1 +
python-uno.NEWS | 27 ---
python-uno.lintian-overrides | 2 -
rules | 34 +++-
shlibs.override.libwpd | 1 +
shlibs.override.libwpg | 1 +
13 files changed, 398 insertions(+), 55 deletions(-)
diff --cc changelog
index 612d387,45ff833..e137bc8
--- a/changelog
+++ b/changelog
@@@ -1,14 -1,37 +1,43 @@@
- libreoffice (1:5.1.0~alpha1~git20150612-1) UNRELEASED; urgency=medium
++libreoffice (1:5.1.0~alpha1~git20150629-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <rene@debian.org> Mon, 01 Jun 2015 20:29:43 +0200
+
- libreoffice (1:5.0.0~rc1~git20150612-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.0.0~rc2-1) experimental; urgency=medium
- * New upstream snapshot
+ * New upstream release candidate
+
+ * 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
+
+ * debian/rules:
+ - move gnome-open-url (back) to -gnome
+
+ -- Rene Engelhard <rene@debian.org> Sun, 28 Jun 2015 20:18:19 +0200
+
+ 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/liborcus.diff: backport build fixes for using liborcus
+ 0.9.1 from master
+
+ * debian/rules:
+ - readd lost move of sal.py/cppu.py and libuno*.so.3-gdb.py
+ into uno-libs3-dbg (closes: #788848)
+ - build-depend on liborcus >= 0.9.0
+
+ * debian/control.in:
+ - make -gnome depend on -gtk3 now that it's enabled upstream if desktop
+ is gnome3 (closes: #681180)
- -- Rene Engelhard <rene@debian.org> Fri, 12 Jun 2015 20:34:16 +0200
+ -- Rene Engelhard <rene@debian.org> Sat, 20 Jun 2015 13:45:07 +0200
libreoffice (1:5.0.0~beta3-1) experimental; urgency=medium
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: