[libreoffice] 01/04: 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 51f8a58f9f5ab5813822e97d900aaa8e25f163ae
Merge: bcc4a9c 2ba1942
Author: Rene Engelhard <rene@debian.org>
Date: Sat Sep 19 10:37:46 2015 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.0' into debian-experimental-5.1
Conflicts:
changelog
changelog | 13 +++++++----
control | 4 ++++
patches/disable-mediaembedding-test.diff | 37 --------------------------------
rules | 11 ++++++++--
4 files changed, 22 insertions(+), 43 deletions(-)
diff --cc changelog
index 6e6f29e,7c7ecc3..2449e12
--- a/changelog
+++ b/changelog
@@@ -1,30 -1,6 +1,30 @@@
+libreoffice (1:5.1.0~alpha1~git20150914-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ * debian/patches/series, debian/patches/disable-tiledrendering-test.diff:
+ remove again, seems to work again, and we need the functionallity for
+ liblibreofficekitgtk.so
+
+ * debian/rules, debian/vars.mips64*:
+ - add mips64{el,eb} architecture stuff which is now added upstream
+ * debian/uno-libs3.symbols: update
+ * debian/control.lokit.in:
+ - suggest libgtk-3-dev instead of libgtk2.0-dev
+ - suggest gir-1.2-lokdocview-0.1
+ * debian/control*in, debian/rules:
+ - remove upstream gone kdeab and gnome-vfs options
+ * debian/control*.in, debian/rules:
+ - package the LOKDocView introspection stuff into gir1.2-lokdocview-0.1
+ - move liblibreofficekitgtk.so into -gtk3 as it's for Gtk3 now
+ * debian/rules:
+ - gtk3 is on per default now (closes: #799399, #681180)
+
+ -- Rene Engelhard <rene@debian.org> Fri, 04 Sep 2015 09:52:38 +0200
+
- libreoffice (1:5.0.2~rc2~git20150916-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.0.2~rc2-1) UNRELEASED; urgency=medium
- * New upstream snapshot
+ * New upstream release candidate
- fixes crash on gestureLongPress (closes: #798591)
* debian/*.menu: remove, as per TC resolution
diff --cc control
index 745bcf0,7add20d..6bd6d00
--- a/control
+++ b/control
@@@ -11,9 -11,11 +11,11 @@@ Build-Depends: ant (>= 1.7.0) [!mips64e
binutils (>= 2.23) [mips mipsel],
bison,
bzip2,
+ coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2),
+ coinor-libcoinutils-dev (>= 2.9.15-3.1),
debhelper (>= 7.2.3~),
- default-jdk,
default-jdk (>= 1:1.7-48) [ia64],
+ default-jdk [!mips64eb],
dh-python,
dpkg-dev (>= 1.16.1),
fastjar,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: