[libreoffice] 04/09: Merge tag 'libreoffice_5.0.0_rc2-1' into ubuntu-wily-5.0
This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-wily-5.0
in repository libreoffice.
commit 6d0d5d75ea1155657607c855d6ac021589788fb9
Merge: 2b8797f b77474d
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Jun 30 13:50:32 2015 +0200
Merge tag 'libreoffice_5.0.0_rc2-1' into ubuntu-wily-5.0
tag libreoffice 1:5.0.0~rc2-1
Conflicts:
changelog
control
patches/series
changelog | 62 ++++++
control.in | 6 +-
control.ure.in | 2 +-
copyright | 46 ----
libreoffice-gtk3.bug-script.in | 8 -
patches/disable-mediaembedding-test.diff | 37 ++++
patches/liborcus-0.9.1.diff | 291 +++++++++++++++++++++++++
patches/rsc-no-error-about-unknown-switch.diff | 23 ++
patches/series | 2 +
python-uno.NEWS | 27 ---
python-uno.lintian-overrides | 2 -
rules | 34 ++-
shlibs.override.libwpd | 1 +
shlibs.override.libwpg | 1 +
14 files changed, 446 insertions(+), 96 deletions(-)
diff --cc changelog
index 9d5f6a3,45ff833..e0270bb
--- a/changelog
+++ b/changelog
@@@ -1,52 -1,59 +1,114 @@@
++libreoffice (1:5.0.0~rc2-1ubuntu1~wily1) wily; urgency=medium
++
++ * merge from debian
++
++ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 30 Jun 2015 13:49:59 +0200
++
+ libreoffice (1:5.0.0~rc2-1) experimental; urgency=medium
+
+ * 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~rc2-0ubuntu1~wily1) wily; urgency=medium
+
+ * second upstream rc
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 29 Jun 2015 10:49:18 +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> Sat, 20 Jun 2015 13:45:07 +0200
+
+libreoffice (1:5.0.0~rc1-0ubuntu1~wily1) wily; urgency=medium
+
+ * first upstream rc
+ * use system glm, mwaw, mdds again
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Sun, 21 Jun 2015 22:36:08 +0200
+
+libreoffice (1:5.0.0~beta3-0ubuntu1~wily1) wily; urgency=medium
+
+ * first build on wily
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 18 Jun 2015 18:39:42 +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
+ (closes: #787660)
+
+ * debian/copyright:
+ - remove long gone dmake (closes: #788311)
+
+ -- Rene Engelhard <rene@debian.org> Wed, 10 Jun 2015 14:58:50 +0200
+
+libreoffice (1:5.0.0~beta3-0ubuntu1~vivid3) vivid; urgency=medium
+
+ * new upstream beta
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 11 Jun 2015 00:19:32 +0200
+
+libreoffice (1:5.0.0~beta2-0ubuntu1~vivid1) vivid; urgency=medium
+
+ * new upstream beta
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 08 Jun 2015 18:33:47 +0200
+
+libreoffice (1:5.0.0~beta1-1ubuntu1~vivid3) vivid; urgency=medium
+
+ * use system lpsolve
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 04 Jun 2015 10:23:24 +0200
+
+libreoffice (1:5.0.0~beta1-1ubuntu1~vivid2) vivid; urgency=medium
+
+ * use more internal libs for now
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 03 Jun 2015 17:48:40 +0200
+
+libreoffice (1:5.0.0~beta1-1ubuntu1~vivid1) vivid; urgency=medium
+
+ * new upstream beta
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 01 Jun 2015 17:20:48 +0200
+
libreoffice (1:5.0.0~beta1-1) experimental; urgency=medium
* New upstream beta release
diff --cc control.in
index e527795,f00032c..325a4f5
--- a/control.in
+++ b/control.in
@@@ -577,9 -551,8 +577,9 @@@ Depends: gconf2
Suggests: libreoffice-evolution
Section: gnome
Enhances: libreoffice
+Conflicts: libreoffice-core (<< 1:3.9999)
- Replaces: libreoffice-core (<< 1:3.9999)
++Replaces: libreoffice-core (<< 1:3.9999), libreoffice-gtk (<< 1:5.0.0~rc2-1)
Provides: libreoffice-gtk-gnome
-Replaces: libreoffice-gtk (<< 1:5.0.0~rc2-1)
Description: office productivity suite -- GNOME integration
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --cc patches/series
index e9eff43,68fb3ac..0830bd8
--- a/patches/series
+++ b/patches/series
@@@ -25,5 -26,6 +25,7 @@@ lo-xlate-lang-update-kurdish.dif
odk-no-dot.diff
hppa-is-32bit.diff
gcj-no-bitness-check.diff
+ rsc-no-error-about-unknown-switch.diff
+ liborcus-0.9.1.diff
+#lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
+#mailmerge-base.diff
diff --cc rules
index 24d76c5,853dbbf..1d39352
--- a/rules
+++ b/rules
@@@ -3113,12 -3318,10 +3130,11 @@@ endi
# fixing it up later because it's relative doesn't make that much sense.
# So do it here.
mkdir -p $(PKGDIR)-common/usr/share/applications
- cd $(PKGDIR)-common/usr/share/applications && \
- ln -sf /$(OODIR)/share/xdg/startcenter.desktop libreoffice-startcenter.desktop
+ rm $(PKGDIR)-common/usr/share/applications/libreoffice-startcenter.desktop
+ cp $(PKGDIR)-common/$(OODIR)/share/xdg/startcenter.desktop \
+ $(PKGDIR)-common/usr/share/applications/libreoffice-startcenter.desktop
dh_fixperms -i
dh_icons -i
- dh_installxmlcatalogs -i
dh_compress -i -X.py -X.mk -X.sxd -X.xcd.sample
dh_installdeb -i
ifeq "$(ENABLE_JAVA)" "y"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: