This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit a4cc7f171eeda3cfd58fbc5578c05419a4fc871d
Merge: d190267 125aa1c
Author: Rene Engelhard <r...@debian.org>
Date: Mon Apr 11 23:24:11 2016 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.1' into
debian-experimental-5.2
Conflicts:
changelog
changelog | 13 +++++++++++--
libreoffice-gtk3.maintscript | 2 +-
2 files changed, 12 insertions(+), 3 deletions(-)
diff --cc changelog
index a514192,a95bcfa..35555f3
--- a/changelog
+++ b/changelog
@@@ -1,21 -1,4 +1,21 @@@
- libreoffice (1:5.2.0~alpha1~git20160329-1) UNRELEASED; urgency=medium
++libreoffice (1:5.2.0~alpha1~git20160411-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+ - fixes SVG t(ext s)pan import (closes: #665094)
+
+ * debian/rules, debian/control.gtk3.in, debian/*.links: move
+ liblibreofficekitgtk.so into an own package, as we have
+ libreofficekit-{dev,data} anyway. Make liblibreofficekitgtk depend on
+ libreofficekit-data
+ * debian/rules, debian/control.in, debian/libreoffice-gtk.*: rename -gtk
+ to -gtk2
+ * debian/control.sdk.in, debian/rules: move arch-indep SDK stuff into new
+ -dev-common
+ * debian/uno-libs3.symbols: update
+
+ -- Rene Engelhard <r...@debian.org> Thu, 26 Nov 2015 10:37:57 +0100
+
- libreoffice (1:5.1.3~rc1~git20160404-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.1.3~rc1~git20160411-1) UNRELEASED; urgency=medium
* New upstream snapshot
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
